Imported Upstream version 1.1.93

83 files changed, 157222 insertions, 84712 deletions

diff --git a/configure b/configure
index fb5e6cdc..ed30c270 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for nm-applet 1.1.92.
+# Generated by GNU Autoconf 2.69 for nm-applet 1.1.93.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='nm-applet'
 PACKAGE_TARNAME='network-manager-applet'
-PACKAGE_VERSION='1.1.92'
-PACKAGE_STRING='nm-applet 1.1.92'
+PACKAGE_VERSION='1.1.93'
+PACKAGE_STRING='nm-applet 1.1.93'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
 PACKAGE_URL=''
 
@@ -1448,7 +1448,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures nm-applet 1.1.92 to adapt to many kinds of systems.
+\`configure' configures nm-applet 1.1.93 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1519,7 +1519,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nm-applet 1.1.92:";;
+     short | recursive ) echo "Configuration of nm-applet 1.1.93:";;
    esac
   cat <<\_ACEOF
 
@@ -1691,7 +1691,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-nm-applet configure 1.1.92
+nm-applet configure 1.1.93
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2114,7 +2114,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by nm-applet $as_me 1.1.92, which was
+It was created by nm-applet $as_me 1.1.93, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2982,7 +2982,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='network-manager-applet'
- VERSION='1.1.92'
+ VERSION='1.1.93'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12436,7 +12436,7 @@ CC=$lt_save_CC
 
 
 
-NMA_GIT_SHA=24a429fdf51a5c683db86312f89ee9f13b8b3256
+NMA_GIT_SHA=189327df5ceb0c3e8567b00db7a2c5f5560c701d
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16405,7 +16405,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nm-applet $as_me 1.1.92, which was
+This file was extended by nm-applet $as_me 1.1.93, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16471,7 +16471,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-nm-applet config.status 1.1.92
+nm-applet config.status 1.1.93
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 26e6f71d..8c409d97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.63])
 AC_INIT([nm-applet],
-        [1.1.92],
+        [1.1.93],
         [https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager],
         [network-manager-applet])
 
diff --git a/po/af.po b/po/af.po
index 4ef30f35..7e6bb427 100644
--- a/po/af.po
+++ b/po/af.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
-"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2011-03-29 15:23+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -20,626 +19,932 @@ msgstr ""
 "X-Generator: Virtaal 0.7.0-beta4\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+msgid "Network"
+msgstr "Netwerk"
+
+#: ../nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr "Bestuur u netwerkverbindings"
 
-#: ../nm-applet.desktop.in.h:2
-msgid "Network"
-msgstr "Netwerk"
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "Netwerkverbindings"
 
-#: ../nm-applet.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr "Deaktiveer Wi-Fi-skep"
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "Bestuur en verander u netwerkverbinding-instellings"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "Deaktiveer koppel-kennisgewings"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, 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
 msgid "Disable disconnected notifications"
 msgstr "Deaktiveer ontkoppel-kennisgewings"
 
-#: ../nm-applet.schemas.in.h:4
-msgid "Set this to TRUE to disable notifications when connecting to a network."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
-"Stel dit na WAAR om kennisgewings wanneer aan 'n netwerk gekoppel word te "
+"Stel dit na WAAR om kennisgewings wanneer van 'n netwerk ontkoppel word te "
 "deaktiveer."
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Deaktiveer koppel-kennisgewings"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
 msgstr ""
 "Stel dit na WAAR om kennisgewings wanneer van 'n netwerk ontkoppel word te "
 "deaktiveer."
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "Onderdruk netwerkebeskikbaar-kennisgewings"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Stel dit na WAAR om kennisgewings wanneer draadlose netwerke beskikbaar is "
 "te deaktiveer."
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr "Stempel"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+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 WiFi Create"
+msgstr "Deaktiveer Wi-Fi-skep"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Stel na WAAR om skep van ad hoc-netwerke te deaktiveer wanneer die "
 "miniprogram gebruik word."
 
-#: ../nm-applet.schemas.in.h:8
-msgid "Stamp"
-msgstr "Stempel"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
-msgstr "Onderdruk netwerkebeskikbaar-kennisgewings"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:10
-msgid "Used to determine whether settings should be migrated to a new version."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+msgid "Ignore CA certificate"
 msgstr ""
-"Word gebruik om te bepaal of instellings na 'n nuwe weergawe migreer moet "
-"word."
 
-#: ../nm-connection-editor.desktop.in.h:1
-msgid "Manage and change your network connection settings"
-msgstr "Bestuur en verander u netwerkverbinding-instellings"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "Network Connections"
-msgstr "Netwerkverbindings"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:337
-#: ../src/applet-device-gsm.c:381 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:867 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "Beskikbaar"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "NetworkManager-miniprogram"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "NetworkManager-miniprogram"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_Verbind"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "_Netwerk-naam:"
+
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr ""
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:379
-#: ../src/applet-device-gsm.c:423 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "Geen geldige aktiewe verbindings gevind nie!"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "Onbekend"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "VPN-verbinding het misluk"
+
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "ontkoppel"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "Geontkoppel"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "VPN-verbinding het misluk"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "Moenie weer hierdie boodskap wys nie"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "U is nou verbind aan '%s'."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk, want die netwerk verbinding was "
+"onderbreek."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:383
-#: ../src/applet-device-gsm.c:427 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1272 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "Verbinding bewerkstellig"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk, want die VPN-diens het onverwags gestop."
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "U is nou aan die selfoon-breëbandnetwerk verbind."
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk, want die VPN-diens het ongeldige "
+"konfigurasie teruggestuur."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:419
-#: ../src/applet-device-gsm.c:463 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "Berei tans selfoon-breëbandverbinding '%s' voor..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk, want die verbindingspoging het uitgetel."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:422
-#: ../src/applet-device-gsm.c:466 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "Konfigureer tans selfoon-breëbandverbinding '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk, want die VPN-diens het nie betyds begin "
+"nie."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:425
-#: ../src/applet-device-gsm.c:469 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "Gebruikersmagtiging vereis vir selfoon-breëbandverbinding '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk, want die VPN-diens kon nie begin nie."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:428
-#: ../src/applet-device-gsm.c:472 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2383
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "Vra tans 'n netwerkadres aan vir '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk, want daar was geen geldige VPN-geheime "
+"nie."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:446
-#: ../src/applet-device-gsm.c:490
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "Selfoon-breëbandverbinding '%s' is aktief"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk as gevolg van ongeldige VPN-geheime."
 
-#: ../src/applet-device-cdma.c:186 ../src/connection-editor/page-mobile.c:681
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk."
 
-#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
-#: ../src/applet-dialogs.c:405
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Selfoonbreëband (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het ontkoppel, want die netwerk verbinding was "
+"onderbreek."
 
-#: ../src/applet-device-cdma.c:285 ../src/applet-device-gsm.c:329
-#: ../src/connection-editor/page-mobile.c:372
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1436
-msgid "Mobile Broadband"
-msgstr "Selfoonbreëband"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het ontkoppel, want die VPN-diens het gestop."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:350
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Nuwe selfoon-breëbandverbinding (CDMA)..."
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het ontkoppel."
 
-#: ../src/applet-device-cdma.c:384
-msgid "You are now connected to the CDMA network."
-msgstr "U is nou aan die CDMA-netwerk verbind."
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "VPN-aanmeldboodskap"
 
-#: ../src/applet-device-cdma.c:441 ../src/applet-device-gsm.c:485
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "VPN-verbinding het misluk"
+
+#: ../src/applet.c:990
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Selfoon-breëbandverbinding '%s' is aktief: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk, want die VPN-diens kon nie begin nie.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:444 ../src/applet-device-gsm.c:488
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "swerwing"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' kon nie begin nie.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:212 ../src/connection-editor/page-mobile.c:684
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "toestel nie gereed nie (vermiste fermware)"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:394
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Nuwe selfoon-breëbandverbinding (GSM)..."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "toestel nie gereed nie"
 
-#: ../src/applet-device-gsm.c:428
-msgid "You are now connected to the GSM network."
-msgstr "U is nou aan die GSM-netwerk verbind."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "ontkoppel"
 
-#: ../src/applet-device-gsm.c:589
-msgid "PIN code required"
-msgstr "PIN-kode vereis"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "Ontkoppel"
 
-#: ../src/applet-device-gsm.c:597
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "PIN-kode word benodig vir die selfoon-breëbandtoestel"
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "toestel word nie bestuur nie"
 
-#: ../src/applet-device-gsm.c:718
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Verkeerde PIN-kode. Kontak asseblief u verskaffer."
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "Geen netwerktoestelle beskikbaar nie"
+
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "_VPN-verbindings"
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "_Stel VPN op..."
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "_Ontkoppel VPN"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager loop nie tans nie..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "Netwerke gedeaktiveer"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "Aktiveer _netwerke"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "Aktiveer _draadloos"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "Aktiveer _selfoonbreëband"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "Aktiveer _kennisgewings"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "_Verbindingsinligting"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "Redigeer verbindings..."
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_Aangaande"
+
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "U is nou verbind aan '%s'."
+
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "Geontkoppel"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "Die netwerkverbinding is ontkoppel."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Berei tans netwerkverbinding '%s' voor..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "Gebruikersmagtiging vereis vir netwerkverbinding '%s'..."
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Vra tans 'n netwerkadres aan vir '%s'..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "Netwerkverbinding '%s' is aktief"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Begin tans VPN-verbinding '%s'..."
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "Gebruikersmagtiging vereis vir VPN-verbinding '%s'..."
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Vra tans 'n VPN-adres aan vir '%s'..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN-verbinding '%s' is aktief"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "Geen netwerkverbinding"
 
-#: ../src/applet-device-gsm.c:741
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "NetworkManager-miniprogram"
+
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Verkeerde PUK-kode. Kontak asseblief u verskaffer."
 
+#: ../src/applet-device-broadband.c:201
+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-gsm.c:768
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Stuur tans ontsluitkode..."
 
-#: ../src/applet-device-gsm.c:831
-msgid "SIM PIN unlock required"
-msgstr "SIM PIN-ontsluit vereis"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Selfoonbreëband (%s)"
 
-#: ../src/applet-device-gsm.c:832
-msgid "SIM PIN Unlock Required"
-msgstr "SIM PIN-ontsluit vereis"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "Selfoonbreëband"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:834
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"Die selfoon-breëbandtoestel '%s' vereis 'n SIM PIN-kode voordat dit gebruik "
-"kan word."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Beskikbaar"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:836
-msgid "PIN code:"
-msgstr "PIN-kode:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "Nuwe selfoon-breëbandverbinding"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:840
-msgid "Show PIN code"
-msgstr "Wys PIN-kode"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Verbinding bewerkstellig"
 
-#: ../src/applet-device-gsm.c:843
-msgid "SIM PUK unlock required"
-msgstr "SIM PUK-ontsluit vereis"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "U is nou aan die selfoon-breëbandnetwerk verbind."
 
-#: ../src/applet-device-gsm.c:844
-msgid "SIM PUK Unlock Required"
-msgstr "SIM PUK-ontsluit vereis"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "Selfoon-breëbandnetwerk-wagwoord"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:846
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"Die selfoon-breëbandtoestel '%s' vereis 'n SIM PUK-kode voordat dit gebruik "
-"kan word."
+#: ../src/applet-device-broadband.c:957
+#, fuzzy
+msgid "You are now registered on the home network."
+msgstr "U is nou aan die draadnetwerk verbind."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:848
-msgid "PUK code:"
-msgstr "PUK-kode:"
+#: ../src/applet-device-broadband.c:963
+#, fuzzy
+msgid "You are now registered on a roaming network."
+msgstr "U is nou aan die draadnetwerk verbind."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:851
-msgid "New PIN code:"
-msgstr "Nuwe PIN-kode:"
+#: ../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."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:853
-msgid "Re-enter new PIN code:"
-msgstr "Sleutel nuwe PIN-kode weer in:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "Berei tans selfoon-breëbandverbinding '%s' voor..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:858
-msgid "Show PIN/PUK codes"
-msgstr "Wys PIN/PUK-kodes"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, 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
+#, 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:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "Selfoon-breëbandverbinding '%s' is aktief"
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Outo-Ethernet"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "Draadnetwerke (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "Draadnetwerk (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "Draadnetwerke"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "Draadnetwerk"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1389
-msgid "disconnected"
-msgstr "ontkoppel"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../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-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "Berei tans draadnetwerkverbinding '%s' voor..."
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "Konfigureer tans draadnetwerkverbinding '%s'..."
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../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-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../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-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "Draadnetwerkverbinding '%s' is aktief"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-magtiging"
 
-#: ../src/applet-device-wifi.c:89
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Verbind aan verskuilde draadlose netwerk..."
 
-#: ../src/applet-device-wifi.c:142
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "Skep _nuwe draadlose netwerk..."
 
-#: ../src/applet-device-wifi.c:226
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(geen)"
 
-#: ../src/applet-device-wifi.c:795
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "Draadlose netwerke (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Draadnetwerke (%s)"
 
-#: ../src/applet-device-wifi.c:797
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "Draadlose netwerk (%s)"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Draadnetwerk (%s)"
 
-#: ../src/applet-device-wifi.c:799
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Draadlose netwerk"
-msgstr[1] "Draadlose netwerke"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Draadnetwerk"
+msgstr[1] "Draadnetwerk"
 
-#: ../src/applet-device-wifi.c:832
-msgid "wireless is disabled"
-msgstr "draadloos is gedeaktiveer"
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "WiMAX is gedeaktiveer"
 
-#: ../src/applet-device-wifi.c:833
-msgid "wireless is disabled by hardware switch"
-msgstr "draadloos is gedeaktiveer deur 'n hardewareskakelaar"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WiMAX is gedeaktiveer deur 'n hardewareskakelaar"
 
-#: ../src/applet-device-wifi.c:894
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Meer netwerke"
 
-#: ../src/applet-device-wifi.c:1073
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "Draadlose netwerke beskikbaar"
 
-#: ../src/applet-device-wifi.c:1075
-msgid "Click on this icon to connect to a wireless network"
-msgstr "Kliek op hierdie ikoon om aan 'n draadlose netwerk te verbind"
-
-#: ../src/applet-device-wifi.c:1076
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, 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:1079 ../src/applet.c:805
-msgid "Don't show this message again"
-msgstr "Moenie weer hierdie boodskap wys nie"
-
-#: ../src/applet-device-wifi.c:1271
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, 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:1302
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Berei tans draadlosenetwerkverbinding '%s' voor..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Berei tans netwerkverbinding '%s' voor..."
 
-#: ../src/applet-device-wifi.c:1305
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "Konfigureer tans draadlosenetwerkverbinding '%s'..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Konfigureer tans draadnetwerkverbinding '%s'..."
 
-#: ../src/applet-device-wifi.c:1308
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Gebruikersmagtiging vereis vir draadlose netwerk '%s'..."
 
-#: ../src/applet-device-wifi.c:1311
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Vra tans 'n draadlosenetwerkadres aan vir '%s'..."
+#: ../src/applet-device-wifi.c:1408
+#, 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:1332
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Draadlosenetwerkverbinding '%s' is aktief: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1337
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "Draadlosenetwerkverbinding '%s' is aktief"
-
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX-selfoonbreëband (%s)"
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX-selfoonbreëband"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "WiMAX is gedeaktiveer"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Draadnetwerkverbinding '%s' is aktief"
 
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX is gedeaktiveer deur 'n hardewareskakelaar"
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "Geen geldige aktiewe verbindings gevind nie!"
 
-#: ../src/applet-device-wimax.c:428
-msgid "You are now connected to the WiMAX network."
-msgstr "U is nou aan die WiMAX-netwerk verbind."
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "Geen netwerkverbinding"
 
-#: ../src/applet-dialogs.c:56
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Daar is 'n fout met die vertoon van verbindingsinligting:"
 
-#: ../src/applet-dialogs.c:108
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/wireless-dialog.c:946
-#: ../src/wireless-security/wireless-security.c:392
+#: ../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
 #, fuzzy
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:110
+#: ../src/applet-dialogs.c:74
 #, fuzzy
 msgid "Dynamic WEP"
 msgstr "Dinamiese-WEP"
 
-#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
-#: ../src/applet-dialogs.c:223
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:219
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adresse"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/wireless-dialog.c:903
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Geen"
 
-#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "Verstek"
+
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u MG/s"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../src/applet-dialogs.c:342
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Onbekend"
 
-#: ../src/applet-dialogs.c:344
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "onbekend"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP-adres:"
 
-#: ../src/applet-dialogs.c:356
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "onbekend"
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Uitsaai-adres:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Onbekend"
 
-#: ../src/applet-dialogs.c:391
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Subnetmasker:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:394
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:401
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:403
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:407
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Algemeen"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Koppelvlak:"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Hardeware-adres:"
 
 #. Driver
-#: ../src/applet-dialogs.c:441
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Drywer:"
 
-#: ../src/applet-dialogs.c:470
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Spoed:"
 
-#: ../src/applet-dialogs.c:480
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Sekuriteit:"
 
-#: ../src/applet-dialogs.c:493
-#, fuzzy
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:506
-#, fuzzy
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:523
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:534 ../src/applet-dialogs.c:641
-msgid "IP Address:"
-msgstr "IP-adres:"
-
-#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Onbekend"
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Verstekroete:"
 
-#: ../src/applet-dialogs.c:550
-msgid "Broadcast Address:"
-msgstr "Uitsaai-adres:"
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+msgid "IPv6"
+msgstr "IPv6"
 
-#. Prefix
-#: ../src/applet-dialogs.c:559
-msgid "Subnet Mask:"
-msgstr "Subnetmasker:"
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+msgid "Ignored"
+msgstr "Geïgnoreer"
 
-#: ../src/applet-dialogs.c:561
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Onbekend"
+#: ../src/applet-dialogs.c:815
+msgid "VPN Type:"
+msgstr ""
 
-#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
-msgid "Default Route:"
-msgstr "Verstekroete:"
+#: ../src/applet-dialogs.c:822
+msgid "VPN Gateway:"
+msgstr ""
 
-#: ../src/applet-dialogs.c:581
+#: ../src/applet-dialogs.c:828
 #, fuzzy
-msgid "Primary DNS:"
-msgstr "Eerste DNS:"
+msgid "VPN Username:"
+msgstr "Gebr_uikernaam:"
 
-#: ../src/applet-dialogs.c:590
-#, fuzzy
-msgid "Secondary DNS:"
-msgstr "Tweede DNS:"
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
 
-#: ../src/applet-dialogs.c:600
+#: ../src/applet-dialogs.c:840
 #, fuzzy
-msgid "Ternary DNS:"
-msgstr "Derde DNS:"
-
-#. --- IPv6 ---
-#: ../src/applet-dialogs.c:615
-msgid "IPv6"
-msgstr "IPv6"
+msgid "Base Connection:"
+msgstr "Verbi_nding:"
 
-#: ../src/applet-dialogs.c:624
-msgid "Ignored"
-msgstr "Geïgnoreer"
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#, fuzzy
+msgid "Unknown"
+msgstr "Onbekend"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:732
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Geen geldige aktiewe verbindings gevind nie!"
 
-#: ../src/applet-dialogs.c:785
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -647,1656 +952,2130 @@ msgstr ""
 "Kopiereg © 2005-2008 Novell, Inc.\n"
 "en baie ander gemeenskapsbydraers en vertalers"
 
-#: ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
-"Kennisgewingarea-miniprogram om u netwerktoestelle en verbindings te "
-"bestuur."
+"Kennisgewingarea-miniprogram om u netwerktoestelle en verbindings te bestuur."
 
-#: ../src/applet-dialogs.c:790
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager-webwerf"
 
-#: ../src/applet-dialogs.c:805
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Vermiste hulpbronne"
 
-#: ../src/applet-dialogs.c:830
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Selfoon-breëbandnetwerk-wagwoord"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:1039
 #, 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:854
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Wagwoord:"
 
-#: ../src/applet.c:894
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
-msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het misluk, want die netwerk verbinding was "
-"onderbreek."
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "SIM PIN-ontsluit vereis"
 
-#: ../src/applet.c:897
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
-msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het misluk, want die VPN-diens het onverwags gestop."
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "SIM PIN-ontsluit vereis"
 
-#: ../src/applet.c:900
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het misluk, want die VPN-diens het ongeldige "
-"konfigurasie teruggestuur."
+"Die selfoon-breëbandtoestel '%s' vereis 'n SIM PIN-kode voordat dit gebruik "
+"kan word."
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "PIN-kode:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "Wys PIN-kode"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "SIM PUK-ontsluit vereis"
 
-#: ../src/applet.c:903
+#: ../src/applet-dialogs.c:1348
+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:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het misluk, want die verbindingspoging het uitgetel."
+"Die selfoon-breëbandtoestel '%s' vereis 'n SIM PUK-kode voordat dit gebruik "
+"kan word."
 
-#: ../src/applet.c:906
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "PUK-kode:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "Nuwe PIN-kode:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "Sleutel nuwe PIN-kode weer in:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
 msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het misluk, want die VPN-diens het nie betyds begin "
-"nie."
 
-#: ../src/applet.c:909
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het misluk, want die VPN-diens kon nie begin nie."
+"IP-adresse identifiseer u rekenaar op die netwerk. Kliek die \"Voeg by\"-"
+"knoppie om 'n IP-adres by te voeg."
 
-#: ../src/applet.c:912
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+#: ../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
+msgid "_Add"
 msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het misluk, want daar was geen geldige VPN-geheime "
-"nie."
 
-#: ../src/applet.c:915
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+#. 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
+msgid "_Delete"
 msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het misluk as gevolg van ongeldige VPN-geheime."
 
-#: ../src/applet.c:922
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+msgid "Ig_nore automatically obtained routes"
 msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het misluk."
 
-#: ../src/applet.c:940
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+msgid "_Use this connection only for resources on its network"
 msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het ontkoppel, want die netwerk verbinding was "
-"onderbreek."
 
-#: ../src/applet.c:943
-#, c-format
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het ontkoppel, want die VPN-diens het gestop."
 
-#: ../src/applet.c:949
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+#: ../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 ""
-"\n"
-"Die VPN-verbinding '%s' het ontkoppel."
 
-#: ../src/applet.c:983
-msgid "VPN Login Message"
-msgstr "VPN-aanmeldboodskap"
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+msgid "Create…"
+msgstr ""
 
-#: ../src/applet.c:989 ../src/applet.c:997 ../src/applet.c:1047
-msgid "VPN Connection Failed"
-msgstr "VPN-verbinding het misluk"
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+msgid "Choose a Connection Type"
+msgstr ""
 
-#: ../src/applet.c:1054
-#, c-format
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+"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."
 msgstr ""
-"\n"
-"Die VPN-verbinding '%s' het misluk, want die VPN-diens kon nie begin nie.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1057
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
 msgstr ""
-"\n"
-"Die VPN-verbinding '%s' kon nie begin nie.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1377
-msgid "device not ready (firmware missing)"
-msgstr "toestel nie gereed nie (vermiste fermware)"
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
 
-#: ../src/applet.c:1379
-msgid "device not ready"
-msgstr "toestel nie gereed nie"
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
 
-#: ../src/applet.c:1405
-msgid "Disconnect"
-msgstr "Ontkoppel"
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "Uitsaai-adres:"
 
-#: ../src/applet.c:1419
-msgid "device not managed"
-msgstr "toestel word nie bestuur nie"
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
 
-#: ../src/applet.c:1463
-msgid "No network devices available"
-msgstr "Geen netwerktoestelle beskikbaar nie"
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
 
-#: ../src/applet.c:1551
-msgid "_VPN Connections"
-msgstr "_VPN-verbindings"
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
 
-#: ../src/applet.c:1608
-msgid "_Configure VPN..."
-msgstr "_Stel VPN op..."
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
 
-#: ../src/applet.c:1612
-msgid "_Disconnect VPN"
-msgstr "_Ontkoppel VPN"
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr ""
 
-#: ../src/applet.c:1710
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager loop nie tans nie..."
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Verbi_nding:"
 
-#: ../src/applet.c:1715 ../src/applet.c:2508
-msgid "Networking disabled"
-msgstr "Netwerke gedeaktiveer"
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:1936
-msgid "Enable _Networking"
-msgstr "Aktiveer _netwerke"
+#. 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
+msgid "_Edit"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:1945
-msgid "Enable _Wireless"
-msgstr "Aktiveer _draadloos"
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1954
-msgid "Enable _Mobile Broadband"
-msgstr "Aktiveer _selfoonbreëband"
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+msgid "ms"
+msgstr ""
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:1963
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Aktiveer WiMA_X-selfoonbreëband"
+#: ../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
+#, fuzzy
+msgid "_Interface name:"
+msgstr "Koppelvlak:"
 
-#. Toggle notifications item
-#: ../src/applet.c:1974
-msgid "Enable N_otifications"
-msgstr "Aktiveer _kennisgewings"
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
 
-#. 'Connection Information' item
-#: ../src/applet.c:1985
-msgid "Connection _Information"
-msgstr "_Verbindingsinligting"
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:1995
-msgid "Edit Connections..."
-msgstr "Redigeer verbindings..."
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid ""
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2009
-msgid "_Help"
-msgstr "_Help"
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2018
-msgid "_About"
-msgstr "_Aangaande"
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
 
-#: ../src/applet.c:2195
-msgid "Disconnected"
-msgstr "Geontkoppel"
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "Eerste DNS:"
 
-#: ../src/applet.c:2196
-msgid "The network connection has been disconnected."
-msgstr "Die netwerkverbinding is ontkoppel."
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr ""
 
-#: ../src/applet.c:2377
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "Berei tans netwerkverbinding '%s' voor..."
+#: ../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:"
+msgstr ""
 
-#: ../src/applet.c:2380
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "Gebruikersmagtiging vereis vir netwerkverbinding '%s'..."
+#: ../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
+msgid "bytes"
+msgstr ""
 
-#: ../src/applet.c:2386
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "Netwerkverbinding '%s' is aktief"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
 
-#: ../src/applet.c:2464
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "Begin tans VPN-verbinding '%s'..."
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+msgid "_Priority:"
+msgstr ""
 
-#: ../src/applet.c:2467
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "Gebruikersmagtiging vereis vir VPN-verbinding '%s'..."
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
 
-#: ../src/applet.c:2470
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Vra tans 'n VPN-adres aan vir '%s'..."
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Verbi_nding:"
 
-#: ../src/applet.c:2473
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN-verbinding '%s' is aktief"
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
 
-#: ../src/applet.c:2512
-msgid "No network connection"
-msgstr "Geen netwerkverbinding"
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
 
-#: ../src/applet.c:3161
-msgid "NetworkManager Applet"
-msgstr "NetworkManager-miniprogram"
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
 
-#: ../src/applet.c:3167 ../src/wired-dialog.c:127
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Aktiveer _netwerke"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
-"Die NetworkManager-miniprogram kon party vereiste hulpbronne (die .ui-lêer) "
-"nie vind nie."
 
-#: ../src/applet.ui.h:1 ../src/connection-editor/ce-vpn-wizard.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 " "
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
 msgstr ""
 
-#: ../src/applet.ui.h:2
-msgid "Active Network Connections"
-msgstr "Aktiewe netwerkverbindings"
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
 
-#: ../src/applet.ui.h:3
-msgid "C_onnect"
-msgstr "_Verbind"
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "outomaties"
 
-#: ../src/applet.ui.h:4
-msgid "C_onnection:"
-msgstr "Verbi_nding:"
+#: ../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
+msgid "default"
+msgstr ""
 
-#: ../src/applet.ui.h:5
-msgid "Connection Information"
-msgstr "Verbindingsinligting"
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
 
-#: ../src/applet.ui.h:6
-msgid "Other Wireless Network..."
-msgstr "Ander draadlose netwerk..."
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adresse"
 
-#: ../src/applet.ui.h:7
-msgid "Wireless _adapter:"
-msgstr "Draadlosenetwerk-p_asstuk:"
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "IP-adres:"
 
-#: ../src/applet.ui.h:8
-msgid "_Network name:"
-msgstr "_Netwerk-naam:"
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
 
-#: ../src/applet.ui.h:9
-msgid "_Unlock"
-msgstr "Ontsl_uit"
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
 
-#: ../src/applet.ui.h:10
-msgid "Wireless _security:"
-msgstr "_Draadloos-sekuriteit:"
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
 
-#: ../src/applet.ui.h:11
-msgid "label"
-msgstr "etiket"
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:67
-msgid "automatic"
-msgstr "outomaties"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Enige toetstel"
 
-#: ../src/connection-editor/ce-page.c:294
+#: ../src/connection-editor/ce-page.c:591
 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-dsl.ui.h:1
-#: ../src/wireless-security/eap-method-leap.ui.h:1
-#: ../src/wireless-security/eap-method-simple.ui.h:2
-#: ../src/wireless-security/eap-method-tls.ui.h:4
-#: ../src/wireless-security/ws-leap.ui.h:1
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "Sho_w password"
-msgstr "_Wys wagwoord"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Password:"
-msgstr "W_agwoord:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-msgid "_Service:"
-msgstr "Dien_s:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:4
-#: ../src/wireless-security/ws-leap.ui.h:3
-msgid "_Username:"
-msgstr "Gebr_uikernaam:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:1
-#: ../src/connection-editor/ce-page-ip6.ui.h:1
-msgid "Addresses"
-msgstr "Adresse"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:3
-msgid "Automatic"
-msgstr "Outomaties"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-msgid "Automatic with manual DNS settings"
-msgstr "Outomaties met handmatige DNS-instellings"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-msgid "D_HCP client ID:"
-msgstr "D_HCP-kliënt-ID:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
-msgid ""
-"Domains used when resolving host names. Use commas to separate multiple "
-"domains."
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
 msgstr ""
-"Domeine gebruik wanneer gasheername opgelos word. Gebruik kommas om "
-"veelvuldige domeine te skei."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
 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-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-msgid ""
-"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-dcb.ui.h:11
+msgid "Options..."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-msgid "Ig_nore automatically obtained routes"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "Link-Local"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/page-ip4.c:163
-#: ../src/connection-editor/page-ip6.c:185
-msgid "Manual"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-msgid "Require IPv4 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:205
-msgid "Shared to other computers"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-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."
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "Use this c_onnection only for resources on its network"
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
-msgid ""
-"When connecting to IPv6-capable networks, allows the connection to complete "
-"if IPv4 configuration fails but IPv6 configuration succeeds."
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "DNS ser_vers:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:18
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "_Method:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:19
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
-msgid "_Routes…"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:20
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "_Search domains:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
-msgid ""
-"When connecting to IPv4-capable networks, allows the connection to complete "
-"if IPv6 configuration fails but IPv4 configuration succeeds."
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "2G (GPRS/EDGE)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "Advanced"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Allow roaming if home network is not available"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Any"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Basic"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
-msgid "N_etwork ID:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "Nu_mber:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "PI_N:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-msgid "Prefer 2G (GPRS/EDGE)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
-msgid "Sho_w passwords"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "_Type:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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-ppp.ui.h:1
-msgid "Allow _BSD data compression"
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
-msgid "Allowed Authentication Methods"
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+msgid "Enter the traffic class for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "Allowed methods:"
+#: ../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:"
+msgstr "Gebr_uikernaam:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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-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
+msgid "Automatic"
+msgstr "Outomaties"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
-msgid "Authentication"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:6
-msgid "C_HAP"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:7
-msgid "Challenge Handshake Authentication Protocol"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:8
-msgid "Compression"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Configure _Methods…"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Echo"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "Extensible Authentication Protocol"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "Dien_s:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+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 ""
-"In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods."
+"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-ppp.ui.h:13
-msgid "MSCHAP v_2"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:14
-msgid "Microsoft Challenge Handshake Authentication Protocol"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Verstek"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Geïgnoreer"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:15
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:16
-msgid "Password Authentication Protocol"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:17
-msgid "Send PPP _echo packets"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Uitsaai-adres:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:18
-msgid "Use TCP _header compression"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:19
-msgid "Use _stateful MPPE"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+msgid "_Wake on LAN password:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:20
-msgid "_EAP"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+msgid ""
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:21
-msgid "_MSCHAP"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:22
-msgid "_PAP"
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:23
-msgid "_Require 128-bit encryption"
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:24
-msgid "_Use point-to-point encryption (MPPE)"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:1
+msgid "_Transport mode:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+#. IP-over-InfiniBand "datagram mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+msgid "Datagram"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "_Verbind"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr "Outomaties met handmatige DNS-instellings"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+#: ../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 ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
+#: ../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
+msgid "Shared to other computers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "_Method:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "Full duple_x"
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Addresses"
+msgstr "Adresse"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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-wired.ui.h:10
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "MT_U:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
 msgstr ""
+"Domeine gebruik wanneer gasheername opgelos word. Gebruik kommas om "
+"veelvuldige domeine te skei."
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr "D_HCP-kliënt-ID:"
+
+#: ../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
+msgid "S_earch domains:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-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"
+#: ../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:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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-wired.ui.h:14
-msgid "Twisted Pair (TP)"
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-msgid "_Cloned MAC address:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
-msgid "_Device MAC address:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Port:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-msgid "_Speed:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:19
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "bytes"
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-msgid "A (5 GHz)"
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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-wireless.ui.h:2
-msgid "Ad-hoc"
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "B/G (2.4 GHz)"
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
-msgid "Ban_d:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+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-wireless.ui.h:6
-msgid "C_hannel:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:1
+msgid "Basic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "Infrastructure"
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "Nu_mber:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "M_ode:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Advanced"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "Mb/s"
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "_APN:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "N_etwork ID:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
-msgid "Transmission po_wer:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid "_BSSID:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_Rate:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "_SSID:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Sho_w passwords"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:21
-msgid "mW"
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
+msgid "Authentication"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
+msgid "Allowed methods:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
 msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+msgid "Compression"
 msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Create…"
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
 msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-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."
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
+msgid "_Require 128-bit encryption"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:506
-#: ../src/connection-editor/ip6-routes-dialog.c:464
-#: ../src/connection-editor/page-ip4.c:733
-#: ../src/connection-editor/page-ip6.c:718
-msgid "Address"
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+msgid "Use _stateful MPPE"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:522
-#: ../src/connection-editor/page-ip4.c:750
-msgid "Netmask"
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Allow _BSD data compression"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:538
-#: ../src/connection-editor/ip6-routes-dialog.c:496
-#: ../src/connection-editor/page-ip4.c:767
-#: ../src/connection-editor/page-ip6.c:752
-msgid "Gateway"
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
+msgid "Allow _Deflate data compression"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:554
-#: ../src/connection-editor/ip6-routes-dialog.c:512
-msgid "Metric"
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Use TCP _header compression"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:480
-#: ../src/connection-editor/page-ip6.c:735
-msgid "Prefix"
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:137
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1444
-msgid "DSL"
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:139
-msgid "Could not load DSL user interface."
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:229
-#, c-format
-msgid "DSL connection %d"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:126
-msgid "Automatic (VPN)"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Verbi_nding:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:127
-msgid "Automatic (VPN) addresses only"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "Koppelvlak:"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:130
-msgid "Automatic (PPP)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+msgid "Cloned MAC _address:"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:131
-msgid "Automatic (PPP) addresses only"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
-msgid "Automatic (PPPoE)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
-msgid "Automatic (PPPoE) addresses only"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:137
-msgid "Automatic (DHCP)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:138
-msgid "Automatic (DHCP) addresses only"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:175
-#: ../src/connection-editor/page-ip6.c:198
-msgid "Link-Local Only"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:191
-msgid "Disabled"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:699
-#, c-format
-msgid "Editing IPv4 routes for %s"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:810
-msgid "IPv4 Settings"
-msgstr "IPv4-instellings"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "Sekuriteit:"
 
-#: ../src/connection-editor/page-ip4.c:812
-msgid "Could not load IPv4 user interface."
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic, addresses only"
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:149
-#: ../src/wireless-security/eap-method.c:285
-msgid "Ignore"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:173
-msgid "Automatic, DHCP only"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:684
-#, c-format
-msgid "Editing IPv6 routes for %s"
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:793
-msgid "IPv6 Settings"
-msgstr "IPv6-instellings"
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:795
-msgid "Could not load IPv6 user interface."
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:374
-msgid "Could not load mobile broadband user interface."
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:391
-msgid "Unsupported mobile broadband connection type."
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
 msgstr ""
 
-#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:632
-msgid "Select Mobile Broadband Provider Type"
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:659
-msgid ""
-"Select the technology your mobile broadband provider uses.  If you are "
-"unsure, ask your provider."
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:664
-msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:671
-msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:134
-msgid "EAP"
+#: ../src/connection-editor/ce-polkit-button.c:74
+msgid "No polkit authorization to perform the action"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:232
-msgid "PAP"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+msgid "Allowed Authentication Methods"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
-msgid "CHAP"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-peap.c:248
-#: ../src/wireless-security/eap-method-ttls.c:264
-msgid "MSCHAPv2"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:248
-msgid "MSCHAP"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
 msgstr ""
 
-#. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
-msgid "none"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:201
-#, c-format
-msgid "Editing PPP authentication methods for %s"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:281
-msgid "PPP Settings"
-msgstr "PPP-instellings"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:283
-msgid "Could not load PPP user interface."
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:107
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1440
-msgid "VPN"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:109
-msgid "Could not load VPN user interface."
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:124
-#, c-format
-msgid "Could not find VPN plugin service for '%s'."
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:218
-#: ../src/connection-editor/nm-connection-list.c:881
-#, c-format
-msgid "VPN connection %d"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/page-wired.c:211
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1428
-msgid "Wired"
+#: ../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 "Outo-Ethernet"
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/page-wired.c:213
-msgid "Could not load wired user interface."
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/page-wired.c:348
-#, c-format
-msgid "Wired connection %d"
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
 msgstr ""
 
-#: ../src/connection-editor/page-wired-security.c:114
-msgid "802.1x Security"
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
+msgid "InfiniBand"
 msgstr ""
 
-#: ../src/connection-editor/page-wired-security.c:116
-msgid "Could not load Wired Security security user interface."
+#: ../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
+msgid "Bond"
 msgstr ""
 
-#: ../src/connection-editor/page-wired-security.c:130
-msgid "Use 802.1X security for this connection"
+#: ../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
+msgid "Team"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:147
-#: ../src/connection-editor/page-wireless.c:151
-#: ../src/connection-editor/page-wireless.c:172
-#, c-format
-msgid "default"
+#: ../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
+msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:176
-#, c-format
-msgid "%u (%u MHz)"
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:396
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1432
-msgid "Wireless"
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:398
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "Hardeware-adres:"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:562
-#, c-format
-msgid "Wireless connection %d"
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+msgid "Import a saved VPN configuration..."
 msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/wireless-dialog.c:920
-msgid "WEP 40/128-bit Key (Hex or ASCII)"
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
 msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:272
-#: ../src/wireless-dialog.c:929
-msgid "WEP 128-bit Passphrase"
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/wireless-dialog.c:959
-msgid "Dynamic WEP (802.1x)"
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/wireless-dialog.c:973
-msgid "WPA & WPA2 Personal"
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/wireless-dialog.c:987
-msgid "WPA & WPA2 Enterprise"
+#: ../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
+msgid "Address"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:359
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:368
-msgid "Wireless Security"
+#: ../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
+msgid "Gateway"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:105
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:292
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Daar is 'n fout met die vertoon van verbindingsinligting:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+msgid "Editor initializing..."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Verbinding bewerkstellig"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:395
-msgid "Error creating connection editor dialog."
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.c:407
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:409
-msgid "_Save..."
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "Authenticate to save this connection for all users of this machine."
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "Geen netwerkverbinding"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "A_vailable to all users"
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
+#: ../src/connection-editor/nm-connection-editor.c:921
+msgid "Connection add failed"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "E_xport"
+#: ../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
+msgid "Connection _name:"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "_Import"
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:216
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr ""
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:249
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:261
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:267
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:271
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:516
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
+msgid "Don't know how to create '%s' connections"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
-msgid "An unknown error occurred."
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:683
-msgid "Error initializing editor"
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:700
-#: ../src/connection-editor/nm-connection-list.c:867
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
+#: ../src/connection-editor/page-8021x-security.c:111
+msgid "Could not load 802.1x Security user interface."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:714
-msgid "Could not edit connection"
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:744
-msgid "Connection delete failed"
+#: ../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
+msgid "Could not load Bluetooth user interface."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:776
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
+msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:911
-#: ../src/connection-editor/vpn-helpers.c:227
-msgid "Cannot import VPN connection"
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Geen netwerkverbinding"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:913
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:926
-msgid "Could not edit imported connection"
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Aktiveer _netwerke"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Draadlose netwerk"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1069
-msgid "Name"
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "Eerste DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "Geen netwerkverbinding"
+
+#: ../src/connection-editor/page-bridge.c:213
+msgid "Could not load bridge user interface."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1081
-msgid "Last Used"
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+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
+msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1197
-msgid "No VPN plugin available. Please install one to enable this button."
+#: ../src/connection-editor/page-bridge-port.c:110
+msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1208
-msgid "_Edit"
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1209
-msgid "Edit the selected connection"
+#: ../src/connection-editor/page-dcb.c:605
+msgid "Could not load DCB user interface."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1210
-msgid "_Edit..."
+#: ../src/connection-editor/page-dsl.c:129
+msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1211
-msgid "Authenticate to edit the selected connection"
+#: ../src/connection-editor/page-dsl.c:214
+#, c-format
+msgid "DSL connection %d"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1226
-msgid "_Delete"
+#: ../src/connection-editor/page-ethernet.c:74
+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/nm-connection-list.c:1227
-msgid "Delete the selected connection"
+#: ../src/connection-editor/page-ethernet.c:328
+msgid "Could not load ethernet user interface."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1228
-msgid "_Delete..."
+#: ../src/connection-editor/page-ethernet.c:457
+#, 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
+msgid "cloned MAC"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1229
-msgid "Authenticate to delete the selected connection"
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1500
-msgid "Error creating connection"
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "Verstek"
+
+#: ../src/connection-editor/page-general.c:52
+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 loop nie tans nie..."
+
+#: ../src/connection-editor/page-general.c:350
+msgid "Could not load General user interface."
+msgstr ""
+
+#: ../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 ""
 
-#: ../src/connection-editor/nm-connection-list.c:1501
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
-msgid "Don't know how to create '%s' connections"
+msgid "InfiniBand connection %d"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1555
-#: ../src/connection-editor/nm-connection-list.c:1567
-msgid "Error editing connection"
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
+msgid "Automatic (VPN)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
+msgid "Automatic (VPN) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1556
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
+msgid "Automatic (PPPoE)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
+msgid "Automatic (PPPoE) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:135
+msgid "Automatic (DHCP)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:136
+msgid "Automatic (DHCP) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
+msgid "Link-Local Only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+msgid "Additional DNS ser_vers:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+msgid "Additional s_earch domains:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
-msgid "Don't know how to edit '%s' connections"
+msgid "Editing IPv4 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1568
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr "IPv4-instellings"
+
+#: ../src/connection-editor/page-ip4.c:1160
+msgid "Could not load IPv4 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
-msgid "Did not find a connection with UUID '%s'"
+msgid "IPv4 address \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
-msgid ""
-"The file '%s' could not be read or does not contain recognized VPN "
-"connection information\n"
-"\n"
-"Error: %s."
+msgid "IPv4 address netmask \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:261
-msgid "Select file to import"
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:309
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
-msgid "A file named \"%s\" already exists."
+msgid "IPv4 DNS server \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:311
-msgid "_Replace"
+#: ../src/connection-editor/page-ip6.c:148
+msgid "Ignore"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:172
+msgid "Automatic, DHCP only"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
-msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgid "Editing IPv6 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:349
-msgid "Cannot export VPN connection"
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr "IPv6-instellings"
+
+#: ../src/connection-editor/page-ip6.c:1157
+msgid "Could not load IPv6 user interface."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:351
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
-msgid ""
-"The VPN connection '%s' could not be exported to %s.\n"
-"\n"
-"Error: %s."
+msgid "IPv6 address \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:385
-msgid "Export VPN connection..."
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:218
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
-msgid "Failed to create PAN connection: %s"
+msgid "IPv6 gateway \"%s\" invalid"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:223
-#: ../src/gnome-bluetooth/bt-widget.c:491
-msgid "Your phone is now ready to use!"
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:247
+#: ../src/connection-editor/page-master.c:249
 #, c-format
-msgid "%s Network"
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:373
+#: ../src/connection-editor/page-master.c:260
 #, c-format
-msgid "Error: %s"
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:486
+#: ../src/connection-editor/page-master.c:385
 #, c-format
-msgid "Failed to create DUN connection: %s"
+msgid "%s slave %d"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:509
-msgid "Mobile wizard was canceled"
+#: ../src/connection-editor/page-mobile.c:310
+msgid "Could not load mobile broadband user interface."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:518
-msgid "Unknown phone device type (not GSM or CDMA)"
+#: ../src/connection-editor/page-mobile.c:327
+msgid "Unsupported mobile broadband connection type."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:712
-#: ../src/gnome-bluetooth/bt-widget.c:718
-msgid "failed to connect to the phone."
+#. Fall back to just asking for GSM vs. CDMA
+#: ../src/connection-editor/page-mobile.c:529
+msgid "Select Mobile Broadband Provider Type"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:751
-msgid "unexpectedly disconnected from the phone."
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:760
-msgid "timed out detecting phone details."
+#: ../src/connection-editor/page-mobile.c:561
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:772
-msgid "Detecting phone configuration..."
+#: ../src/connection-editor/page-mobile.c:568
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:838
-msgid "could not find the Bluetooth device."
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
+msgid "EAP"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:971
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
+msgid "PAP"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1003
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
+msgid "CHAP"
+msgstr ""
+
+#: ../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
+msgid "MSCHAPv2"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
+msgid "MSCHAP"
+msgstr ""
+
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:136
+msgid "none"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:196
 #, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+msgid "Editing PPP authentication methods for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr "PPP-instellings"
+
+#: ../src/connection-editor/page-ppp.c:281
+msgid "Could not load PPP user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+msgid "Could not load team user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr ""
+"\n"
+"Die VPN-verbinding '%s' het misluk."
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1013
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#: ../src/connection-editor/page-team-port.c:153
+msgid "Could not load team port user interface."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1022
+#. 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
 #, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
+msgid "%s (via \"%s\")"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1085
-msgid "Use your mobile phone as a network device (PAN/NAP)"
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Geen netwerkverbinding"
+
+#: ../src/connection-editor/page-vlan.c:596
+msgid "Could not load vlan user interface."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1094
-msgid "Access the Internet using your mobile phone (DUN)"
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
 msgstr ""
 
-#: ../src/main.c:70
-msgid "Usage:"
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "VPN-verbinding het misluk"
+
+#: ../src/connection-editor/page-vpn.c:103
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:118
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
+#, c-format
+msgid "VPN connection %d"
 msgstr ""
 
-#: ../src/main.c:72
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"This program is a component of NetworkManager (https://wiki.gnome.org/"
-"Projects/NetworkManager/)."
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
 msgstr ""
 
-#: ../src/main.c:73
+#: ../src/connection-editor/page-vpn.c:255
 msgid ""
-"It is not intended for command-line interaction but instead runs in the "
-"GNOME desktop environment."
+"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/mb-menu-item.c:57
-msgid "EVDO"
-msgstr "EVDO"
+#: ../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/mb-menu-item.c:61
-msgid "GPRS"
-msgstr "GPRS"
+#: ../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/mb-menu-item.c:63
-msgid "EDGE"
-msgstr "EDGE"
+#: ../src/connection-editor/page-wifi.c:197
+#, c-format
+msgid "%u (%u MHz)"
+msgstr ""
 
-#: ../src/mb-menu-item.c:65
-msgid "UMTS"
-msgstr "UMTS"
+#: ../src/connection-editor/page-wifi.c:450
+msgid "Could not load Wi-Fi user interface."
+msgstr ""
 
-#: ../src/mb-menu-item.c:67
-msgid "HSDPA"
-msgstr "HSDPA"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
 
-#: ../src/mb-menu-item.c:69
-msgid "HSUPA"
-msgstr "HSUPA"
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Enige toetstel"
 
-#: ../src/mb-menu-item.c:71
-msgid "HSPA"
-msgstr "HSPA"
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "VPN-verbinding het misluk"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
+msgid "WEP 40/128-bit Key (Hex or ASCII)"
+msgstr ""
 
-#: ../src/mb-menu-item.c:109
-msgid "not enabled"
-msgstr "nie geaktiveer nie"
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+msgid "WEP 128-bit Passphrase"
+msgstr ""
 
-#: ../src/mb-menu-item.c:115
-msgid "not registered"
-msgstr "nie geregistreer is nie"
+#: ../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)"
+msgstr ""
 
-#: ../src/mb-menu-item.c:133
-#, c-format
-msgid "Home network (%s)"
-msgstr "Huisnetwerk (%s)"
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+msgid "WPA & WPA2 Personal"
+msgstr ""
 
-#: ../src/mb-menu-item.c:135
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+msgid "WPA & WPA2 Enterprise"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:413
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
+msgstr "Sekuriteit:"
+
+#: ../src/connection-editor/page-wifi-security.c:426
+msgid "Could not load Wi-Fi security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Home network"
-msgstr "Huisnetwerk"
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/mb-menu-item.c:143
-msgid "searching"
-msgstr "soek tans"
+#: ../src/connection-editor/page-wifi-security.c:512
+#, c-format
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/mb-menu-item.c:146
-msgid "registration denied"
-msgstr "registrasie geweier"
+#: ../src/connection-editor/vpn-helpers.c:138
+msgid "Cannot import VPN connection"
+msgstr ""
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
-msgid "%s (%s roaming)"
+msgid ""
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
+"\n"
+"Error: %s."
 msgstr ""
 
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "onbekend"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
-msgid "%s (roaming)"
+msgid "A file named \"%s\" already exists."
 msgstr ""
 
-#: ../src/mb-menu-item.c:162
+#: ../src/connection-editor/vpn-helpers.c:217
+msgid "_Replace"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
-msgid "Roaming network (%s)"
-msgstr "Swerfnetwerk (%s)"
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:255
+msgid "Cannot export VPN connection"
+msgstr ""
 
-#: ../src/mb-menu-item.c:164
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
-msgid "Roaming network"
-msgstr "Swerfnetwerk"
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:292
+msgid "Export VPN connection..."
+msgstr ""
+
+#: ../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 ""
+"Die NetworkManager-miniprogram kon party vereiste hulpbronne (die .ui-lêer) "
+"nie vind nie."
+
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "Ontsl_uit"
+
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr ""
+
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Verbindingsinligting"
+
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "Aktiewe netwerkverbindings"
 
-#: ../src/utils/mobile-wizard.c:196
+#: ../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:"
+"Die selfoon-breëbandverbinding is gekonfigureer met die volgende instellings:"
 
 #. Device
-#: ../src/utils/mobile-wizard.c:203
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Toestel:"
 
 #. Provider
-#: ../src/utils/mobile-wizard.c:214
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Verskaffer:"
 
 #. Plan and APN
-#: ../src/utils/mobile-wizard.c:225
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Diensplan:"
 
-#: ../src/utils/mobile-wizard.c:246
+#: ../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 "
@@ -2305,23 +3084,28 @@ msgid ""
 "Preferences menu."
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:258
+#: ../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/utils/mobile-wizard.c:319
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Ongelys"
 
-#: ../src/utils/mobile-wizard.c:437
+#: ../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/utils/mobile-wizard.c:461
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:480
+#: ../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"
@@ -2329,67 +3113,83 @@ msgid ""
 "If you are unsure of your plan please ask your provider for your plan's APN."
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:487
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:688
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:701
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Verskaffer"
 
-#: ../src/utils/mobile-wizard.c:726
+#: ../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/utils/mobile-wizard.c:737
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Verskaffer:"
 
-#: ../src/utils/mobile-wizard.c:761
+#: ../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/utils/mobile-wizard.c:767
+#: ../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/utils/mobile-wizard.c:778
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Kies die verskaffer"
 
-#: ../src/utils/mobile-wizard.c:1024
+#: ../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/utils/mobile-wizard.c:1036
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Land of streek"
 
-#: ../src/utils/mobile-wizard.c:1043
+#: ../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/utils/mobile-wizard.c:1089
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Kies die verskaffer se land of streek"
 
-#: ../src/utils/mobile-wizard.c:1143
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Geïnstalleerde GSM-toestel"
 
-#: ../src/utils/mobile-wizard.c:1146
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Geïnstalleerde GSM-toestel"
 
-#: ../src/utils/mobile-wizard.c:1314
+#: ../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."
@@ -2397,178 +3197,496 @@ msgstr ""
 "Dié assistent help om maklik 'n selfoon-breëbandverbinding na 'n "
 "selfoonnetwerk (3G) op te stel."
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Die volgende inligting word benodig:"
 
-#: ../src/utils/mobile-wizard.c:1330
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Die breëbandverskaffer se naam"
 
-#: ../src/utils/mobile-wizard.c:1336
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/utils/mobile-wizard.c:1342
+#: ../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 ""
 
-#: ../src/utils/mobile-wizard.c:1369
+#: ../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 ""
 
-#: ../src/utils/mobile-wizard.c:1384
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Enige toetstel"
 
-#: ../src/utils/mobile-wizard.c:1397
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Stel 'n selfoon-breëbandverbinding op"
 
-#: ../src/utils/mobile-wizard.c:1561
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nuwe selfoon-breëbandverbinding"
 
-#: ../src/utils/nmn-mobile-providers.c:78
-msgid "United Kingdom"
-msgstr "Verenigde Koninkryk"
+#: ../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/utils/nmn-mobile-providers.c:510
-msgid "Default"
-msgstr "Verstek"
+#: ../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
+#, 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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "W_agwoord:"
 
-#: ../src/wired-dialog.c:97
-msgid "Wired 802.1X authentication"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "W_agwoord:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_Wys wagwoord"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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/wireless-dialog.c:454
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nuwe.."
 
-#: ../src/wireless-dialog.c:1074
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Geen"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "S_kep"
 
-#: ../src/wireless-dialog.c:1152
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Wagwoorde of enkripsiesleutels word benodig vir toegang tot die draadlose "
 "netwerk '%s'."
 
-#: ../src/wireless-dialog.c:1154
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+msgid "Wi-Fi Network Authentication Required"
 msgstr ""
 
-#: ../src/wireless-dialog.c:1156
-msgid "Authentication required by wireless network"
-msgstr ""
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "Gebruikersmagtiging vereis vir draadlose netwerk '%s'..."
 
-#: ../src/wireless-dialog.c:1161
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "Skep nuwe draadlose netwerk"
 
-#: ../src/wireless-dialog.c:1163
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "Nuwe draadlose netwerk"
 
-#: ../src/wireless-dialog.c:1164
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, 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/wireless-dialog.c:1166
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Verbind aan verskuilde draadlose netwerk"
 
-#: ../src/wireless-dialog.c:1168
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "Verskuilde draadlose netwerk"
 
-#: ../src/wireless-dialog.c:1169
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "Gee die naam en sekuriteitbesonderhede van die verskuilde draadlose netwerk "
 "waaraan u wil verbind."
 
-#: ../src/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Draadloos-sekuriteit:"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+msgid "C_onnection:"
+msgstr "Verbi_nding:"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Draadlosenetwerk-p_asstuk:"
+
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:280
+#: ../src/main.c:44
 msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+
+#: ../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
+msgid "EVDO"
+msgstr "EVDO"
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr "GPRS"
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr "EDGE"
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr "UMTS"
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr "HSDPA"
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr "HSUPA"
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr "nie geaktiveer nie"
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr "nie geregistreer is nie"
+
+#: ../src/mb-menu-item.c:141
+#, c-format
+msgid "Home network (%s)"
+msgstr "Huisnetwerk (%s)"
+
+#: ../src/mb-menu-item.c:143
+#, c-format
+msgid "Home network"
+msgstr "Huisnetwerk"
+
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr "soek tans"
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr "registrasie geweier"
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr ""
+
+#: ../src/mb-menu-item.c:170
+#, c-format
+msgid "Roaming network (%s)"
+msgstr "Swerfnetwerk (%s)"
+
+#: ../src/mb-menu-item.c:172
+#, c-format
+msgid "Roaming network"
+msgstr "Swerfnetwerk"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "PIN-kode vereis"
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "PIN-kode word benodig vir die selfoon-breëbandtoestel"
+
+#: ../src/mobile-helpers.c:619
+#, 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:622
+msgid "roaming"
+msgstr "swerwing"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Verbi_nding:"
+
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:627
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:630
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- of PEM-sertifikate (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:264
-#: ../src/wireless-security/wireless-security.c:368
-msgid "MD5"
-msgstr "MD5"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:349
-#: ../src/wireless-security/eap-method-tls.c:419
-#: ../src/wireless-security/eap-method-ttls.c:349
-msgid "Choose a Certificate Authority certificate..."
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+msgid "Anonymous"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "DSL-magtiging"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "C_A certificate:"
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file:"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
-msgid "I_nner authentication:"
+#: ../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
+#, fuzzy
+msgid "_Inner authentication:"
+msgstr "DSL-magtiging"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+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 ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
 msgstr "Weergawe 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:4
 msgid "Version 1"
 msgstr "Weergawe 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "_PEAP version:"
+#: ../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 ""
 
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-msgid "As_k for this password every time"
-msgstr "Vra tel_kens vir 'n wagwoord"
+#: ../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
+msgid "No CA certificate is _required"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:250
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+msgid "PEAP _version:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:253
+#: ../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 "
@@ -2577,62 +3695,110 @@ msgid ""
 "(You can password-protect your private key with openssl)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:413
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:425
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-msgid "Private _key:"
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
 msgstr ""
 
 #: ../src/wireless-security/eap-method-tls.ui.h:5
-msgid "_Private key password:"
+msgid "Private _key:"
 msgstr ""
 
 #: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_User certificate:"
+msgid "_Private key password:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-ttls.c:63
+#, c-format
+msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:380
+#: ../src/wireless-security/eap-method-ttls.c:68
+msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:404
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:415
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
 #: ../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
-msgid "_Authentication:"
+#, fuzzy
+msgid "Au_thentication:"
+msgstr "DSL-magtiging"
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
+#: ../src/wireless-security/ws-wep-key.c:120
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
@@ -2644,13 +3810,120 @@ msgid "Shared Key"
 msgstr ""
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
-msgid "Sho_w key"
+msgid "_Key:"
 msgstr ""
 
 #: ../src/wireless-security/ws-wep-key.ui.h:8
-msgid "WEP inde_x:"
+msgid "Sho_w key"
 msgstr ""
 
 #: ../src/wireless-security/ws-wep-key.ui.h:10
-msgid "_Key:"
+msgid "WEP inde_x:"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
 msgstr ""
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Nuwe selfoon-breëbandverbinding (CDMA)..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "U is nou aan die CDMA-netwerk verbind."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Nuwe selfoon-breëbandverbinding (GSM)..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "U is nou aan die GSM-netwerk verbind."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Draadlose netwerke (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Draadlose netwerk (%s)"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "draadloos is gedeaktiveer"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "draadloos is gedeaktiveer deur 'n hardewareskakelaar"
+
+#~ msgid "Click on this icon to connect to a wireless network"
+#~ msgstr "Kliek op hierdie ikoon om aan 'n draadlose netwerk te verbind"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Berei tans draadlosenetwerkverbinding '%s' voor..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "Konfigureer tans draadlosenetwerkverbinding '%s'..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Vra tans 'n draadlosenetwerkadres aan vir '%s'..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "Draadlosenetwerkverbinding '%s' is aktief"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX-selfoonbreëband (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX-selfoonbreëband"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "U is nou aan die WiMAX-netwerk verbind."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "onbekend"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#, fuzzy
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "_Help"
+#~ msgstr "_Help"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "Ander draadlose netwerk..."
+
+#~ msgid "label"
+#~ msgstr "etiket"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Verenigde Koninkryk"
diff --git a/po/an.po b/po/an.po
index 446b7cf5..9f6a8c00 100644
--- a/po/an.po
+++ b/po/an.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2012-09-28 14:53+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -19,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Rete"
 
@@ -58,7 +57,6 @@ msgstr ""
 "ret."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
-#| msgid "Enable N_otifications"
 msgid "Disable VPN notifications"
 msgstr "Desactivar as notificacions de VPN"
 
@@ -75,10 +73,12 @@ msgid "Suppress networks available notifications"
 msgstr "Suprimir notificacions de retz disponibles"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to true to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
+"Establir isto a cierto ta desactivar as notificacions en connectar con un "
+"ret."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
@@ -100,11 +100,18 @@ msgstr ""
 "en usar a miniaplicación."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
-#| msgid "Choose CA Certificate"
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "Ignorar certificau CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -112,7 +119,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:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -120,632 +127,815 @@ msgstr ""
 "Establir isto a cierto ta desactivar as notificacions sobre certificaus CA "
 "en a fase 2 de l'autenticación EAP."
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:396
-#: ../src/applet-device-gsm.c:444 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "Disponible"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Miniaplicacion Chestor d'o rete"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:438
-#: ../src/applet-device-gsm.c:486 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "Agora ye connectau a '%s'."
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Miniaplicacion Chestor d'o rete"
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:442
-#: ../src/applet-device-gsm.c:490 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "S'ha establiu a connexión"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "Agora ye connectau a o ret de banda ampla mobil."
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:478
-#: ../src/applet-device-gsm.c:526 ../src/applet-device-wimax.c:464
-#, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "Preparando a connexión de banda ampla mobil '%s'…"
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#, fuzzy
+msgid "802.1X authentication"
+msgstr "Autenticación DSL"
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:467
-#, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "Configurando a connexión de banda ampla mobil '%s'…"
+#: ../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
+msgid "_Cancel"
+msgstr ""
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:470
-#, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
+#: ../src/8021x.ui.h:3
+#, fuzzy
+msgid "C_onnect"
+msgstr "C_onexion:"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "_Nome d'o rete:"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
 msgstr ""
-"S'amenista autenticación d'usuario ta la connexión de banda ampla mobil '%s'…"
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2500
-#, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "Solicitando una adreza de ret ta '%s'…"
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "Falló en adhibir/activar a connexión"
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:505
-#: ../src/applet-device-gsm.c:553
-#, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "A conexion de banda ampla movil \"%s\" ye activa"
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr "Error desconoxiu"
 
-#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "Informacion d'a conexion"
 
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
-#: ../src/applet-dialogs.c:424
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Banda ampla movil (%s)"
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "desenchegau"
 
-#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1510
-msgid "Mobile Broadband"
-msgstr "Banda ampla movil"
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "Desenchegau"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:409
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Connexión de banda ampla mobil (CDMA) nueva…"
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "Informacion d'a conexion"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "No amostrar iste mensache de nuevo"
+
+#: ../src/applet.c:844
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"A connexión VPN «%s» ha fallau porque s'interrumpió a connexión de ret."
+
+#: ../src/applet.c:847
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"A connexión de ret «%s» ha fallau porque o servicio VPN s'interrumpió "
+"inasperadament."
 
-#: ../src/applet-device-cdma.c:443
-msgid "You are now connected to the CDMA network."
-msgstr "Agora ye connectau a o ret CDMA."
+#: ../src/applet.c:850
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"A connexión VPN «%s» ha fallau porque o servicio VPN devolvió una "
+"configuración no valida."
 
-#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:853
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"A connexión VPN «%s» ha fallau porque expiró o tiempo de connexión."
+
+#: ../src/applet.c:856
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"A connexión VPN «%s» ha fallau porque o servicio VPN no s'encetó a tiempo."
+
+#: ../src/applet.c:859
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"A connexión VPN «%s» ha fallau porque o servició VPN no podió encetar."
+
+#: ../src/applet.c:862
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"A connexión VPN «%s» falló porque no i heba secretos VPN validos."
+
+#: ../src/applet.c:865
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"A connexión VPN «%s» falló porque os secretos VPN no yeran validos."
+
+#: ../src/applet.c:872
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"A connexión VPN «%s» ha fallau."
+
+#: ../src/applet.c:888
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"A connexión VPN «%s» se desconnectó porque s'interrumpió a connexión de ret."
+
+#: ../src/applet.c:891
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"A connexión VPN «%s» se desconnectó porque aturó o servicio VPN."
+
+#: ../src/applet.c:897
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"A connexión VPN «%s» s'ha desconnectau."
+
+#: ../src/applet.c:927
 #, 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)"
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"A connexión VPN s'ha establiu con exito.\n"
+"\n"
+"%s\n"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "roaming"
+#: ../src/applet.c:929
+#, fuzzy
+msgid "VPN connection has been successfully established.\n"
+msgstr " A connexión VPN s'ha establiu con exito.\n"
 
-#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
-#| msgid "More networks"
-msgid "CDMA network."
-msgstr "Ret CDMA."
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "Mensache d'acceso VPN"
 
-#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
-#| msgid "You are now connected to the wired network."
-msgid "You are now registered on the home network."
-msgstr "Agora ye rechistrau en o ret de casa."
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+#, fuzzy
+msgid "VPN Connection Failed"
+msgstr "Falló a connexión VPN"
 
-#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
-#| msgid "You are now connected to the wired network."
-msgid "You are now registered on a roaming network."
-msgstr "Agora ye rechistrau en un ret de \"roaming\"."
+#: ../src/applet.c:990
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"A connexión VPN «%s» ha fallau porque o servicio VPN falló en encetar.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:211 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:993
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+" A connexión VPN «%s» falló en encetar.\n"
+"\n"
+"%s"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:457
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Connexión de banda ampla mobil (GSM) nueva…"
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr " o dispositivo no ye listo (manca o firmware)"
 
-#: ../src/applet-device-gsm.c:491
-msgid "You are now connected to the GSM network."
-msgstr "Agora ye enchegau a lo rete GSM."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "o dispositivo no ye listo"
 
-#: ../src/applet-device-gsm.c:652
-msgid "PIN code required"
-msgstr "S'amenista un codigo PIN"
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "desenchegau"
 
-#: ../src/applet-device-gsm.c:660
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "S'amenista un codigo PIN ta o dispositivo de banda ampla mobil"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "Desenchegar"
+
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "o dispositivo no ye chestionau"
+
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "No i hai dispositivos de ret disponibles"
+
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "Connexions _VPN"
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "_Configurar VPN…"
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "_Desconnectar VPN"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "O Chestor d'o ret no ye executando-se…"
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "Ret desactivau"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "Activar _rete"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "Activar _inalambrico"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "Activar banda ampla _movil"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "Activar n_otificacions"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "Informacion d'a conexion"
 
-#: ../src/applet-device-gsm.c:781
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "Editar conexions..."
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_Arredol"
+
+#: ../src/applet.c:2179
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "Codigo PIN ta la tarcheta SIM '%s' en '%s'"
+msgid "You are now connected to '%s'."
+msgstr "Agora ye connectau a '%s'."
 
-#: ../src/applet-device-gsm.c:873
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Codigo PIN erronio; contacte con o proveedor d'o suyo servicio."
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "Desenchegau"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "A conexion de rete a estau desenchegada."
 
-#: ../src/applet-device-gsm.c:896
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Parando a conexion de rete \"%s\"..."
+
+#: ../src/applet.c:2477
+#, 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:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Solicitando una adreza de ret ta '%s'…"
+
+#: ../src/applet.c:2483
+#, fuzzy, c-format
+msgid "Network connection '%s' active"
+msgstr "Connexión de ret «%s» activa"
+
+#: ../src/applet.c:2557
+#, fuzzy, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Encetando connexión VPN «%s»…"
+
+#: ../src/applet.c:2560
+#, 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:2563
+#, fuzzy, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Solicitando una adreza VPN ta «%s»…"
+
+#: ../src/applet.c:2566
+#, fuzzy, c-format
+msgid "VPN connection '%s' active"
+msgstr "Connexión VPN «%s» activa"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "Sin connexión de ret"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "Miniaplicacion Chestor d'o rete"
+
+#: ../src/applet-device-broadband.c:159
 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:201
+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-gsm.c:923
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Ninviando codigo de desbloqueo…"
 
-#: ../src/applet-device-gsm.c:986
-msgid "SIM PIN unlock required"
-msgstr "S'amenista un codigo PIN de desbloqueo"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Banda ampla movil (%s)"
 
-#: ../src/applet-device-gsm.c:987
-msgid "SIM PIN Unlock Required"
-msgstr "S'amenista un codigo PIN de desbloqueo"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "Banda ampla movil"
 
-# of times you can enter incorrect PIN
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:989
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"O dispositivo de banda ampla '%s' ameneste un codigo SIM PIN antes de poder "
-"usar-lo."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Disponible"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:991
-msgid "PIN code:"
-msgstr "Codigo PIN:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "Connexión de banda ampla mobil nueva"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:995
-msgid "Show PIN code"
-msgstr "Amostrar codigo PIN"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "S'ha establiu a connexión"
 
-#: ../src/applet-device-gsm.c:998
-msgid "SIM PUK unlock required"
-msgstr "Cal desbloqueo PUK d'a SIM"
+#: ../src/applet-device-broadband.c:816
+#, 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-gsm.c:999
-msgid "SIM PUK Unlock Required"
-msgstr "Cal desbloqueo PUK d'a SIM"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "Clau de paso d'o rete de banda ampla movil"
 
-# of times you can enter incorrect PUK
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1001
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"O dispositivo de banda ampla «%s» amenista un codigo SIM PUK antes de poder "
-"usar-lo."
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "Agora ye rechistrau en o ret de casa."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1003
-msgid "PUK code:"
-msgstr "Codigo PUK:"
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "Agora ye rechistrau en un ret de \"roaming\"."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1006
-msgid "New PIN code:"
-msgstr "Codigo PIN nuevo:"
+#: ../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."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "Re-enter new PIN code:"
-msgstr "Torna a meter o codigo PIN nuevo:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "Preparando a connexión de banda ampla mobil '%s'…"
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1013
-msgid "Show PIN/PUK codes"
-msgstr "Amostrar codigos PIN/PUK"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "Configurando a connexión de banda ampla mobil '%s'…"
 
-#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
-#| msgid "More networks"
-msgid "GSM network."
-msgstr "Ret GSM."
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, 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-wired.c:62
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "A conexion de banda ampla movil \"%s\" ye activa"
+
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automatica"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "Retes cableaus (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "Rete cableau (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "Retes cableaus"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "Rete cableau"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
-msgid "disconnected"
-msgstr "desenchegau"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../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-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "Parando a conexion cableada \"%s\"..."
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
-msgstr ""
+#: ../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-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
-msgstr ""
+#: ../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-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
-msgstr ""
+#: ../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-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
-msgstr ""
+#: ../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-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticación DSL"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+msgid "Create _New Wi-Fi Network..."
 msgstr ""
 
-#: ../src/applet-device-wifi.c:292
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(denguna)"
 
-#: ../src/applet-device-wifi.c:790
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "Retes inalambricos (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Retes cableaus (%s)"
 
-#: ../src/applet-device-wifi.c:792
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "Rete inalambrico (%s)"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Rete cableau (%s)"
 
-#: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Rete inalambrico"
-msgstr[1] "Retes inalambricos"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Rete cableau"
+msgstr[1] "Rete cableau"
 
-#: ../src/applet-device-wifi.c:827
-msgid "wireless is disabled"
-msgstr "o rete inalambrico ye desactivau"
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "WiMAX ye desactivada"
 
-#: ../src/applet-device-wifi.c:828
-msgid "wireless is disabled by hardware switch"
-msgstr "o ret inalámbrico ye desactivau por l'interruptor fisico"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WiMAX ye desactivada por l'interruptor fisico"
 
-#: ../src/applet-device-wifi.c:889
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Mas retes"
 
-#: ../src/applet-device-wifi.c:1068
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "Retes inalambricos disposables"
 
-#: ../src/applet-device-wifi.c:1069
-msgid "Use the network menu to connect to a wireless network"
-msgstr ""
-
-#: ../src/applet-device-wifi.c:1072 ../src/applet.c:924
-msgid "Don't show this message again"
-msgstr "No amostrar iste mensache de nuevo"
+#: ../src/applet-device-wifi.c:1181
+#, 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:1263
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr ""
+#: ../src/applet-device-wifi.c:1364
+#, 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:1294
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Parando a conexion de rete inalambrico \"%s\"..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Parando a conexion de rete \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1297
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
+#: ../src/applet-device-wifi.c:1402
+#, 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:1300
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr ""
+#: ../src/applet-device-wifi.c:1405
+#, 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:1303
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Solicitando una adreza de ret inalámbrico ta '%s'…"
+#: ../src/applet-device-wifi.c:1408
+#, 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:1324
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr ""
+#: ../src/applet-device-wifi.c:1419
+#, 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:1329
+#: ../src/applet-device-wifi.c:1423
 #, fuzzy, c-format
-msgid "Wireless network connection '%s' active"
+msgid "Wi-Fi network connection '%s' active"
 msgstr "A connexión de ret «%s» ye activa"
 
-#: ../src/applet-device-wifi.c:1377
+#: ../src/applet-device-wifi.c:1442
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "Falló en activar a connexión"
 
-#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
-#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
-#| msgctxt "Speed"
-#| msgid "Unknown"
-msgid "Unknown error"
-msgstr "Error desconoxiu"
-
-#: ../src/applet-device-wifi.c:1382 ../src/applet-device-wifi.c:1401
-#: ../src/applet.c:493 ../src/applet.c:563
-#, fuzzy
-#| msgid "Connection Information"
-msgid "Connection failure"
-msgstr "Informacion d'a conexion"
-
-#: ../src/applet-device-wifi.c:1396
-#| msgid "Manage your network connections"
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Falló en anyadir a connexion nueva"
 
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Banda ampla movil WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr "Banda ampla movil WiMAX"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "WiMAX ye desactivada"
-
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX ye desactivada por l'interruptor fisico"
-
-#: ../src/applet-device-wimax.c:428
-msgid "You are now connected to the WiMAX network."
-msgstr "Agora ye connectau a o ret WiMAX."
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Ha ocurriu una error en amostrar información d'a connexión:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:313
-#: ../src/libnm-gtk/nm-wireless-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP dinamica"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adrezas"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/libnm-gtk/nm-wireless-dialog.c:905
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Denguna"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:260
 #, c-format
-#| msgid "1 (Default)"
 msgid "%s (default)"
 msgstr "%s (Predeterminau)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconoxida"
 
-#: ../src/applet-dialogs.c:361
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Desconoxida"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Adreza IP:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Adreza de difusion:"
 
-#: ../src/applet-dialogs.c:363
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "Desconoxiu"
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Desconoxida"
 
-#: ../src/applet-dialogs.c:375
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "Desconoxiu"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Mascara de subret:"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Cheneral"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interfaz:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Adreza hardware:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Controlador:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Velocidat:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Seguridat:"
 
-#: ../src/applet-dialogs.c:512
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:525
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "Adreza IP:"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Desconoxida"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "Adreza de difusion:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "Mascara de subret:"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Desconoxida"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Ruta predeterminada:"
 
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "DNS primario:"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "DNS secundario:"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "DNS terciario:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorau"
 
-#: ../src/applet-dialogs.c:796
-#| msgid "_Type:"
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Tipo de VPN:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Puerta de enlace VPN:"
 
-#: ../src/applet-dialogs.c:809
-#| msgid "_Username:"
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Nome d'_usuario VPN:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Mensache VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:840
 #, fuzzy
-#| msgid "C_onnection:"
 msgid "Base Connection:"
 msgstr "C_onexion:"
 
-#: ../src/applet-dialogs.c:823
-#| msgctxt "Speed"
-#| msgid "Unknown"
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconoxida"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "No se trobó garra connexión activa valida"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -753,428 +943,615 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "y muitos atros colaboradors y traductors d'a comunidat"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:988
 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:944
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Pachina web d'o Chestor d'o ret"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Recursos faltantes"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Clau de paso d'o rete de banda ampla movil"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:1039
 #, 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:1012
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Clau de paso:"
 
-#: ../src/applet.c:488
-#, fuzzy
-msgid "Failed to add/activate connection"
-msgstr "Falló en adhibir/activar a connexión"
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "S'amenista un codigo PIN de desbloqueo"
 
-#: ../src/applet.c:532
-#, fuzzy
-#| msgid "disconnected"
-msgid "Device disconnect failed"
-msgstr "desenchegau"
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "S'amenista un codigo PIN de desbloqueo"
 
-#: ../src/applet.c:537
-#, fuzzy
-#| msgid "Disconnected"
-msgid "Disconnect failure"
-msgstr "Desenchegau"
+# of times you can enter incorrect PIN
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
+"O dispositivo de banda ampla '%s' ameneste un codigo SIM PIN antes de poder "
+"usar-lo."
 
-#: ../src/applet.c:558
-#, fuzzy
-#| msgid "Connection Information"
-msgid "Connection activation failed"
-msgstr "Informacion d'a conexion"
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "Codigo PIN:"
 
-#: ../src/applet.c:1013
-#, fuzzy, c-format
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "Amostrar codigo PIN"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "Cal desbloqueo PUK d'a SIM"
+
+#: ../src/applet-dialogs.c:1348
+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:1350
+#, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"A connexión VPN «%s» ha fallau porque s'interrumpió a connexión de ret."
+"O dispositivo de banda ampla «%s» amenista un codigo SIM PUK antes de poder "
+"usar-lo."
 
-#: ../src/applet.c:1016
-#, fuzzy, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "Codigo PUK:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "Codigo PIN nuevo:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+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:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
 msgstr ""
-"\n"
-"A connexión de ret «%s» ha fallau porque o servicio VPN s'interrumpió "
-"inasperadament."
 
-#: ../src/applet.c:1019
-#, fuzzy, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"A connexión VPN «%s» ha fallau porque o servicio VPN devolvió una "
-"configuración no valida."
+"L'adreza IP identifica a suya equipo en o ret. Prete o botón \"Adhibir\" ta "
+"adhibir una adreza IP."
 
-#: ../src/applet.c:1022
-#, fuzzy, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+#: ../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
+msgid "_Add"
 msgstr ""
-"\n"
-"A connexión VPN «%s» ha fallau porque expiró o tiempo de connexión."
 
-#: ../src/applet.c:1025
-#, fuzzy, c-format
+#. 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
+#, fuzzy
+msgid "_Delete"
+msgstr "_Eliminar"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#, 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
+#, 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
+#, fuzzy
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"A connexión VPN «%s» ha fallau porque o servicio VPN no s'encetó a tiempo."
+"Si ye activau, ista connexión nunca s'usará como a connexión de ret "
+"predeterminau."
 
-#: ../src/applet.c:1028
-#, fuzzy, c-format
+#: ../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…"
+msgstr "Creyar…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "Trigar un tipo de connexión VPN"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"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."
 msgstr ""
-"\n"
-"A connexión VPN «%s» ha fallau porque o servició VPN no podió encetar."
+"Seleccione o tipo de VPN que quiere usar ta la nueva connexión. Si o tipo de "
+"connexión VPN que quiere creyar no amaneixe en a lista, puede que no tienga "
+"instalau o complemento de VPN correcto."
 
-#: ../src/applet.c:1031
-#, fuzzy, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
 msgstr ""
-"\n"
-"A connexión VPN «%s» falló porque no i heba secretos VPN validos."
 
-#: ../src/applet.c:1034
-#, fuzzy, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
 msgstr ""
-"\n"
-"A connexión VPN «%s» falló porque os secretos VPN no yeran validos."
 
-#: ../src/applet.c:1041
-#, fuzzy, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
 msgstr ""
-"\n"
-"A connexión VPN «%s» ha fallau."
 
-#: ../src/applet.c:1059
-#, fuzzy, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "Adreza de difusion:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
 msgstr ""
-"\n"
-"A connexión VPN «%s» se desconnectó porque s'interrumpió a connexión de ret."
 
-#: ../src/applet.c:1062
-#, fuzzy, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
 msgstr ""
-"\n"
-"A connexión VPN «%s» se desconnectó porque aturó o servicio VPN."
 
-#: ../src/applet.c:1068
-#, fuzzy, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
 msgstr ""
-"\n"
-"A connexión VPN «%s» s'ha desconnectau."
 
-#: ../src/applet.c:1098
-#, c-format
-msgid ""
-"VPN connection has been successfully established.\n"
-"\n"
-"%s\n"
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
 msgstr ""
-"A connexión VPN s'ha establiu con exito.\n"
-"\n"
-"%s\n"
 
-#: ../src/applet.c:1100
+#: ../src/connection-editor/ce-page-bond.ui.h:9
 #, fuzzy
-msgid "VPN connection has been successfully established.\n"
-msgstr " A connexión VPN s'ha establiu con exito.\n"
+msgid "ARP"
+msgstr "EAP"
 
-#: ../src/applet.c:1102
-msgid "VPN Login Message"
-msgstr "Mensache d'acceso VPN"
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "C_onexion:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
 #, fuzzy
-msgid "VPN Connection Failed"
-msgstr "Falló a connexión VPN"
+msgid "_Interface name:"
+msgstr "Interfaz:"
 
-#: ../src/applet.c:1173
-#, fuzzy, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
 msgstr ""
-"\n"
-"A connexión VPN «%s» ha fallau porque o servicio VPN falló en encetar.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1176
-#, fuzzy, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-" A connexión VPN «%s» falló en encetar.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1496
-msgid "device not ready (firmware missing)"
-msgstr " o dispositivo no ye listo (manca o firmware)"
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
 
-#: ../src/applet.c:1498
-msgid "device not ready"
-msgstr "o dispositivo no ye listo"
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
 
-#: ../src/applet.c:1524
-msgid "Disconnect"
-msgstr "Desenchegar"
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "DNS primario:"
 
-#: ../src/applet.c:1538
-msgid "device not managed"
-msgstr "o dispositivo no ye chestionau"
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr ""
 
-#: ../src/applet.c:1582
-msgid "No network devices available"
-msgstr "No i hai dispositivos de ret disponibles"
+#: ../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:"
+msgstr "_MTU:"
 
-#: ../src/applet.c:1670
-msgid "_VPN Connections"
-msgstr "Connexions _VPN"
+#: ../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
+msgid "bytes"
+msgstr "bytes"
 
-#: ../src/applet.c:1727
-msgid "_Configure VPN..."
-msgstr "_Configurar VPN…"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
 
-#: ../src/applet.c:1731
-msgid "_Disconnect VPN"
-msgstr "_Desconnectar VPN"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "S_eguridat:"
 
-#: ../src/applet.c:1825
-msgid "NetworkManager is not running..."
-msgstr "O Chestor d'o ret no ye executando-se…"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
 
-#: ../src/applet.c:1830 ../src/applet.c:2631
-msgid "Networking disabled"
-msgstr "Ret desactivau"
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "C_onexion:"
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2051
-msgid "Enable _Networking"
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
 msgstr "Activar _rete"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2060
-msgid "Enable _Wireless"
-msgstr "Activar _inalambrico"
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2069
-msgid "Enable _Mobile Broadband"
-msgstr "Activar banda ampla _movil"
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2078
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Activar banda ampla movil WiMA_X"
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
 
-#. Toggle notifications item
-#: ../src/applet.c:2089
-msgid "Enable N_otifications"
-msgstr "Activar n_otificacions"
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "automatico"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2100
-msgid "Connection _Information"
-msgstr "Informacion d'a conexion"
+#: ../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
+msgid "default"
+msgstr "predeterminau"
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2110
-msgid "Edit Connections..."
-msgstr "Editar conexions..."
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2124
-msgid "_Help"
-msgstr "Ad_uya"
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adreza"
 
-#. About item
-#: ../src/applet.c:2133
-msgid "_About"
-msgstr "_Arredol"
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adreza"
 
-#: ../src/applet.c:2310
-msgid "Disconnected"
-msgstr "Desenchegau"
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2311
-msgid "The network connection has been disconnected."
-msgstr "A conexion de rete a estau desenchegada."
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2494
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "Parando a conexion de rete \"%s\"..."
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2497
-#, 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/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
 
-#: ../src/applet.c:2503
-#, fuzzy, c-format
-msgid "Network connection '%s' active"
-msgstr "Connexión de ret «%s» activa"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Cualsiquier dispositivo"
 
-#: ../src/applet.c:2586
-#, fuzzy, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "Encetando connexión VPN «%s»…"
+#: ../src/connection-editor/ce-page.c:591
+#, 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/applet.c:2589
-#, 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/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "Fer servir seguranza 802.1_X ta ista connexión"
 
-#: ../src/applet.c:2592
-#, fuzzy, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Solicitando una adreza VPN ta «%s»…"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
 
-#: ../src/applet.c:2595
-#, fuzzy, c-format
-msgid "VPN connection '%s' active"
-msgstr "Connexión VPN «%s» activa"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/applet.c:2636
-msgid "No network connection"
-msgstr "Sin connexión de ret"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:3336
-msgid "NetworkManager Applet"
-msgstr "Miniaplicacion Chestor d'o rete"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-#, fuzzy
-msgid "Automatically unlock this device"
-msgstr "Desbloquiar automaticament iste dispositivo"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "_Desbloqueyar"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Connection Information"
-msgstr "Informacion d'a conexion"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Active Network Connections"
-msgstr "Conexions de rete activas"
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
 msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
-msgstr "_Nome d'o rete:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "automatico"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:318
-#, fuzzy
-msgid "Failed to update connection secrets due to an unknown error."
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
 msgstr ""
-"Falló en actualizar os secretos d'a connexión a causa d'una error "
-"desconoixida."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
 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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 #, fuzzy
-msgid "Ig_nore automatically obtained routes"
-msgstr "Ig_norar rotas obtenidas automaticament"
+msgid "2:"
+msgstr "2"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 #, 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"
+msgid "3:"
+msgstr "3"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 #, fuzzy
+msgid "4:"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+"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
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+msgid "Enter the traffic class for each user priority."
 msgstr ""
-"Si ye activau, ista connexión nunca s'usará como a connexión de ret "
-"predeterminau."
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: ../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
@@ -1187,15 +1564,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 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:9
+#: ../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
@@ -1203,15 +1582,172 @@ msgstr "A_mostrar clau de paso"
 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-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#: ../src/connection-editor/page-ip6.c:142
+#: ../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
 msgid "Automatic"
 msgstr "Automatico"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Par cruciau (TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+#, fuzzy
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Interficie d'unidat d'acoplamiento (AUI)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+#, fuzzy
+msgid "Media Independent Interface (MII)"
+msgstr "Interficie independient de meyos (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "_Puerto:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_Velocidat:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "Full duple_x"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+#, fuzzy
+msgid "Aut_onegotiate"
+msgstr "Aut_onegociar"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "_Servicio"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+msgid "C_loned MAC address:"
+msgstr "Adreza MAC _clonada:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#, 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 ""
+"L'adreza MAC aquí introducida s'usará como adreza d'hardware ta o "
+"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-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Predeterminau"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorar"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Adreza de difusion:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Clau de pase de clau _privada:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "desenchegau"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1219,8 +1755,8 @@ msgstr "Automatica con configuración manual de DNS"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manual"
 
@@ -1231,22 +1767,22 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 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:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_Metodo:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Adrezas"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1257,8 +1793,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:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 #, fuzzy
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
@@ -1267,26 +1803,25 @@ 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
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 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:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Servidors _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -1296,12 +1831,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.h:17
 #, 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.h:18
 #, fuzzy
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
@@ -1310,18 +1845,46 @@ 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:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 #, fuzzy
 msgid "_Routes…"
 msgstr "_Rotas…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Desactivau"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 ""
+"Endreces IP de servidors de nombres de dominios ta resolver nombres "
+"d'equipos. Use minches ta deseparar adrezas de servidors de nombres de "
+"dominio multiples."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 #, 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:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 #, fuzzy
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
@@ -1331,63 +1894,38 @@ msgstr ""
 "configuración IPv6 falla pero a IPv4 tiene exito."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Cualsiquier"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Preferir 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Preferir 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "Basic"
 msgstr "Basica"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Nu_mero:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Avanzada"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "Nombre d'o _AP:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "ID de R_ete:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Tipo:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Cambear..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "A_mostrar claus de paso"
 
@@ -1443,199 +1981,178 @@ msgstr "Eco"
 msgid "Send PPP _echo packets"
 msgstr "Ninviar paquetz _echo PPP"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "Par cruciau (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-#, fuzzy
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Interficie d'unidat d'acoplamiento (AUI)"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
+#: ../src/connection-editor/ce-page-team.ui.h:1
 #, fuzzy
-msgid "Media Independent Interface (MII)"
-msgstr "Interficie independient de meyos (MII)"
+msgid "_Teamed connections:"
+msgstr "C_onexion:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "Interfaz:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "Adreza MAC _clonada:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "_Puerto:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "_Velocidat:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "Full duple_x"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-#, fuzzy
-msgid "Aut_onegotiate"
-msgstr "Aut_onegociar"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "_Device MAC address:"
-msgstr "Adreza MAC d'o _dispositivo:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-#| msgid "_Cloned MAC address:"
-msgid "C_loned MAC address:"
-msgstr "Adreza MAC _clonada:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-#, 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"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
 msgstr ""
-"L'adreza MAC aquí introducida s'usará como adreza d'hardware ta o "
-"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-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "bytes"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr "S_eguridat:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastructura"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "_Potencia d'a transmisión:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Taxa:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Canal:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ban_da:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "M_ode:"
-msgstr "M_odo:"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-#| msgid "Security:"
-msgid "S_ecurity:"
-msgstr "S_eguridat:"
+#: ../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:1
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
 msgid "Allowed Authentication Methods"
 msgstr "Metodos d'autenticación permitius"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Protocolo d'autenticación extensible"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Protocolo d'autenticación por clau"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protocolo d'autenticación d'intercambeo de sinyals "
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 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:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAPv_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1644,195 +2161,663 @@ msgstr ""
 "d'autenticación. Si a connexión falla, prebe de desactivar o suporte ta "
 "qualques metodos."
 
-#: ../src/connection-editor/ce-vpn-wizard.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/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+#, fuzzy
+msgid "Ethernet"
+msgstr "Ethernet automatica"
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "ADSL"
+
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
+#: ../src/connection-editor/connection-helpers.c:196
 #, fuzzy
-msgid "Choose a VPN Connection Type"
-msgstr "Trigar un tipo de connexión VPN"
+msgid "Hardware"
+msgstr "Adreza hardware:"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 #, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "Exportar connexión VPN…"
+
+#: ../src/connection-editor/connection-helpers.c:323
 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."
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
 msgstr ""
-"Seleccione o tipo de VPN que quiere usar ta la nueva connexión. Si o tipo de "
-"connexión VPN que quiere creyar no amaneixe en a lista, puede que no tienga "
-"instalau o complemento de VPN correcto."
+"L'editor d'a connexión no se podió encetar a causa d'una error desconoixida."
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Create…"
-msgstr "Creyar…"
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "No se podió creyar a nueva connexión"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:911
-#: ../src/connection-editor/page-ip6.c:877
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "Falló en eliminar a connexión"
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, 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:804
+#: ../src/connection-editor/ip6-routes-dialog.c:746
+#: ../src/connection-editor/page-ip4.c:1068
+#: ../src/connection-editor/page-ip6.c:1066
 msgid "Address"
 msgstr "Adreza"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Mascara de ret"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
+#: ../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
 msgid "Gateway"
 msgstr "Puerta de enlace"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrica"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefixo"
 
-#: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1518
-msgid "DSL"
-msgstr "ADSL"
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "Editando %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+#, fuzzy
+msgid "Editing un-named connection"
+msgstr "Editando a connexión sin nombre"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Nombre d'a connexión:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Error en inicializar l'editor"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Falló en adhibir a connexión"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+#, fuzzy
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+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:419
+msgid "_Save"
+msgstr "_Alzar"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "Alzar qualsiquier cambeo realizau en ista connexión."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+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:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "No se podió creyar a nueva connexión"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "No se podió editar a connexión"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+msgid "Unknown error creating connection editor dialog."
+msgstr "Error en creyar a connexión"
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "Error en inicializar l'editor"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+msgid "Connection add failed"
+msgstr "Falló en adhibir a connexión"
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../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
+msgid "Connection _name:"
+msgstr "_Nombre d'a connexión:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "E_xportar"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "brenca"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "agora"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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:623
+msgid "Name"
+msgstr "Nome"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "Feita servir por zaguera vegada"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+#, fuzzy
+msgid "Edit the selected connection"
+msgstr "Editar a connexión seleccionada"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+#, fuzzy
+msgid "Authenticate to edit the selected connection"
+msgstr "Autentíquese ta editar a connexión seleccionada"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+#, fuzzy
+msgid "Delete the selected connection"
+msgstr "Eliminar a connexión seleccionada"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+#, fuzzy
+msgid "Authenticate to delete the selected connection"
+msgstr "Autentíquese ta eliminar a connexión seleccionada"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, 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:933
+#, fuzzy
+msgid "Error creating connection"
+msgstr "Error en creyar a connexión"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "Editar conexions..."
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, 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
+msgid "802.1x Security"
+msgstr "Seguridat 802.1x"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, 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
+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
+msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:125
+#, 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
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Conexion cableada %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Activar _rete"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Rete inalambrico"
+
+#: ../src/connection-editor/page-bond.c:447
+#, 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:566
+#, fuzzy
+msgid "primary"
+msgstr "DNS primario:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "Conexion cableada %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, 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:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+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
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, 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:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, 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
 #, 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:232
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexion ADSL %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+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:328
+#, 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:457
+#, 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
+#, fuzzy
+msgid "cloned MAC"
+msgstr "Adreza MAC _clonada:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "Predeterminau"
+
+#: ../src/connection-editor/page-general.c:52
+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 "O Chestor d'o ret no ye executando-se…"
+
+#: ../src/connection-editor/page-general.c:350
+#, 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
+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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+#, 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:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "Conexion cableada %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatico (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Solo que adrezas automaticas (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Automatico (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Solo que adrezas automaticas (PPP)"
+msgid "Automatic, addresses only"
+msgstr "Automatico, solo que adrezas"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatico (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Solo que adrezas automaticas (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatico (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Solo que adrezas automaticas (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Solo que enlace local"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Desactivau"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
-#| msgid "DNS ser_vers:"
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Servidors _DNS adicionals:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Dominios de bu_sca adicionals:"
 
-#: ../src/connection-editor/page-ip4.c:843
+#: ../src/connection-editor/page-ip4.c:965
 #, fuzzy, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editando as rotas IPv4 ta %s"
 
-#: ../src/connection-editor/page-ip4.c:992
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Achustes d'IPv4"
 
-#: ../src/connection-editor/page-ip4.c:994
+#: ../src/connection-editor/page-ip4.c:1160
 #, fuzzy
 msgid "Could not load IPv4 user interface."
 msgstr "No se podió cargar a interficie d'usuario ta IPv4."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "Automatico, solo que adrezas"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatico, solo que DHCP"
 
-#: ../src/connection-editor/page-ip6.c:809
+#: ../src/connection-editor/page-ip6.c:964
 #, fuzzy, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editando as rotas IPv6 ta %s"
 
-#: ../src/connection-editor/page-ip6.c:956
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Achustes d'IPv6"
 
-#: ../src/connection-editor/page-ip6.c:958
+#: ../src/connection-editor/page-ip6.c:1157
 #, fuzzy
 msgid "Could not load IPv6 user interface."
 msgstr " No se podió cargar a interficie d'usuario ta IPv6."
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
 #, 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:398
+#: ../src/connection-editor/page-mobile.c:327
 #, 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:639
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Seleccionar o tipo de proveedor de banda ampla mobil"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:556
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
@@ -1841,442 +2826,274 @@ 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:679
+#: ../src/connection-editor/page-mobile.c:561
 #, fuzzy
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "O mío proveedor usa tecnolochía basada en _GSM (eix. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:568
 #, 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-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "denguno"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:282
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Achustes de PPP"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:281
 #, fuzzy
 msgid "Could not load PPP user interface."
 msgstr " No se podió cargar a interficie d'usuario ta PPP."
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-#: ../src/connection-editor/nm-connection-list.c:1514
-msgid "VPN"
-msgstr "VPN"
+#: ../src/connection-editor/page-team.c:98
+#: ../src/connection-editor/page-team-port.c:71
+#: ../src/connection-editor/vpn-helpers.c:165
+#, fuzzy
+msgid "Select file to import"
+msgstr "Seleccione o fichero que importar"
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, 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:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+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:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+msgid "Could not load team port user interface."
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Sin connexión de ret"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, 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:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "Conexion VPN %d"
+
+#: ../src/connection-editor/page-vpn.c:103
 #, 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:126
+#: ../src/connection-editor/page-vpn.c:118
 #, fuzzy, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "No se podió trobar o complemento de servicio VPN ta «%s»."
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:899
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexion VPN %d"
 
-#: ../src/connection-editor/page-wired.c:91
-#: ../src/connection-editor/page-wireless.c:95
+#: ../src/connection-editor/page-vpn.c:229
 #, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 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"
+"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/page-wired.c:271
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:1502
-msgid "Wired"
-msgstr "Cableau"
+#: ../src/connection-editor/page-vpn.c:254
+#, fuzzy
+msgid "Choose a VPN Connection Type"
+msgstr "Trigar un tipo de connexión VPN"
 
-#: ../src/connection-editor/page-wired.c:273
-msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-vpn.c:255
+#, fuzzy
+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 ""
+"Seleccione o tipo de VPN que quiere usar ta la nueva connexión. Si o tipo de "
+"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-wired.c:448
-#, c-format
-msgid "Wired connection %d"
-msgstr "Conexion cableada %d"
-
-#: ../src/connection-editor/page-wired-security.c:119
-msgid "802.1x Security"
-msgstr "Seguridat 802.1x"
-
-#: ../src/connection-editor/page-wired-security.c:121
+#: ../src/connection-editor/page-wifi.c:77
 #, fuzzy
-msgid "Could not load Wired Security security user interface."
-msgstr "No se podió cargar a interficie d'usuario de seguranza cableada."
-
-#: ../src/connection-editor/page-wired-security.c:139
-msgid "Use 802.1_X security for this connection"
-msgstr "Fer servir seguranza 802.1_X ta ista connexión"
+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 ""
+"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-wireless.c:172
-#: ../src/connection-editor/page-wireless.c:176
-#: ../src/connection-editor/page-wireless.c:197
-#, c-format
-msgid "default"
-msgstr "predeterminau"
+#: ../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)\""
+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-wireless.c:201
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:455
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:1506
-msgid "Wireless"
-msgstr "Inalambrico"
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
+msgstr "No se podió cargar a interficie d'usuario ta DSL."
 
-#: ../src/connection-editor/page-wireless.c:457
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:661
-#, c-format
-msgid "Wireless connection %d"
-msgstr "Conexion inalambrica %d"
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Cualsiquier dispositivo"
 
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/libnm-gtk/nm-wireless-dialog.c:922
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Conexion cableada %d"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:300
-#: ../src/libnm-gtk/nm-wireless-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:961
+#: ../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)"
 msgstr "WEP dinamica (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:340
-#: ../src/libnm-gtk/nm-wireless-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 presonal"
 
-#: ../src/connection-editor/page-wireless-security.c:354
-#: ../src/libnm-gtk/nm-wireless-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 enterprise"
 
-#: ../src/connection-editor/page-wireless-security.c:395
-msgid "Could not load WiFi security user interface; missing WiFi setting."
-msgstr ""
-
-#: ../src/connection-editor/page-wireless-security.c:405
-msgid "Wireless Security"
-msgstr "Seguridat inalambrica"
-
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.c:102
-#, c-format
-msgid "Editing %s"
-msgstr "Editando %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:106
+#: ../src/connection-editor/page-wifi-security.c:413
 #, fuzzy
-msgid "Editing un-named connection"
-msgstr "Editando a connexión sin nombre"
+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/nm-connection-editor.c:292
+#: ../src/connection-editor/page-wifi-security.c:424
 #, fuzzy
-msgid ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
-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:395
-msgid "Error creating connection editor dialog."
-msgstr ""
-
-#: ../src/connection-editor/nm-connection-editor.c:407
-msgid "_Save"
-msgstr "_Alzar"
-
-#: ../src/connection-editor/nm-connection-editor.c:408
-msgid "Save any changes made to this connection."
-msgstr "Alzar qualsiquier cambeo realizau en ista connexión."
-
-#: ../src/connection-editor/nm-connection-editor.c:409
-msgid "_Save..."
-msgstr "_Alzar..."
-
-#: ../src/connection-editor/nm-connection-editor.c:410
-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.ui.h:5
-msgid "_Import"
-msgstr "_Importar"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "E_xport"
-msgstr "E_xportar"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-msgid "Connection _name:"
-msgstr "_Nombre d'a connexión:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-msgid "Connect _automatically"
-msgstr "Connectar _automaticament"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "A_vailable to all users"
-msgstr "Disponible ta _totz os usuarios"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "brenca"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "agora"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, 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:249
-#, 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:261
-#, 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:267
-#, 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:271
-#, 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:486
-msgid "Connection add failed"
-msgstr "Falló en adhibir a connexión"
+msgid "Wi-Fi Security"
+msgstr "Seguridat inalambrica"
 
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "Error en alzar a connexión"
+#: ../src/connection-editor/page-wifi-security.c:426
+#, 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/nm-connection-list.c:516
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "A propiedat '%s' / '%s' no ye valida: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-msgstr "Ocurrió una error desconoixida."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-msgstr "Error en inicializar l'editor"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:719
-#: ../src/connection-editor/nm-connection-list.c:885
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
+msgid "missing SSID"
 msgstr ""
-"L'editor d'a connexión no se podió encetar a causa d'una error desconoixida."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "No se podió creyar a nueva connexión"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "No se podió editar a connexión nueva"
 
-#: ../src/connection-editor/nm-connection-list.c:733
-msgid "Could not edit connection"
-msgstr "No se podió editar a connexión"
-
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "Falló en eliminar a connexión"
-
-#: ../src/connection-editor/nm-connection-list.c:795
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "Ye seguro que quiere eliminar a connexión %s?"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:929
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "No se puede importar a connexión VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:931
-#, fuzzy
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-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/nm-connection-list.c:944
-msgid "Could not edit imported connection"
-msgstr "No se podió editar a connexión importada"
-
-#: ../src/connection-editor/nm-connection-list.c:1125
-msgid "Name"
-msgstr "Nome"
-
-#: ../src/connection-editor/nm-connection-list.c:1137
-msgid "Last Used"
-msgstr "Feita servir por zaguera vegada"
-
-#: ../src/connection-editor/nm-connection-list.c:1263
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr ""
-"No existe un complemento de VPN disponible. Instale un ta activar iste botón."
-
-#: ../src/connection-editor/nm-connection-list.c:1274
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../src/connection-editor/nm-connection-list.c:1275
-#, fuzzy
-msgid "Edit the selected connection"
-msgstr "Editar a connexión seleccionada"
-
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "_Edit..."
-msgstr "_Editar..."
-
-#: ../src/connection-editor/nm-connection-list.c:1277
-#, fuzzy
-msgid "Authenticate to edit the selected connection"
-msgstr "Autentíquese ta editar a connexión seleccionada"
-
-#: ../src/connection-editor/nm-connection-list.c:1292
-#, fuzzy
-msgid "_Delete"
-msgstr "_Eliminar"
-
-#: ../src/connection-editor/nm-connection-list.c:1293
-#, fuzzy
-msgid "Delete the selected connection"
-msgstr "Eliminar a connexión seleccionada"
-
-#: ../src/connection-editor/nm-connection-list.c:1294
-#, fuzzy
-msgid "_Delete..."
-msgstr "_Eliminar…"
-
-#: ../src/connection-editor/nm-connection-list.c:1295
-#, fuzzy
-msgid "Authenticate to delete the selected connection"
-msgstr "Autentíquese ta eliminar a connexión seleccionada"
-
-#: ../src/connection-editor/nm-connection-list.c:1574
-#, fuzzy
-msgid "Error creating connection"
-msgstr "Error en creyar a connexión"
-
-#: ../src/connection-editor/nm-connection-list.c:1575
-#, 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:1630
-#: ../src/connection-editor/nm-connection-list.c:1642
-#, fuzzy
-#| msgid "Edit Connections..."
-msgid "Error editing connection"
-msgstr "Editar conexions..."
-
-#: ../src/connection-editor/nm-connection-list.c:1631
-#, fuzzy, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "Se desconoixe cómo editar connexions «%s»"
-
-#: ../src/connection-editor/nm-connection-list.c:1643
-#, 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/vpn-helpers.c:230
+#: ../src/connection-editor/vpn-helpers.c:140
 #, fuzzy, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2289,32 +3106,32 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:263
+#: ../src/connection-editor/vpn-helpers.c:141
 #, fuzzy
-msgid "Select file to import"
-msgstr "Seleccione o fichero que importar"
+msgid "unknown error"
+msgstr "Error desconoxiu"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:215
 #, fuzzy, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Ya existe un fichero clamau «%s»."
 
-#: ../src/connection-editor/vpn-helpers.c:316
+#: ../src/connection-editor/vpn-helpers.c:217
 #, fuzzy
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: ../src/connection-editor/vpn-helpers.c:318
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:354
+#: ../src/connection-editor/vpn-helpers.c:255
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "No se puede exportar a connexión VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:356
+#: ../src/connection-editor/vpn-helpers.c:257
 #, fuzzy, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2325,104 +3142,38 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:391
+#: ../src/connection-editor/vpn-helpers.c:292
 #, fuzzy
 msgid "Export VPN connection..."
 msgstr "Exportar connexión VPN…"
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, fuzzy, c-format
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"A configuración de Bluetooth no ye posible (No se podió connectar a D-Bus: "
-"(%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, fuzzy, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"A configuración de Bluetooth no ye posible (error en buscar NetworkManager: "
-"(%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:445
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Fer servir o suyo telefono mobil como un dispositivo de ret (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:454
-#, fuzzy
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Accedir a Internet usando o suyo telefono mobil (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:318
-#, c-format
-msgid "Error: %s"
-msgstr "Error: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:425
-#, fuzzy, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Falló en creyar a conexión DUN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:427
-#: ../src/gnome-bluetooth/nma-bt-device.c:833
-msgid "Your phone is now ready to use!"
-msgstr "O suyo telefono ye listo ta usar"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:450
-msgid "Mobile wizard was canceled"
-msgstr "Se canceló l'asistent mobil"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:459
-#, fuzzy
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Tipo de dispositivo de telefono desconoixiu (no ye GSM ni CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:567
-msgid "unknown modem type."
-msgstr "tipo de modem desconoixiu."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:639
-#: ../src/gnome-bluetooth/nma-bt-device.c:645
-msgid "failed to connect to the phone."
-msgstr "falló en connectar con o telefono."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:676
-#, fuzzy
-msgid "unexpectedly disconnected from the phone."
-msgstr "o telefono se desconnectó de forma inasperada."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:686
-#, fuzzy
-msgid "timed out detecting phone details."
-msgstr "expiró o tiempo en detectar os detalles d'o telefono."
+"A miniaplicación Chestor de ret no podió trobar qualques fichers de recursos "
+"(no se trobó o fichero .ui)."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:697
-#, fuzzy
-msgid "Detecting phone configuration..."
-msgstr "Detectando a configuración d'o telefono…"
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "_Desbloqueyar"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
+#: ../src/gsm-unlock.ui.h:3
 #, fuzzy
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"L'adaptador de Bluetooth predeterminau debe estar activau antes de "
-"configurar una connexión de ret de marcau telefonico."
+msgid "Automatically unlock this device"
+msgstr "Desbloquiar automaticament iste dispositivo"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:831
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Falló en creyar a connexión PAN: %s"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Informacion d'a conexion"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:852
-#, c-format
-msgid "%s Network"
-msgstr "Rete %s"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "Conexions de rete activas"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:205
+#: ../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 ""
@@ -2430,21 +3181,25 @@ msgstr ""
 "achustes:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:212
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "O suyo dispositivo:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:223
+#: ../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/libnm-gtk/nm-mobile-wizard.c:234
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "O suyo plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:259
+#: ../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 "
@@ -2458,26 +3213,31 @@ msgstr ""
 "suyos achustes de connexión d'a banda ampla mobil, trigue \"Connexions de ret"
 "\" dende o menú Sistema » Preferencias."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:271
+#: ../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/libnm-gtk/nm-mobile-wizard.c:332
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 #, fuzzy
 msgid "Unlisted"
 msgstr "Sin listar"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:487
+#: ../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/libnm-gtk/nm-mobile-wizard.c:511
+#: ../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/libnm-gtk/nm-mobile-wizard.c:535
+#: ../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 "
@@ -2490,68 +3250,84 @@ msgstr ""
 "\n"
 "Si no ye seguro d'o suyo plan consulte a o suyo proveedor ta o suyo plan APN."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:542
+#: ../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/libnm-gtk/nm-mobile-wizard.c:590
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "O mío plan no ye en a lista…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:747
+#: ../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/libnm-gtk/nm-mobile-wizard.c:760
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Proveedor"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:785
+#: ../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 "No puedo trobar o mío proveedor y querría introducir-lo _manualment:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:796
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Proveedor:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:820
+#: ../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/libnm-gtk/nm-mobile-wizard.c:826
+#: ../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/libnm-gtk/nm-mobile-wizard.c:837
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1088
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Pais u rechion"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1107
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1153
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Trie o pais u la rechion d'o suyo proveedor"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1207
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalau"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1210
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalau"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1382
+#: ../src/libnma/nma-mobile-wizard.c:1354
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
 #, fuzzy
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
@@ -2560,107 +3336,202 @@ msgstr ""
 "Iste asistent le aduya a configurar una connexión de banda ampla mobil con "
 "un ret mobil (3G)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 #, fuzzy
 msgid "You will need the following information:"
 msgstr "Amenesterá a siguient información:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "O nombre d'o suyo proveedor de banda ampla"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "O nombre d'o suyo plan de pres"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../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 ""
 "(En qualques casos) o suyo plan de pres APN (nombre d'o punto d'acceso)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: ../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 "Creyar una connexión para ye_te dispositivo de banda ampla mobil:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1456
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Cualsiquier dispositivo"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1469
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1633
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Connexión de banda ampla mobil nueva"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Clau de _paso:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "Clau de _paso:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "A_mostrar claus de paso"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nuevo..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1076
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Denguna"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_reyar"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1162
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+msgid "Wi-Fi Network Authentication Required"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
-msgid "Authentication required by wireless network"
-msgstr ""
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
+msgstr "S'ameneste autenticación d'usuario ta la connexión de ret «%s»…"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+msgid "Create New Wi-Fi Network"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1171
-msgid "New wireless network"
-msgstr ""
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Ret domestico"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1174
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1176
-msgid "Hidden wireless network"
-msgstr ""
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
+msgstr "Ret domestico"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 
-#: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
 msgstr "_Seguridat inalambrica:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "C_onexion:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+msgid "Wi-Fi _adapter:"
+msgstr ""
+
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
 msgstr ""
 
-#: ../src/main.c:73
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -2668,7 +3539,7 @@ msgstr ""
 "Iste programa ye un componente de NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -2676,127 +3547,156 @@ 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:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "no activau"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "no ye rechistrau"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Ret domestico (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Ret domestico"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "buscando"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "se denegó o rechistro"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../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:153 ../src/mb-menu-item.c:159
+#: ../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:162
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Ret roaming (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Rete roaming"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "Predeterminau"
+#: ../src/mobile-helpers.c:331
+#, 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
+msgid "PIN code required"
+msgstr "S'amenista un codigo PIN"
+
+#: ../src/mobile-helpers.c:472
+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:619
+#, 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:622
+msgid "roaming"
+msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:325
+#: ../src/utils/utils.c:179
 #, c-format
-#| msgid "DSL connection %d"
 msgid "%s connection"
 msgstr "Connexión %s"
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"A miniaplicación Chestor de ret no podió trobar qualques fichers de recursos "
-"(no se trobó o fichero .ui)."
-
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "No s'ha trigau garra certificau CA"
 
-#: ../src/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "Trie un certificau CA:"
-
-#: ../src/wireless-security/eap-method.c:645
+#: ../src/wireless-security/eap-method.c:452
 #, fuzzy
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+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:648
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificaus DER u PEM (*.der, *.pem, *.crt, *.cer)"
 
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr "GTC"
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr "Trigar un fichero PAC…"
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr "Fichers PAC (*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr "Totz os fichers"
+
 #: ../src/wireless-security/eap-method-fast.ui.h:2
 #, fuzzy
 msgid "Anonymous"
@@ -2821,8 +3721,8 @@ msgid "PAC _file:"
 msgstr "Fichero _PAC:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "Autenticación i_nterna:"
 
@@ -2831,31 +3731,32 @@ msgstr "Autenticación i_nterna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir a provisión PAC _automatica"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
-msgid "GTC"
-msgstr "GTC"
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "Trigar un fichero PAC…"
+#: ../src/wireless-security/eap-method-leap.c:69
+msgid "missing EAP-LEAP password"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:406
-msgid "PAC files (*.pac)"
-msgstr "Fichers PAC (*.pac)"
+#: ../src/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:410
-msgid "All files"
-msgstr "Totz os fichers"
+#: ../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:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "Trigue un certificau CA…"
 
@@ -2873,21 +3774,57 @@ msgstr "Version 1"
 msgid "C_A certificate:"
 msgstr "Certificau C_A:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#| msgid "_PEAP version:"
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "Ignorar certificau CA"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "Version _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#, fuzzy
-msgid "As_k for this password every time"
-msgstr "_Preguntar ista clau cada vegada"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Certificau C_A:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "As claus privadas sin zifrar son inseguras"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../src/wireless-security/eap-method-tls.c:299
 #, fuzzy
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
@@ -2902,11 +3839,11 @@ msgstr ""
 "\n"
 "(Puede protecher a suya clau privada con una clau con openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Trigue o suyo certificau personal…"
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Trigue a suya clau privada…"
 
@@ -2918,27 +3855,44 @@ msgstr "I_dentidat:"
 msgid "_User certificate:"
 msgstr "Certificau de l'_usuario"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Clau pri_vada:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "Clau de pase de clau _privada:"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "RAPIDO"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "TLS tunelau"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protechiu (PEAP)"
 
@@ -2948,29 +3902,55 @@ msgstr "EAP protechiu (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Autenticación:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "Sistema ubierto"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "Clau compartida"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:4
-msgid "2"
-msgstr "2"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "3"
+msgid "Open System"
+msgstr "Sistema ubierto"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "4"
+msgid "Shared Key"
+msgstr "Clau compartida"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -2984,6 +3964,255 @@ msgstr "A_mostrar clau"
 msgid "WEP inde_x:"
 msgstr "En_diz WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Connexión de banda ampla mobil (CDMA) nueva…"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Agora ye connectau a o ret CDMA."
+
+#~| msgid "More networks"
+#~ msgid "CDMA network."
+#~ msgstr "Ret CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Connexión de banda ampla mobil (GSM) nueva…"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Agora ye enchegau a lo rete GSM."
+
+#~| msgid "More networks"
+#~ msgid "GSM network."
+#~ msgstr "Ret GSM."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Retes inalambricos (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Rete inalambrico (%s)"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "o rete inalambrico ye desactivau"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "o ret inalámbrico ye desactivau por l'interruptor fisico"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Parando a conexion de rete inalambrico \"%s\"..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Solicitando una adreza de ret inalámbrico ta '%s'…"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Banda ampla movil WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Banda ampla movil WiMAX"
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "Desconoxiu"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "Desconoxiu"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ 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"
+
+#~ msgid "_Help"
+#~ msgstr "Ad_uya"
+
+#~ msgid "Any"
+#~ msgstr "Cualsiquier"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Preferir 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Preferir 2G (GPRS/EDGE)"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Adreza MAC d'o _dispositivo:"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastructura"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Automatico (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Solo que adrezas automaticas (PPP)"
+
+#~ msgid "Wireless"
+#~ msgstr "Inalambrico"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "Conexion inalambrica %d"
+
+#~ 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"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Error en alzar a connexión"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "A propiedat '%s' / '%s' no ye valida: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "Ocurrió una error desconoixida."
+
+#~ msgid "Could not edit new connection"
+#~ msgstr "No se podió editar a connexión nueva"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "No se podió editar a connexión importada"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr ""
+#~ "No existe un complemento de VPN disponible. Instale un ta activar iste "
+#~ "botón."
+
+#~ msgid "_Edit..."
+#~ msgstr "_Editar..."
+
+#, fuzzy
+#~ msgid "_Delete..."
+#~ msgstr "_Eliminar…"
+
+#, fuzzy
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "Se desconoixe cómo editar connexions «%s»"
+
+#, fuzzy
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "A configuración de Bluetooth no ye posible (No se podió connectar a D-"
+#~ "Bus: (%s) %s)."
+
+#, fuzzy
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "A configuración de Bluetooth no ye posible (error en buscar "
+#~ "NetworkManager: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr ""
+#~ "Fer servir o suyo telefono mobil como un dispositivo de ret (PAN/NAP)"
+
+#, fuzzy
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Accedir a Internet usando o suyo telefono mobil (DUN)"
+
+#~ 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"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Se canceló l'asistent mobil"
+
+#, fuzzy
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Tipo de dispositivo de telefono desconoixiu (no ye GSM ni CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "tipo de modem desconoixiu."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "falló en connectar con o telefono."
+
+#, fuzzy
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "o telefono se desconnectó de forma inasperada."
+
+#, fuzzy
+#~ msgid "timed out detecting phone details."
+#~ msgstr "expiró o tiempo en detectar os detalles d'o telefono."
+
+#, fuzzy
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Detectando a configuración d'o telefono…"
+
+#, fuzzy
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "L'adaptador de Bluetooth predeterminau debe estar activau antes de "
+#~ "configurar una connexión de ret de marcau telefonico."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Falló en creyar a connexión PAN: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Rete %s"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "No s'ha trigau garra certificau CA"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "Trie un certificau CA:"
+
 #~ msgid "PI_N:"
 #~ msgstr "PI_N:"
 
diff --git a/po/ar.po b/po/ar.po
index ebc5ca6d..8cf69a50 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,684 +10,933 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.ar\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2011-09-30 08:39+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.7.0\n"
 "X-Poedit-Language: Arabic\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+msgid "Network"
+msgstr "شبكة"
+
+#: ../nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr "إدارة اتصالات الشبكة"
 
-#: ../nm-applet.desktop.in.h:2
-msgid "Network"
-msgstr "شبكة"
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "الاتصالات الشبكية"
 
-#: ../nm-applet.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr "عطل انشاء الاتصال اللاسلكي "
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "أدِر وغيّر إعدادات الاتصالات الشبكية"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "عطل تنبيهات الاتصالات "
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند الاتصال بالشبكة."
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "عطل تنبيهات قطع الاتصالات"
 
-#: ../nm-applet.schemas.in.h:4
-msgid "Set this to TRUE to disable notifications when connecting to a network."
-msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند الاتصال بالشبكة."
-
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when disconnecting from a network."
 msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند قطع الاتصال بالشبكة."
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "عطل تنبيهات الاتصالات "
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
-msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند توفر الشبكة اللاسلكية."
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند قطع الاتصال بالشبكة."
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "حظر تنبيهات توفر الشبكة"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
-msgstr ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "مكّن هذا الخيار لتعطيل التنبيهات عند توفر الشبكة اللاسلكية."
 
-#: ../nm-applet.schemas.in.h:8
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "ختم"
 
-#: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
-msgstr "حظر تنبيهات توفر الشبكة"
-
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "يستخدم لتحديد اذا ما الخيارات يجب ان ترحّل الى اصدار جديد."
 
-#: ../nm-connection-editor.desktop.in.h:1
-msgid "Manage and change your network connection settings"
-msgstr "أدِر وغيّر إعدادات الاتصالات الشبكية"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
+msgid "Disable WiFi Create"
+msgstr "عطل انشاء الاتصال اللاسلكي "
 
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "Network Connections"
-msgstr "الاتصالات الشبكية"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:443 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:875 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "متاح"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "ملف شهادة سُلْطة استيثاق"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "مدير الشبكة"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "مدير الشبكة"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#, fuzzy
+msgid "802.1X authentication"
+msgstr "استيثاق 802.1X سلكي"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:485 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "ا_تّصل"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "اسم ال_شبكة:"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "لا مركزية"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "لا توجد اتصالات نشطة!"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "مجهول"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "فشل اضافة اتصال "
+
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "غير متَّصل"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "غير متّصل"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "فشل اضافة اتصال "
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "لا تظهر هذه الرسالة مرة أخرى"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "أنت متصل الآن ب‍ '%s'."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"فشل اتصال VPN ‏'%s' لأن الاتصال الشبكي قُوطِعَ."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:489 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1280 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "تم الاتصال"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"فشل اتصال VPN ‏'%s' لأن خدمة VPN توفقت فجأة."
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "أنت متصل الآن بشبكة الهاتف المحمول."
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"فشل اتصال VPN ‏'%s' لأن خدمة أعادت إعدادا غير سليم."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:525 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "يجهز اتصال شبكة الهاتف المحمول '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"فشل اتصال VPN ‏'%s' لانتهاء مهلة محاولة الاتصال."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "يعِدّ اتصال شبكة الهاتف المحمول '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"فشل اتصال VPN ‏'%s' لأن خدمة VPN لم تبدأ في الوقت المحدد."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "الاستيثاق من المستخدم مطلوب للاتصال بشبكة الهاتف المحمول '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"فشل اتصال VPN ‏'%s' لأن خدمة VPN فشلت في البدء."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2479
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "يطلب عنوان شبكي ل‍ '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"فشل اتصال VPN ‏'%s' لعدم وجود أسرار VPN سليمة."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:552
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "اتصال شبكة الهاتف المحمول '%s' يعمل"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"فشل اتصال VPN ‏'%s' بسبب أسرار VPN غير سليمة."
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"فشل اتصال VPN ‏'%s'."
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:389
-#: ../src/applet-dialogs.c:430
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "شبكة هاتف محمول (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"فُصِل اتصال VPN ‏'%s' لأن الاتصال الشبكي قُوطِعَ."
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:391
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1474
-msgid "Mobile Broadband"
-msgstr "شبكة هاتف محمول"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"فُصِل اتصال VPN ‏'%s' لأن خدمة VPN توفقت."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "اتصال شبكة هاتف محمول (CDMA) جديد..."
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"فُصِل اتصال VPN ‏'%s'."
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "رسالة التسجيل في VPN"
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "فشل اتصال VPN"
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "أنت متصل الآن بشبكة CDMA."
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"فشل اتصال VPN ‏'%s' لأن خدمة VPN فشلت في البدء.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:547
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:993
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "اتصال شبكة الهاتف المحمول '%s' يعمل: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"فشل اتصال VPN ‏'%s' في البدء.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "تجوال"
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "الجهاز ليس جاهزا (البرمجية المضمنة مفقودة)"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-#, fuzzy
-msgid "CDMA network."
-msgstr "شبكة CDMA."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "الجهاز ليس جاهزا"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1098
-msgid "You are now registered on the home network."
-msgstr "أنت الآن مسجل بشبكة الوطن."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "غير متَّصل"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1104
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "اقطع الاتصال"
+
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "الجهاز ليس مُدارا"
+
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "لا تتوفر أي أجهزة شبكة."
+
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "ا_تّصالات VPN"
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "ا_ضبط VPN..."
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "ا_قطع اتصال VPN"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "لا يعمل مدير الشبكات..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "الشبكات معطلة"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "فعّل _الاتصال الشبكي"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
 #, fuzzy
-#| msgid "You are now connected to the wired network."
-msgid "You are now registered on a roaming network."
-msgstr "أنت الآن مسجل بشبكة التجوال."
+msgid "Enable _Wi-Fi"
+msgstr "فعّل ال_لاسلكي"
 
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "_فعّل شبكة الهاتف المحمول"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:456
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "اتصال شبكة هاتف محمول (GSM) جديد..."
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "_فعّل التنبيهات"
 
-#: ../src/applet-device-gsm.c:490
-msgid "You are now connected to the GSM network."
-msgstr "أنت متصل الآن بشبكة الهاتف المحمول GSM."
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "م_علومات الاتصال"
 
-#: ../src/applet-device-gsm.c:651
-msgid "PIN code required"
-msgstr "رمز PIN مطلوب"
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "_حرر الاتصالات..."
 
-#: ../src/applet-device-gsm.c:659
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "رمز PIN مطلوب لجهاز شبكة الهاتف المحمول"
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_عن"
 
-#: ../src/applet-device-gsm.c:784
-msgid "Wrong PIN code; please contact your provider."
-msgstr "رمز PIN خطأ، راجع مزود الخدمة."
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "أنت متصل الآن ب‍ '%s'."
+
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "غير متّصل"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "انقطع اتصال الشبكة."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "يجهز الاتصال الشبكي '%s'..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "الاستيثاق من المستخدم مطلوب للاتصال بالشبكة '%s'..."
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "يطلب عنوان شبكي ل‍ '%s'..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "الاتصال الشبكي '%s' يعمل"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "يبدأ اتصال VPN‏ '%s'..."
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "الاستيثاق من المستخدم مطلوب لاتصال VPN‏ '%s'..."
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "يطلب عنوان شبكي VPN ل‍ '%s'..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "الاتصال الشبكي VPN‏ '%s' يعمل"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "لا يوجد اتصال شبكي"
 
-#: ../src/applet-device-gsm.c:807
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "بريمج مدير الشبكة"
+
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "رمز PUK خطأ، راجع مزود الخدمة."
 
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "رمز PIN خطأ، راجع مزود الخدمة."
+
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:834
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "يرسل رمز الفتح..."
 
-#: ../src/applet-device-gsm.c:897
-msgid "SIM PIN unlock required"
-msgstr "بحاجة لفتح PIN بطاقة الهاتف"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "شبكة هاتف محمول (%s)"
 
-#: ../src/applet-device-gsm.c:898
-msgid "SIM PIN Unlock Required"
-msgstr "بحاجة لفتح PIN بطاقة الهاتف"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "شبكة هاتف محمول"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:900
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr "يحتاج جهاز الاتصال بشبكة المحمول '%s' لرمز PIN للشريحة قبل استخدامه."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "متاح"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:902
-msgid "PIN code:"
-msgstr "رمز PIN:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "اتصال شبكة هاتف محمول جديد..."
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:906
-msgid "Show PIN code"
-msgstr "أظهر رمز PIN"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "تم الاتصال"
 
-#: ../src/applet-device-gsm.c:909
-msgid "SIM PUK unlock required"
-msgstr "بحاجة لفتح PUK بطاقة الهاتف"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "أنت متصل الآن بشبكة الهاتف المحمول."
 
-#: ../src/applet-device-gsm.c:910
-msgid "SIM PUK Unlock Required"
-msgstr "بحاجة لفتح PUK بطاقة الهاتف"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "كلمة سر شبكة الهاتف المحمول"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:912
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr "يحتاج جهاز الاتصال بشبكة المحمول '%s' لرمز PUK للشريحة قبل استخدامه."
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "أنت الآن مسجل بشبكة الوطن."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:914
-msgid "PUK code:"
-msgstr "رمز PUK:"
+#: ../src/applet-device-broadband.c:963
+#, fuzzy
+msgid "You are now registered on a roaming network."
+msgstr "أنت الآن مسجل بشبكة التجوال."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:917
-msgid "New PIN code:"
-msgstr "رمز PIN جديد:"
+#: ../src/applet-device-bt.c:88
+msgid "You are now connected to the mobile broadband network."
+msgstr "أنت متصل الآن بشبكة الهاتف المحمول."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:919
-msgid "Re-enter new PIN code:"
-msgstr "أعد إدخال رمز PIN الجديد:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "يجهز اتصال شبكة الهاتف المحمول '%s'..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:924
-msgid "Show PIN/PUK codes"
-msgstr "أظهر رمز PIN/PUK"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "يعِدّ اتصال شبكة الهاتف المحمول '%s'..."
+
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "الاستيثاق من المستخدم مطلوب للاتصال بشبكة الهاتف المحمول '%s'..."
 
-#: ../src/applet-device-gsm.c:1097 ../src/applet-device-gsm.c:1103
-msgid "GSM network."
-msgstr "شبكة GSM."
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "اتصال شبكة الهاتف المحمول '%s' يعمل"
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "إيثرنت تلقائي"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "شبكات سلكية (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "شبكة سلكية (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "شبكات سلكية"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "شبكة سلكية"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1485
-msgid "disconnected"
-msgstr "غير متَّصل"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "أنت متصل الآن بالشبكة السلكية."
 
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "يجهز اتصال الشبكة السلكية '%s'..."
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "يعِدّ اتصال الشبكة السلكية '%s'..."
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "الاستيثاق من المستخدم مطلوب للاتصال بالشبكة السلكية '%s'..."
 
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "يطلب عنوان شبكي سلكي ل‍ '%s'..."
 
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "الاتصال الشبكي السلكي '%s' يعمل"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "استيثاق DSL"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "ا_تصل بشبكة لاسلكية مخفية..."
 
-#: ../src/applet-device-wifi.c:150
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "أنشئ اتّصالًا لاسلكيًّا جديدًا..."
 
-#: ../src/applet-device-wifi.c:294
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(لا شيء)"
 
-#: ../src/applet-device-wifi.c:803
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "الشبكات اللاسلكية (%s)"
-
-#: ../src/applet-device-wifi.c:805
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "شبكة لاسلكية (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "شبكات سلكية (%s)"
 
-#: ../src/applet-device-wifi.c:807
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "شبكة لاسلكية"
-msgstr[1] "شبكة لاسلكية"
-msgstr[2] "شبكتين لاسلكيتين"
-msgstr[3] "شبكات لاسلكية"
-msgstr[4] "شبكة لاسلكية"
-msgstr[5] "شبكة لاسلكية"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "شبكة سلكية (%s)"
 
-#: ../src/applet-device-wifi.c:840
-msgid "wireless is disabled"
-msgstr "الشبكة اللاسلكية معطلة"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "شبكة سلكية"
+msgstr[1] "شبكة سلكية"
+msgstr[2] "شبكة سلكية"
+msgstr[3] "شبكة سلكية"
+msgstr[4] "شبكة سلكية"
+msgstr[5] "شبكة سلكية"
+
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "شبكة WiMAX معطلة"
 
-#: ../src/applet-device-wifi.c:841
-msgid "wireless is disabled by hardware switch"
-msgstr "الشبكة اللاسلكية مغلقة بمفتاح في العتاد"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "شبكة WiMAX مغلقة بمفتاح في العتاد"
 
-#: ../src/applet-device-wifi.c:902
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "المزيد من الشبكات"
 
-#: ../src/applet-device-wifi.c:1081
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "الشبكات اللاسلكية المتاحة"
 
-#: ../src/applet-device-wifi.c:1083
-msgid "Click on this icon to connect to a wireless network"
-msgstr "انقر على هذه الأيقونة للاتصال بشبكة لاسلكية"
-
-#: ../src/applet-device-wifi.c:1084
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "استخدم قائمة الشبكة للاتصال بشبكة لاسلكية"
 
-#: ../src/applet-device-wifi.c:1087 ../src/applet.c:901
-msgid "Don't show this message again"
-msgstr "لا تظهر هذه الرسالة مرة أخرى"
-
-#: ../src/applet-device-wifi.c:1279
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, fuzzy, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "أنت متصل الآن بالشبكة اللاسلكية '%s'."
 
-#: ../src/applet-device-wifi.c:1310
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "يجهز اتصال الشبكة اللاسلكية '%s'..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "يجهز الاتصال الشبكي '%s'..."
 
-#: ../src/applet-device-wifi.c:1313
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "يعِدّ اتصال الشبكة اللاسلكية '%s'..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "يعِدّ اتصال الشبكة السلكية '%s'..."
 
-#: ../src/applet-device-wifi.c:1316
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "الاستيثاق من المستخدم مطلوب للاتصال بالشبكة اللاسلكية '%s'..."
 
-#: ../src/applet-device-wifi.c:1319
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "يطلب عنوان شبكي لاسلكي ل‍ '%s'..."
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "يطلب عنوان شبكي ل‍ '%s'..."
 
-#: ../src/applet-device-wifi.c:1340
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "الاتصال الشبكي اللاسلكي '%s' يعمل: %s‏ (%d%%)"
 
-#: ../src/applet-device-wifi.c:1345
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "الاتصال الشبكي اللاسلكي '%s' يعمل"
-
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "شبكة هاتف محمول WiMAX ‏(%s)"
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr "شبكة هاتف محمول WiMAX"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "شبكة WiMAX معطلة"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "الاتصال الشبكي السلكي '%s' يعمل"
 
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "شبكة WiMAX مغلقة بمفتاح في العتاد"
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "لا توجد اتصالات نشطة!"
 
-#: ../src/applet-device-wimax.c:428
-msgid "You are now connected to the WiMAX network."
-msgstr "أنت متصل الآن بشبكة WiMAX."
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "تعذّر تعديل الاتصال الجديد"
 
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "خطأ أثناء عرض معلومات الاتصال:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/libnm-gtk/nm-wireless-dialog.c:949
-#: ../src/wireless-security/wireless-security.c:396
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamic WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
-#: ../src/applet-dialogs.c:248
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:244
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "العناوين"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/libnm-gtk/nm-wireless-dialog.c:906
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "بدون"
 
-#: ../src/applet-dialogs.c:352 ../src/applet-dialogs.c:490
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "1 (المبدئي)"
+
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u م.بايت\\ث"
 
-#: ../src/applet-dialogs.c:354 ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "مجهول"
 
-#: ../src/applet-dialogs.c:367
-#, c-format
-msgid "%d dB"
-msgstr "%d ديسيبل"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "مجهول"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "عنوان IP:"
 
 #: ../src/applet-dialogs.c:369
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "مجهول"
+msgid "Broadcast Address:"
+msgstr "عنوان البثّ:"
 
+#. Prefix
 #: ../src/applet-dialogs.c:381
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
+msgctxt "Subnet Mask"
+msgid "Unknown"
 msgstr "مجهول"
 
-#: ../src/applet-dialogs.c:416
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "قناع الشبكة الفرعية:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "إيثرنت (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 واي فاي (%s)"
 
-#: ../src/applet-dialogs.c:426
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:428
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:432
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:438 ../src/applet-dialogs.c:797
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "عام"
 
-#: ../src/applet-dialogs.c:442
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "الواجهة:"
 
-#: ../src/applet-dialogs.c:458
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "عنوان العتاد:"
 
 #. Driver
-#: ../src/applet-dialogs.c:466
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "المُشغّل:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "السرعة:"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "الأمن:"
 
-#: ../src/applet-dialogs.c:518
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:531
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:559 ../src/applet-dialogs.c:666
-msgid "IP Address:"
-msgstr "عنوان IP:"
-
-#: ../src/applet-dialogs.c:561 ../src/applet-dialogs.c:577
-msgctxt "Address"
-msgid "Unknown"
-msgstr "مجهول"
-
-#: ../src/applet-dialogs.c:575
-msgid "Broadcast Address:"
-msgstr "عنوان البثّ:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:584
-msgid "Subnet Mask:"
-msgstr "قناع الشبكة الفرعية:"
-
-#: ../src/applet-dialogs.c:586
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "مجهول"
-
-#: ../src/applet-dialogs.c:594 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "السبيل الافتراضي:"
 
-#: ../src/applet-dialogs.c:606
-msgid "Primary DNS:"
-msgstr "‏DNS الأوّلي:"
-
-#: ../src/applet-dialogs.c:615
-msgid "Secondary DNS:"
-msgstr "‏DNS الثّانوي:"
-
-#: ../src/applet-dialogs.c:625
-msgid "Ternary DNS:"
-msgstr "‏DNS الثالثي:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:649
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "متروك"
 
-#: ../src/applet-dialogs.c:802
+#: ../src/applet-dialogs.c:815
 #, fuzzy
-#| msgid "_Type:"
 msgid "VPN Type:"
 msgstr "ال_نوع:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:822
 #, fuzzy
-#| msgid "Gateway"
 msgid "VPN Gateway:"
 msgstr "البوّابة"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:828
 #, fuzzy
-#| msgid "_Username:"
 msgid "VPN Username:"
 msgstr "اسم المس_تخدم:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr ""
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:840
 #, fuzzy
-#| msgid "C_onnection:"
 msgid "Base Connection:"
 msgstr "الات_صال:"
 
-#: ../src/applet-dialogs.c:829
-#, fuzzy
-#| msgctxt "Speed"
-#| msgid "Unknown"
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "مجهول"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:892
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "لا توجد اتصالات نشطة سليمة!"
 
-#: ../src/applet-dialogs.c:945
+#: ../src/applet-dialogs.c:985
 #, fuzzy
-#| msgid ""
-#| "Copyright © 2004-2010 Red Hat, Inc.\n"
-#| "Copyright © 2005-2008 Novell, Inc.\n"
-#| "and many other community contributors and translators"
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -695,973 +944,1842 @@ msgstr ""
 "حقوق محفوظة © 2005-2008 نوفل.\n"
 "والكثير من مساهمي المجتمع والمترجمين."
 
-#: ../src/applet-dialogs.c:948
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "بريمج منطقة التبليغ لإدارة الأجهزة الشبكية والاتصالات."
 
-#: ../src/applet-dialogs.c:950
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "موقع مدير الشبكة"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "موارد ناقصة"
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "كلمة سر شبكة الهاتف المحمول"
 
-#: ../src/applet-dialogs.c:999
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "كلمة سر مطلوبة للاتصال بشبكة الهاتف المحمول '%s'."
 
-#: ../src/applet-dialogs.c:1018
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "كلمة السر:"
 
-#: ../src/applet.c:990
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "بحاجة لفتح PIN بطاقة الهاتف"
+
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "بحاجة لفتح PIN بطاقة الهاتف"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
-msgstr ""
-"\n"
-"فشل اتصال VPN ‏'%s' لأن الاتصال الشبكي قُوطِعَ."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "يحتاج جهاز الاتصال بشبكة المحمول '%s' لرمز PIN للشريحة قبل استخدامه."
 
-#: ../src/applet.c:993
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "رمز PIN:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "أظهر رمز PIN"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "بحاجة لفتح PUK بطاقة الهاتف"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "بحاجة لفتح PUK بطاقة الهاتف"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "يحتاج جهاز الاتصال بشبكة المحمول '%s' لرمز PUK للشريحة قبل استخدامه."
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "رمز PUK:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "رمز PIN جديد:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "أعد إدخال رمز PIN الجديد:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
 msgstr ""
-"\n"
-"فشل اتصال VPN ‏'%s' لأن خدمة VPN توفقت فجأة."
 
-#: ../src/applet.c:996
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"فشل اتصال VPN ‏'%s' لأن خدمة أعادت إعدادا غير سليم."
+"تحدّد عناوين IP هويّة حاسوبك على الشبكة .اضغط زر \"إضافة\" لإضافة  عنوان IP."
 
-#: ../src/applet.c:999
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+#: ../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
+msgid "_Add"
 msgstr ""
-"\n"
-"فشل اتصال VPN ‏'%s' لانتهاء مهلة محاولة الاتصال."
 
-#: ../src/applet.c:1002
-#, c-format
+#. 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
+msgid "_Delete"
+msgstr "اح_ذف"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+#, 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
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr "اذا ممكّن ,هذا الاتصال لن يتم استخدامة ابدا كاتصال مبدئي."
+
+#: ../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…"
+msgstr "أُنشئ…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "اختر نوع اتصال VPN"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"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."
 msgstr ""
-"\n"
-"فشل اتصال VPN ‏'%s' لأن خدمة VPN لم تبدأ في الوقت المحدد."
+"اختر نوع اتصال VPN المراد استخدامه للأتصال الجديد.اذا لم يضهر نوع اتصال VPN "
+"الذي ترغب في تكوينة في القائمة، فقد يعني هذا أنّ ملحق VPN الذي تحتاجه غير "
+"مثبّت."
 
-#: ../src/applet.c:1005
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "عنوان البثّ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "الات_صال:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_حرّر"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "الواجهة:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"فشل اتصال VPN ‏'%s' لأن خدمة VPN فشلت في البدء."
 
-#: ../src/applet.c:1008
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "‏DNS الأوّلي:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
 msgstr ""
-"\n"
-"فشل اتصال VPN ‏'%s' لعدم وجود أسرار VPN سليمة."
 
-#: ../src/applet.c:1011
+#: ../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:"
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "بايتات"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "الأ_من:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "الات_صال:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "فعّل _الاتصال الشبكي"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "تلقائي"
+
+#: ../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
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+msgid "default"
+msgstr "المبدئي"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"\n"
-"فشل اتصال VPN ‏'%s' بسبب أسرار VPN غير سليمة."
 
-#: ../src/applet.c:1018
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "العنوان"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "العنوان"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+msgid "invalid %s for %s (%s)"
 msgstr ""
-"\n"
-"فشل اتصال VPN ‏'%s'."
 
-#: ../src/applet.c:1036
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+msgid "invalid %s (%s)"
 msgstr ""
-"\n"
-"فُصِل اتصال VPN ‏'%s' لأن الاتصال الشبكي قُوطِعَ."
 
-#: ../src/applet.c:1039
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+msgid "invalid interface-name for %s (%s)"
 msgstr ""
-"\n"
-"فُصِل اتصال VPN ‏'%s' لأن خدمة VPN توفقت."
 
-#: ../src/applet.c:1045
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+msgid "invalid interface-name (%s)"
 msgstr ""
-"\n"
-"فُصِل اتصال VPN ‏'%s'."
 
-#: ../src/applet.c:1079
-msgid "VPN Login Message"
-msgstr "رسالة التسجيل في VPN"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "أي جهاز"
 
-#: ../src/applet.c:1085 ../src/applet.c:1093 ../src/applet.c:1143
-msgid "VPN Connection Failed"
-msgstr "فشل اتصال VPN"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "فشل تحديث الاتصال السري بسبب خطأ مجهول."
 
-#: ../src/applet.c:1150
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+msgid "Use Data Center Bridging (DCB) for this connection"
 msgstr ""
-"\n"
-"فشل اتصال VPN ‏'%s' لأن خدمة VPN فشلت في البدء.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1153
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
 msgstr ""
-"\n"
-"فشل اتصال VPN ‏'%s' في البدء.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1473
-msgid "device not ready (firmware missing)"
-msgstr "الجهاز ليس جاهزا (البرمجية المضمنة مفقودة)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/applet.c:1475
-msgid "device not ready"
-msgstr "الجهاز ليس جاهزا"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1501
-msgid "Disconnect"
-msgstr "اقطع الاتصال"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1515
-msgid "device not managed"
-msgstr "الجهاز ليس مُدارا"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.c:1559
-msgid "No network devices available"
-msgstr "لا تتوفر أي أجهزة شبكة."
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.c:1647
-msgid "_VPN Connections"
-msgstr "ا_تّصالات VPN"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.c:1704
-msgid "_Configure VPN..."
-msgstr "ا_ضبط VPN..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.c:1708
-msgid "_Disconnect VPN"
-msgstr "ا_قطع اتصال VPN"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.c:1806
-msgid "NetworkManager is not running..."
-msgstr "لا يعمل مدير الشبكات..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.c:1811 ../src/applet.c:2604
-msgid "Networking disabled"
-msgstr "الشبكات معطلة"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2032
-msgid "Enable _Networking"
-msgstr "فعّل _الاتصال الشبكي"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2041
-msgid "Enable _Wireless"
-msgstr "فعّل ال_لاسلكي"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2050
-msgid "Enable _Mobile Broadband"
-msgstr "_فعّل شبكة الهاتف المحمول"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2059
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "فعّل شبكة الهاتف المحمول WiMA_X"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#. Toggle notifications item
-#: ../src/applet.c:2070
-msgid "Enable N_otifications"
-msgstr "_فعّل التنبيهات"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2081
-msgid "Connection _Information"
-msgstr "م_علومات الاتصال"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2091
-msgid "Edit Connections..."
-msgstr "_حرر الاتصالات..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2105
-msgid "_Help"
-msgstr "م_ساعدة"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2114
-msgid "_About"
-msgstr "_عن"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.c:2291
-msgid "Disconnected"
-msgstr "غير متّصل"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2292
-msgid "The network connection has been disconnected."
-msgstr "انقطع اتصال الشبكة."
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2473
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "يجهز الاتصال الشبكي '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2476
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "الاستيثاق من المستخدم مطلوب للاتصال بالشبكة '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:2482
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "الاتصال الشبكي '%s' يعمل"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:2560
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "يبدأ اتصال VPN‏ '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.c:2563
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "الاستيثاق من المستخدم مطلوب لاتصال VPN‏ '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
 
-#: ../src/applet.c:2566
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "يطلب عنوان شبكي VPN ل‍ '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
 
-#: ../src/applet.c:2569
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "الاتصال الشبكي VPN‏ '%s' يعمل"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
 
-#: ../src/applet.c:2608
-msgid "No network connection"
-msgstr "لا يوجد اتصال شبكي"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.c:3258
-msgid "NetworkManager Applet"
-msgstr "بريمج مدير الشبكة"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "_Unlock"
-msgstr "ا_فتح"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Active Network Connections"
-msgstr "الاتصالات الشبكية النشطة"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Connection Information"
-msgstr "معلومات الاتصال"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "استيثاق 802.1X سلكي"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:4
-msgid "_Network name:"
-msgstr "اسم ال_شبكة:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:67
-msgid "automatic"
-msgstr "تلقائي"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:305
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "فشل تحديث الاتصال السري بسبب خطأ مجهول."
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 msgstr ""
-"تحدّد عناوين IP هويّة حاسوبك على الشبكة .اضغط زر \"إضافة\" لإضافة  عنوان IP."
 
-#: ../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:46
 msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
-msgstr "اذا ممكّن ,هذا الاتصال لن يتم استخدامة ابدا كاتصال مبدئي."
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "Ig_nore automatically obtained routes"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "Use this c_onnection only for resources on its network"
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:2
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "Sho_w password"
-msgstr "أظهر _كلمة السر"
+msgid "_Username:"
+msgstr "اسم المس_تخدم:"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Password:"
-msgstr "_كلمة السر:"
-
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "الخ_دمة:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../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:4
+#: ../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
-msgid "_Username:"
-msgstr "اسم المس_تخدم:"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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
-msgid "Addresses"
-msgstr "العناوين"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
+#: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "تلقائي"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-msgid "Automatic with manual DNS settings"
-msgstr "تلقائي مع إعدادات DNS يدوية"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-msgid "D_HCP client ID:"
-msgstr "معرف عميل D_HCP:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 م.بايت\\ث"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 م.بايت\\ث"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 ج.بايت/ث"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 ج.بايت/ث"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "ال_منفذ:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "ال_سرعة:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "الخ_دمة:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#, fuzzy
+msgid "C_loned MAC address:"
+msgstr "عنوان _MAC:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid ""
-"Domains used when resolving host names. Use commas to separate multiple "
-"domains."
+"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-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "المبدئي"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "متروك"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "عنوان البثّ:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "كل_مة سر المفتاح السري:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
-"IP addresses of domain name servers used to resolve host names. Use commas "
-"to separate multiple domain name server addresses."
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
-"عناوين IP لخوادم أسماء النطاقات التي تستخدم لمعالجة اسماء المضيفات .استخدم "
-"فواصل لتفريق أسماء خوادم أسماء النطاقات."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "Link-Local"
-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-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:191
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "ا_تّصل"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr "تلقائي مع إعدادات DNS يدوية"
+
+#: ../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 "يدويا"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-msgid "Require IPv4 addressing for this connection to complete"
-msgstr "اطلب اتصالاً بعنوان ipv4 لكي يتم هذا الاتصال "
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
+msgstr "ربط-محلي"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/page-ip4.c:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../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
 msgid "Shared to other computers"
 msgstr "مشارك مع أجهزة أخرى"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "_Method:"
+msgstr "ال_طريقة:"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Addresses"
+msgstr "العناوين"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 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:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
-"When connecting to IPv6-capable networks, allows the connection to complete "
-"if IPv4 configuration fails but IPv6 configuration succeeds."
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
 msgstr ""
+"المجالات تستخدم عند حل اسماءالمضيف . استخدم الفواصل لتفريق المجالات المتعددة."
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr "معرف عميل D_HCP:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-msgid "DNS ser_vers:"
-msgstr "_خواديم DNS:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
+#, fuzzy
+msgid "S_earch domains:"
+msgstr "_نطاقات البحث:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "_Method:"
-msgstr "ال_طريقة:"
+#: ../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:"
+msgstr "_خواديم DNS:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+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:17
+#, fuzzy
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr "اطلب اتصالاً بعنوان ipv4 لكي يتم هذا الاتصال "
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "ال_طُرق…"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "_Search domains:"
-msgstr "_نطاقات البحث:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 لخوادم أسماء النطاقات التي تستخدم لمعالجة اسماء المضيفات .استخدم "
+"فواصل لتفريق أسماء خوادم أسماء النطاقات."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#, fuzzy
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr "اطلب اتصالاً بعنوان ipv4 لكي يتم هذا الاتصال "
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 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
-msgid "2G (GPRS/EDGE)"
-msgstr ""
+msgid "Basic"
+msgstr "أساسي"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr ""
+msgid "Nu_mber:"
+msgstr "الر_قم:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "متقدم"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Allow roaming if home network is not available"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Any"
-msgstr "الكل"
-
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Basic"
-msgstr "أساسي"
+msgid "_APN:"
+msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "غيّر..."
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "N_etwork ID:"
 msgstr "معرف ال_شبكة:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "Nu_mber:"
-msgstr "الر_قم:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "PI_N:"
-msgstr "PI_N:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr "غيّر..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-msgid "Prefer 2G (GPRS/EDGE)"
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "أظهر _كلمات السر"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
-msgstr "_APN:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "_Type:"
-msgstr "ال_نوع:"
-
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
-msgstr ""
+msgid "Authentication"
+msgstr "الاستيثاق"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Allowed methods:"
 msgstr "الطرق المسموحة:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "Authentication"
-msgstr "الاستيثاق"
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
+msgstr "اضبط ال_طُُرق…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Compression"
 msgstr "الضغط"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr "ا_ستخدم تعمية النقطة إلى النقطة (MPPE)"
+
 #: ../src/connection-editor/ce-page-ppp.ui.h:6
-msgid "Configure _Methods…"
-msgstr "اضبط ال_طُُرق…"
+msgid "_Require 128-bit encryption"
+msgstr "تطلب _تعمية 128-بتة"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:7
-msgid "Echo"
+msgid "Use _stateful MPPE"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:8
-msgid "Send PPP _echo packets"
+msgid "Allow _BSD data compression"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Use TCP _header compression"
+msgid "Allow _Deflate data compression"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Use _stateful MPPE"
+msgid "Use TCP _header compression"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "_Require 128-bit encryption"
-msgstr "تطلب _تعمية 128-بتة"
+msgid "Echo"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
-msgid "_Use point-to-point encryption (MPPE)"
-msgstr "ا_ستخدم تعمية النقطة إلى النقطة (MPPE)"
+msgid "Send PPP _echo packets"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-msgid "1 Gb/s"
-msgstr "1 ج.بايت/ث"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 ج.بايت/ث"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "10 Mb/s"
-msgstr "10 م.بايت\\ث"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "الات_صال:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "100 Mb/s"
-msgstr "100 م.بايت\\ث"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "الواجهة:"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "عنوان _MAC:"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "Full duple_x"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-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"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Twisted Pair (TP)"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid "_Cloned MAC address:"
-msgstr "عنوان _MAC:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
 #, fuzzy
-msgid "_Device MAC address:"
-msgstr "عنوان _MAC:"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-msgid "_Port:"
-msgstr "ال_منفذ:"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Speed:"
-msgstr "ال_سرعة:"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "bytes"
-msgstr "بايتات"
+msgid "S_ecurity:"
+msgstr "الأمن:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "‏A ‏(5 ج.هرتز)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
-msgid "Ad-hoc"
-msgstr "لا مركزية"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
-msgid "Ban_d:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "C_hannel:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "Infrastructure"
-msgstr ""
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr "لا مركزية"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "M_ode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "Mb/s"
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
-msgid "Transmission po_wer:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
-msgid "_Rate:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_SSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "mW"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
-msgstr "الأ_من:"
+#: ../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:1
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
 msgid "Allowed Authentication Methods"
 msgstr "طرق الاستيثاق المسموحة"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr "_EAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr "برتوكول الاستيثاق الممتد"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr "_PAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr "برتوكول الاستيثاق بكلمة السر"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
-msgid "Extensible Authentication Protocol"
-msgstr "برتوكول الاستيثاق الممتد"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+#: ../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 "إيثرنت تلقائي"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
-msgid "Microsoft Challenge Handshake Authentication Protocol"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-msgid "Password Authentication Protocol"
-msgstr "برتوكول الاستيثاق بكلمة السر"
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "DSL"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "_EAP"
-msgstr "_EAP"
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
+msgid "InfiniBand"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
+#: ../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
+msgid "Bond"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid "_PAP"
-msgstr "_PAP"
+#: ../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
+msgid "Team"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:1 ../src/libnm-gtk/wifi.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/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
+msgid "Bridge"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/connection-helpers.c:196
 #, fuzzy
-msgid "Choose a VPN Connection Type"
-msgstr "اختر نوع اتصال VPN"
+msgid "Hardware"
+msgstr "عنوان العتاد:"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Create…"
-msgstr "أُنشئ…"
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "صدّر اتصال VPN..."
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
+#: ../src/connection-editor/connection-helpers.c:323
 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 الذي تحتاجه غير "
-"مثبّت."
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "تعذّر تشغيل واجهة محرر الاتصال بسبب خطأ مجهول."
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "تعذّر إنشاء اتصال جديد"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "فشلت إزالة الاتصال"
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "هل أنت متأكد من حذف هذا الاتصال %s؟"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:901
-#: ../src/connection-editor/page-ip6.c:867
+#: ../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
 msgid "Address"
 msgstr "العنوان"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:918
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "قناع الشبكة"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:935
-#: ../src/connection-editor/page-ip6.c:901
+#: ../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
 msgid "Gateway"
 msgstr "البوّابة"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:884
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "يحرر %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "يحرر اتصالا غير مُسمى"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "ا_سم الاتصال:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "خطأ في بدء المحرر"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "فشل اضافة اتصال "
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+#, 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:419
+msgid "_Save"
+msgstr "ا_حفظ"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "احفظ كلّ التغييرات التي تم عملها لهذا الاتصال ."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "استوثق لحفظ هذا الاتصال لكل المستخدمين على هذا الجهاز ."
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "تعذّر إنشاء اتصال جديد"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "تعذّر تعديل الاتصال "
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+msgid "Unknown error creating connection editor dialog."
+msgstr "خطأ عرض معلومات الاتصال:"
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "خطأ في بدء المحرر"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+#, 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-list.c:1482
-msgid "DSL"
-msgstr "DSL"
+msgid "Connection _name:"
+msgstr "ا_سم الاتصال:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "_صدّر"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "أبدًا"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "الآن"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "منذ أقل من دقيقة"
+msgstr[1] "منذ دقيقة واحدة"
+msgstr[2] "منذ دقيقتين"
+msgstr[3] "منذ %d دقائق"
+msgstr[4] "منذ %d دقيقة"
+msgstr[5] "منذ %d دقيقة"
+
+#: ../src/connection-editor/nm-connection-list.c:160
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "منذ أقل من ساعة"
+msgstr[1] "منذ ساعة واحدة"
+msgstr[2] "منذ ساعتين"
+msgstr[3] "منذ %d ساعات"
+msgstr[4] "منذ %d ساعة"
+msgstr[5] "منذ %d ساعة"
+
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "منذ أقل من يوم"
+msgstr[1] "منذ يوم واحد"
+msgstr[2] "منذ يومين"
+msgstr[3] "منذ %d أيام"
+msgstr[4] "منذ %d يوما"
+msgstr[5] "منذ %d يوم"
+
+#: ../src/connection-editor/nm-connection-list.c:178
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "منذ أقل من شهر"
+msgstr[1] "منذ شهر واحد"
+msgstr[2] "منذ شهرين"
+msgstr[3] "منذ %d أشهر"
+msgstr[4] "منذ %d شهرا"
+msgstr[5] "منذ %d شهر"
+
+#: ../src/connection-editor/nm-connection-list.c:182
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "منذ أقل من سنة"
+msgstr[1] "منذ سنة واحدة"
+msgstr[2] "منذ سنتين"
+msgstr[3] "منذ %d سنوات"
+msgstr[4] "منذ %d سنة"
+msgstr[5] "منذ %d سنة"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "الاسم"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "آخر استخدام"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "حرّر الاتصال المحدد"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "استوثق لتحرير الاتصال المحدد"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "احذف الاتصال المحدد."
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "استوثق لحذف الاتصال المحدد"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, fuzzy, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "لا توجد اتصالات نشطة!"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+#, fuzzy
+msgid "Error creating connection"
+msgstr "خطأ أثناء عرض معلومات الاتصال:"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "خطأ أثناء عرض معلومات الاتصال:"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "أمن 802.1x"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "تعذر تحميل الواجهة اللاسلكية الأمنية"
+
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "تعذر تحميل واجهة PPP"
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "لم يتم العثور على جهاز بلوتوث "
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "الاتصال السلكي %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "ال_ولوج إلى الشبكة"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "شبكة لاسلكية"
+
+#: ../src/connection-editor/page-bond.c:447
+#, fuzzy
+msgid "Could not load bond user interface."
+msgstr "تعذر تحميل واجهة PPP"
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "‏DNS الأوّلي:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "الاتصال السلكي %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "تعذر تحميل الواجهة اللاسلكية"
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "الاتصال السلكي %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "تعذر تحميل الواجهة اللاسلكية"
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "تعذر تحميل واجهة PPP"
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "اتصال DSL‏ %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ethernet.c:74
+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:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "تعذر تحميل واجهة PPP"
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "إيثرنت (%s)"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "عنوان _MAC:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "المبدئي"
+
+#: ../src/connection-editor/page-general.c:52
+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 "لا يعمل مدير الشبكات..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "تعذر تحميل واجهة PPP"
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+#, fuzzy
+msgid "Could not load InfiniBand user interface."
+msgstr "تعذر تحميل الواجهة اللاسلكية"
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "الاتصال السلكي %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "تلقائي (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "عناوين (VPN) تلقائية فقط"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "تلقائي (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "عناوين (PPP) تلقائية فقط"
+msgid "Automatic, addresses only"
+msgstr "تلقائي، عناوين فقط"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "تلقائي (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "عناوين (PPPoE) تلقائية فقط"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "تلقائي (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "عناوين (DHCP) تلقائية فقط"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr ""
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "_خواديم DNS:"
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "_نطاقات البحث:"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:982
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "إعدادات IPv4"
 
-#: ../src/connection-editor/page-ip4.c:984
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "لم اتمكن من تحميل الاسلكي الامنية"
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "تلقائي، عناوين فقط"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:285
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "متروك"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "تلقائي, (DHCP)فقط"
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:946
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "إعدادات IPv6"
 
-#: ../src/connection-editor/page-ip6.c:948
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "تعذّر تحميل واجهة المستخدم لـIPv6"
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "تعذّر تحميل واجهة المستخدم لاتصال المحمول."
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "نوع اتصال المحمول غير مدعوم."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:639
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "اختر مزود خدمة اتصالات المحمول"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1669,444 +2787,261 @@ msgstr ""
 "اختر نوع اتصال المحمول الذي يقدمه مزودك. اذا لم تكن متأكدا, اسأل مزود الخدمة."
 "الخدمة."
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "مقدم الخدمة يستخدم تقنية GSM‏ (GPRS، EDGE، UMTS، HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "مقدم الخدمة يستخدم تقنية CDMA (‏1xRTT، EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "لا شيء"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "إعدادات PPP"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "تعذر تحميل واجهة PPP"
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1478
-msgid "VPN"
-msgstr "VPN"
+#: ../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 "اختر ملفا لاستيراده"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "تعذر تحميل واجهة PPP"
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "الاتصال السلكي %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+msgid "Could not load team port user interface."
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "لا يوجد اتصال شبكي"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "لم اتمكن من تحميل الاسلكي الامنية"
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "اتصال VPN‏ %d"
+
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "تعذر تحميل واجهة VPN"
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "تعذر ايجاد ملحق خدمة VPN ل  '%s'."
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:884
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "اتصال VPN‏ %d"
 
-#: ../src/connection-editor/page-wired.c:88
-#: ../src/connection-editor/page-wireless.c:93
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 msgstr ""
+"فشل ملحق اتصال VPN في استيراد اتصال VPN بشكل صحيح\n"
+"\n"
+"الخطأ:لم يحدد نوع خدمة VPN"
 
-#: ../src/connection-editor/page-wired.c:267
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1466
-msgid "Wired"
-msgstr "سلكي"
+#: ../src/connection-editor/page-vpn.c:254
+#, fuzzy
+msgid "Choose a VPN Connection Type"
+msgstr "اختر نوع اتصال VPN"
 
-#: ../src/connection-editor/page-wired.c:269
-msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-vpn.c:255
+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 الذي تحتاجه غير "
+"مثبّت."
 
-#: ../src/connection-editor/page-wired.c:444
-#, c-format
-msgid "Wired connection %d"
-msgstr "الاتصال السلكي %d"
-
-#: ../src/connection-editor/page-wired-security.c:116
-msgid "802.1x Security"
-msgstr "أمن 802.1x"
-
-#: ../src/connection-editor/page-wired-security.c:118
-#, fuzzy
-msgid "Could not load Wired Security security user interface."
-msgstr "لم اتمكن من تحميل واجهةالاتصال السلكي الامنية"
-
-#: ../src/connection-editor/page-wired-security.c:136
-msgid "Use 802.1X security for this connection"
+#: ../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-wireless.c:166
-#: ../src/connection-editor/page-wireless.c:170
-#: ../src/connection-editor/page-wireless.c:191
-#, c-format
-msgid "default"
-msgstr "المبدئي"
+#: ../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-wireless.c:195
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u م.هرتز)"
 
-#: ../src/connection-editor/page-wireless.c:452
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1470
-msgid "Wireless"
-msgstr "لاسلكي"
-
-#: ../src/connection-editor/page-wireless.c:454
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "تعذر تحميل الواجهة اللاسلكية"
 
-#: ../src/connection-editor/page-wireless.c:658
-#, c-format
-msgid "Wireless connection %d"
-msgstr "الاتصال اللاسلكي %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "أي جهاز"
 
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/libnm-gtk/nm-wireless-dialog.c:923
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "الاتصال السلكي %d"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:272
-#: ../src/libnm-gtk/nm-wireless-dialog.c:932
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "عبارة سر WEP 128-bit"
 
-#: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/libnm-gtk/nm-wireless-dialog.c:962
+#: ../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)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/libnm-gtk/nm-wireless-dialog.c:976
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "‏WPA و WPA2 شخصي"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:990
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "‏WPA و WPA2 للشركات"
 
-#: ../src/connection-editor/page-wireless-security.c:360
-msgid "Could not load WiFi security user interface; missing WiFi setting."
-msgstr "تعذر تحميل الاواجهة اللاسلكية؛ إعداد الشبكة اللاسلكية مفقود"
-
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Wireless Security"
-msgstr "أمن اللاسلكي"
-
-#: ../src/connection-editor/page-wireless-security.c:372
-msgid "Could not load WiFi security user interface."
-msgstr "تعذر تحميل الواجهة اللاسلكية الأمنية"
-
-#: ../src/connection-editor/nm-connection-editor.c:101
-#, c-format
-msgid "Editing %s"
-msgstr "يحرر %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:105
-msgid "Editing un-named connection"
-msgstr "يحرر اتصالا غير مُسمى"
-
-#: ../src/connection-editor/nm-connection-editor.c:288
-#, 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:391
+#: ../src/connection-editor/page-wifi-security.c:413
 #, fuzzy
-msgid "Error creating connection editor dialog."
-msgstr "خطأ عرض معلومات الاتصال:"
-
-#: ../src/connection-editor/nm-connection-editor.c:403
-msgid "_Save"
-msgstr "ا_حفظ"
-
-#: ../src/connection-editor/nm-connection-editor.c:404
-msgid "Save any changes made to this connection."
-msgstr "احفظ كلّ التغييرات التي تم عملها لهذا الاتصال ."
-
-#: ../src/connection-editor/nm-connection-editor.c:405
-msgid "_Save..."
-msgstr "ا_حفظ..."
-
-#: ../src/connection-editor/nm-connection-editor.c:406
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "استوثق لحفظ هذا الاتصال لكل المستخدمين على هذا الجهاز ."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "A_vailable to all users"
-msgstr "متاح لكل المستخدمين"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "اتصل _تلقائيا"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
-msgstr "ا_سم الاتصال:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "E_xport"
-msgstr "_صدّر"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "_Import"
-msgstr "ا_ستورد"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "أبدًا"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "الآن"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "منذ أقل من دقيقة"
-msgstr[1] "منذ دقيقة واحدة"
-msgstr[2] "منذ دقيقتين"
-msgstr[3] "منذ %d دقائق"
-msgstr[4] "منذ %d دقيقة"
-msgstr[5] "منذ %d دقيقة"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "منذ أقل من ساعة"
-msgstr[1] "منذ ساعة واحدة"
-msgstr[2] "منذ ساعتين"
-msgstr[3] "منذ %d ساعات"
-msgstr[4] "منذ %d ساعة"
-msgstr[5] "منذ %d ساعة"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "منذ أقل من يوم"
-msgstr[1] "منذ يوم واحد"
-msgstr[2] "منذ يومين"
-msgstr[3] "منذ %d أيام"
-msgstr[4] "منذ %d يوما"
-msgstr[5] "منذ %d يوم"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "منذ أقل من شهر"
-msgstr[1] "منذ شهر واحد"
-msgstr[2] "منذ شهرين"
-msgstr[3] "منذ %d أشهر"
-msgstr[4] "منذ %d شهرا"
-msgstr[5] "منذ %d شهر"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "منذ أقل من سنة"
-msgstr[1] "منذ سنة واحدة"
-msgstr[2] "منذ سنتين"
-msgstr[3] "منذ %d سنوات"
-msgstr[4] "منذ %d سنة"
-msgstr[5] "منذ %d سنة"
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr "تعذر تحميل الاواجهة اللاسلكية؛ إعداد الشبكة اللاسلكية مفقود"
 
-#: ../src/connection-editor/nm-connection-list.c:486
+#: ../src/connection-editor/page-wifi-security.c:424
 #, fuzzy
-msgid "Connection add failed"
-msgstr "فشل اضافة اتصال "
+msgid "Wi-Fi Security"
+msgstr "أمن اللاسلكي"
 
-#: ../src/connection-editor/nm-connection-list.c:515
+#: ../src/connection-editor/page-wifi-security.c:426
 #, fuzzy
-msgid "Error saving connection"
-msgstr "خطأ بحفظ الاتصال "
+msgid "Could not load Wi-Fi security user interface."
+msgstr "تعذر تحميل الواجهة اللاسلكية الأمنية"
 
-#: ../src/connection-editor/nm-connection-list.c:516
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
+msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
-msgid "An unknown error occurred."
-msgstr "حدث عطل غير معروف."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "Error initializing editor"
-msgstr "خطأ في بدء المحرر"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:703
-#: ../src/connection-editor/nm-connection-list.c:870
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
-msgstr "تعذّر تشغيل واجهة محرر الاتصال بسبب خطأ مجهول."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "تعذّر إنشاء اتصال جديد"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "تعذّر تعديل الاتصال الجديد"
-
-#: ../src/connection-editor/nm-connection-list.c:717
-msgid "Could not edit connection"
-msgstr "تعذّر تعديل الاتصال "
-
-#: ../src/connection-editor/nm-connection-list.c:747
-msgid "Connection delete failed"
-msgstr "فشلت إزالة الاتصال"
-
-#: ../src/connection-editor/nm-connection-list.c:779
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "هل أنت متأكد من حذف هذا الاتصال %s؟"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:914
-#: ../src/connection-editor/vpn-helpers.c:227
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "لا يمكن استيراد اتصال ال VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:916
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"فشل ملحق اتصال VPN في استيراد اتصال VPN بشكل صحيح\n"
-"\n"
-"الخطأ:لم يحدد نوع خدمة VPN"
-
-#: ../src/connection-editor/nm-connection-list.c:929
-msgid "Could not edit imported connection"
-msgstr "تعذّر تعديل الاتصال الذي تم استيراده "
-
-#: ../src/connection-editor/nm-connection-list.c:1099
-msgid "Name"
-msgstr "الاسم"
-
-#: ../src/connection-editor/nm-connection-list.c:1111
-msgid "Last Used"
-msgstr "آخر استخدام"
-
-#: ../src/connection-editor/nm-connection-list.c:1227
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr "لا يوجد خدمة VPN متوفرة. يرجى تثبيت واحدة لتمكين هذا الخيار."
-
-#: ../src/connection-editor/nm-connection-list.c:1238
-msgid "_Edit"
-msgstr "_حرّر"
-
-#: ../src/connection-editor/nm-connection-list.c:1239
-msgid "Edit the selected connection"
-msgstr "حرّر الاتصال المحدد"
-
-#: ../src/connection-editor/nm-connection-list.c:1240
-msgid "_Edit..."
-msgstr "_حرّر..."
-
-#: ../src/connection-editor/nm-connection-list.c:1241
-msgid "Authenticate to edit the selected connection"
-msgstr "استوثق لتحرير الاتصال المحدد"
-
-#: ../src/connection-editor/nm-connection-list.c:1256
-msgid "_Delete"
-msgstr "اح_ذف"
-
-#: ../src/connection-editor/nm-connection-list.c:1257
-msgid "Delete the selected connection"
-msgstr "احذف الاتصال المحدد."
-
-#: ../src/connection-editor/nm-connection-list.c:1258
-msgid "_Delete..."
-msgstr "اح_ذف..."
-
-#: ../src/connection-editor/nm-connection-list.c:1259
-msgid "Authenticate to delete the selected connection"
-msgstr "استوثق لحذف الاتصال المحدد"
-
-#: ../src/connection-editor/nm-connection-list.c:1538
-#, fuzzy
-msgid "Error creating connection"
-msgstr "خطأ أثناء عرض معلومات الاتصال:"
-
-#: ../src/connection-editor/nm-connection-list.c:1539
-#, fuzzy, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "لا توجد اتصالات نشطة!"
-
-#: ../src/connection-editor/nm-connection-list.c:1594
-#: ../src/connection-editor/nm-connection-list.c:1606
-#, fuzzy
-msgid "Error editing connection"
-msgstr "خطأ أثناء عرض معلومات الاتصال:"
-
-#: ../src/connection-editor/nm-connection-list.c:1595
-#, fuzzy, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "لا يوجد اتصال شبكي"
-
-#: ../src/connection-editor/nm-connection-list.c:1607
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr ""
-
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2115,30 +3050,31 @@ msgid ""
 "Error: %s."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:262
-msgid "Select file to import"
-msgstr "اختر ملفا لاستيراده"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "مجهول"
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "يوجد ملف بالاسم \"%s\" مسبقاً"
 
-#: ../src/connection-editor/vpn-helpers.c:315
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "ا_ستبدل"
 
-#: ../src/connection-editor/vpn-helpers.c:317
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:353
+#: ../src/connection-editor/vpn-helpers.c:255
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "لا يمكن تصدير اتصال ال VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:355
+#: ../src/connection-editor/vpn-helpers.c:257
 #, fuzzy, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2146,114 +3082,60 @@ msgid ""
 "Error: %s."
 msgstr " اتصال VPN %s لا يمكن تصديره الى %s. الخطأ:%s."
 
-#: ../src/connection-editor/vpn-helpers.c:390
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "صدّر اتصال VPN..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr ""
-
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "هاتفك الان جاهز للاستخدام!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:249
-#, c-format
-msgid "%s Network"
-msgstr "شبكة %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:375
-#, c-format
-msgid "Error: %s"
-msgstr "خطأ: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:488
-#, fuzzy, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "لا توجد اتصالات نشطة!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:511
-msgid "Mobile wizard was canceled"
-msgstr "تم الغاء معالج الهاتف المحمول"
-
-#: ../src/gnome-bluetooth/bt-widget.c:520
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "نوع هاتف غير معروف النوع (ليس شبكة الجيل الثاني او CDMA)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
-msgid "failed to connect to the phone."
-msgstr "تعذّر الاتصال بالهاتف."
-
-#: ../src/gnome-bluetooth/bt-widget.c:753
-msgid "unexpectedly disconnected from the phone."
-msgstr "انقطاع غير متوقع للاتصال بالهاتف."
-
-#: ../src/gnome-bluetooth/bt-widget.c:762
-msgid "timed out detecting phone details."
-msgstr "انتهى وقت تحديد نوع الهاتف المحمول"
-
-#: ../src/gnome-bluetooth/bt-widget.c:774
-msgid "Detecting phone configuration..."
-msgstr "تحديد اعدادات الهاتف المحمول..."
-
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "لم يتم العثور على جهاز بلوتوث "
-
-#: ../src/gnome-bluetooth/bt-widget.c:975
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr "محول البلوتوث الافتراضي يجب تمكينة قبل تفعيل اتصال الطلب الهاتفي ."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1007
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "اعدادات البلوتوث غير ممكنة (فشل الاتصال ب D-Bus: %s)"
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"لم يستطع بريمج مدير الشبكة إيجاد بعض المصادر المطلوبة (the .ui file was not "
+"found)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1017
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "اعدادات البلوتوث غير ممكنة (فشل إنشاء وسيط D-Bus)"
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "ا_فتح"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1026
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "اعدادات البلوتوث غير ممكنة (خطأ في ايجاد مدير الشبكة:%s)."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1093
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "استخدم هاتفك المحمول كبطاقة شبكة (PAN/NAP)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "معلومات الاتصال"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1102
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "اتصل باﻹنترنت باستخدام هاتفك المحمول (DUN)"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "الاتصالات الشبكية النشطة"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
+#: ../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/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "جهازك:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "مزود الخدمة:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "نظام الدفع:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
+#: ../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 "
@@ -2265,23 +3147,28 @@ msgstr ""
 "أو لم تستطع الوصول إلى الإنترنت، فراجع الإعدادات. لتغيير الإعدادات اختر "
 "\"الاتصالات الشبكية\" من قائمة \"نظام ← تفضيلات\"."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:264
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "أكد إعدادات الاتصال عبر شبكة المحمول"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "ليس في القائمة"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "ا_ختر نظام الدفع:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../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/libnm-gtk/nm-mobile-wizard.c:528
+#: ../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"
@@ -2294,351 +3181,580 @@ msgstr ""
 "إذا لم تكن متأكدا من نظام الدفع فراجع مقدم الخدمة للحصول على اسم نقطة "
 "الاتصال (APN)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "اختر نظام الدفع"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "ليس في القائمة..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "اختر مقدم الخدمة من ال_قائمة:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "مقدم الخدمة"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../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/libnm-gtk/nm-mobile-wizard.c:789
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "مقدم الخدمة:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../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/libnm-gtk/nm-mobile-wizard.c:819
+#: ../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/libnm-gtk/nm-mobile-wizard.c:830
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "اختر مقدم الخدمة"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "قائمة البلدان والمناطق:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1092
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "البلد أو المنطقة"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1099
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "بلدي ليست في القائمة"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1145
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1199
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "جهاز GSM مثبّت"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1202
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "جهاز CDMA مثبّت"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1374
+#: ../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 "يساعدك هذا المعالج على إعداد اتصال بشبكة هاتف محمول."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1379
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "ستحتاج المعلومات التالية:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1394
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "اسم مقدم الخدمة"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1400
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "نظام الدفع"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1406
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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 "أنشئ ا_تصالا لجهاز شبكة الهاتف المحمول:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "أي جهاز"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "اضبط اتصال شبكة هاتف محمول"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1625
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "اتصال شبكة هاتف محمول جديد..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+#, 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
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "ا_طلب كلمة السر هذه في كل مرة"
+
+#: ../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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_كلمة السر:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_كلمة السر:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "أظهر _كلمات السر"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "جديد..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1077
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "بدون"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "أن_شئ"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1161
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "كلمات السر أو مفاتيح التعمية مطلوبة للاتصال بالشبكة اللاسلكية '%s'."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1163
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "الاستيثاق من مطلوب للاتصال بالشبكة اللاسلكية"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1165
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "الاستيثاق من مطلوب للاتصال بالشبكة اللاسلكية"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1170
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "أنشئ شبكة لاسلكيّة جديدة"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "شبكة لاسلكيّة جديدة"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1173
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "أدخل اسم الشبكة اللاسلكية التي تريد إنشائها."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1175
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "اتصل بشبكة لاسلكية مخفية"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "شبكة لاسلكيّة مخفية"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "أدخل اسم والإعدادات الأمنية للشبكة اللاسلكية المخفية التي تريد الاتصال بها."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "أمن ال_لاسلكي:"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "الات_صال:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
 msgstr "المحول ال_لاسلكي:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _security:"
-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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
 
-#: ../src/main.c:73
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "الاستخدام:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"هذا البرنامج احد مكونات مدير الشبكة (https://wiki.gnome.org/"
-"Projects/NetworkManager/)."
+"هذا البرنامج احد مكونات مدير الشبكة (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../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:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr ""
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr ""
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr ""
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
+#: ../src/mb-menu-item.c:68
+msgid "HSPA+"
 msgstr ""
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "غير مُفعّل"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "غير مُسجّل"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "شبكة منزلية (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "شبكة منزلية"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "يبحث"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "منع التسجيل"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../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:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "‏%s (تجوال)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "شبكة تجوال (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "شبكة تجوال"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "المبدئي"
-
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
 msgstr ""
-"لم يستطع بريمج مدير الشبكة إيجاد بعض المصادر المطلوبة (the .ui file was not "
-"found)."
 
-#: ../src/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
-msgstr "لم تُختر أي شهادة \"سلطة شهادات\""
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "رمز PIN مطلوب"
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "رمز PIN مطلوب لجهاز شبكة الهاتف المحمول"
 
-#: ../src/wireless-security/eap-method.c:280
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "اتصال شبكة الهاتف المحمول '%s' يعمل: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "تجوال"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "إ_تّصالات VPN"
+
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"عدم استخدام شهادة أمنيّة من جهة معتمدة قد يتسبّب باتصالات لا سلكية غير آمنة "
-"واحتيالية. هل تريد اختيار شهادة أمنية من جهة معتمدة؟"
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
-msgstr "ملف شهادة سُلْطة استيثاق"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:648
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:651
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:372
-msgid "MD5"
-msgstr "MD5"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
-msgid "Choose a Certificate Authority certificate..."
-msgstr "اختر شهادة \"سلطة شهادات\"..."
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "_هوية مجهولة:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "الاستيثاق"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
 msgstr "_هوية مجهولة:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "C_A certificate:"
-msgstr "ملف شهادة _سُلْطة استيثاق:"
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file:"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
-msgid "I_nner authentication:"
+#: ../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
+#, fuzzy
+msgid "_Inner authentication:"
 msgstr "الاستيثاق ال_داخلي:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+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 "اختر شهادة \"سلطة شهادات\"..."
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
 msgstr "إصدارة 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:4
 msgid "Version 1"
 msgstr "إصدارة 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "_PEAP version:"
+#: ../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 "ملف شهادة _سُلْطة استيثاق:"
+
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "ملف شهادة _سُلْطة استيثاق:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#, fuzzy
+msgid "PEAP _version:"
 msgstr "إصدارة _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-msgid "As_k for this password every time"
-msgstr "ا_طلب كلمة السر هذه في كل مرة"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "ملف شهادة _سُلْطة استيثاق:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "المفاتيح السرية غير معمّاة ليست آمنة"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../src/wireless-security/eap-method-tls.c:299
 #, fuzzy
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
@@ -2648,63 +3764,111 @@ msgid ""
 "(You can password-protect your private key with openssl)"
 msgstr "المفتاح الخاص لا يظهر بأنة محمي بكلمة سرّ"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "اختر شهادتك الشخصية..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "اختر مفتاحك السري..."
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "ا_لهوية:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "شهادة المست_خدم:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "المفتاح ال_سري:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "كل_مة سر المفتاح السري:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_User certificate:"
-msgstr "شهادة المست_خدم:"
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:384
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:408
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "‏TLS عبر نفق"
 
-#: ../src/wireless-security/wireless-security.c:419
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "‏EAP ‏(PEAP) محمي"
 
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:2
 #: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
-msgid "_Authentication:"
+#, fuzzy
+msgid "Au_thentication:"
 msgstr "الا_ستيثاق:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (المبدئي)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
 msgid "Open System"
@@ -2715,25 +3879,241 @@ msgid "Shared Key"
 msgstr "المفتاح المشروك"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "الم_فتاح:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
 msgid "Sho_w key"
 msgstr "أظهر ال_مفتاح"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "_فهرس WEP:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
-msgid "_Key:"
-msgstr "الم_فتاح:"
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+msgstr ""
 
-#~ msgid "United Kingdom"
-#~ msgstr "المملكة المتّحدة"
+#: ../src/wireless-security/ws-wpa-psk.c:77
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "ال_نوع:"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "اتصال شبكة هاتف محمول (CDMA) جديد..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "أنت متصل الآن بشبكة CDMA."
+
+#, fuzzy
+#~ msgid "CDMA network."
+#~ msgstr "شبكة CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "اتصال شبكة هاتف محمول (GSM) جديد..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "أنت متصل الآن بشبكة الهاتف المحمول GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "شبكة GSM."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "الشبكات اللاسلكية (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "شبكة لاسلكية (%s)"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "الشبكة اللاسلكية معطلة"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "الشبكة اللاسلكية مغلقة بمفتاح في العتاد"
+
+#~ msgid "Click on this icon to connect to a wireless network"
+#~ msgstr "انقر على هذه الأيقونة للاتصال بشبكة لاسلكية"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "يجهز اتصال الشبكة اللاسلكية '%s'..."
 
-#~ msgid "Network Manager"
-#~ msgstr "مدير الشبكة"
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "يعِدّ اتصال الشبكة اللاسلكية '%s'..."
 
-#~ msgid "C_onnect"
-#~ msgstr "ا_تّصل"
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "يطلب عنوان شبكي لاسلكي ل‍ '%s'..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "الاتصال الشبكي اللاسلكي '%s' يعمل"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "شبكة هاتف محمول WiMAX ‏(%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "شبكة هاتف محمول WiMAX"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "أنت متصل الآن بشبكة WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d ديسيبل"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "مجهول"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "‏DNS الثّانوي:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "‏DNS الثالثي:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "فعّل شبكة الهاتف المحمول WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "م_ساعدة"
+
+#~ msgid "Any"
+#~ msgstr "الكل"
+
+#~ msgid "PI_N:"
+#~ msgstr "PI_N:"
+
+#~ msgid "MT_U:"
+#~ msgstr "MT_U:"
+
+#, fuzzy
+#~ msgid "_Device MAC address:"
+#~ msgstr "عنوان _MAC:"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "تلقائي (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "عناوين (PPP) تلقائية فقط"
+
+#, fuzzy
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "لم اتمكن من تحميل واجهةالاتصال السلكي الامنية"
+
+#~ msgid "Wireless"
+#~ msgstr "لاسلكي"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "الاتصال اللاسلكي %d"
+
+#~ msgid "_Save..."
+#~ msgstr "ا_حفظ..."
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "متاح لكل المستخدمين"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "اتصل _تلقائيا"
+
+#~ msgid "_Import"
+#~ msgstr "ا_ستورد"
+
+#, fuzzy
+#~ msgid "Error saving connection"
+#~ msgstr "خطأ بحفظ الاتصال "
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "حدث عطل غير معروف."
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "تعذّر تعديل الاتصال الذي تم استيراده "
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr "لا يوجد خدمة VPN متوفرة. يرجى تثبيت واحدة لتمكين هذا الخيار."
+
+#~ msgid "_Edit..."
+#~ msgstr "_حرّر..."
+
+#~ msgid "_Delete..."
+#~ msgstr "اح_ذف..."
+
+#, fuzzy
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "لا يوجد اتصال شبكي"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "هاتفك الان جاهز للاستخدام!"
+
+#~ msgid "%s Network"
+#~ msgstr "شبكة %s"
+
+#~ msgid "Error: %s"
+#~ msgstr "خطأ: %s"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "تم الغاء معالج الهاتف المحمول"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "نوع هاتف غير معروف النوع (ليس شبكة الجيل الثاني او CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "تعذّر الاتصال بالهاتف."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "انقطاع غير متوقع للاتصال بالهاتف."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "انتهى وقت تحديد نوع الهاتف المحمول"
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "تحديد اعدادات الهاتف المحمول..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr "محول البلوتوث الافتراضي يجب تمكينة قبل تفعيل اتصال الطلب الهاتفي ."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr "اعدادات البلوتوث غير ممكنة (فشل الاتصال ب D-Bus: %s)"
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "اعدادات البلوتوث غير ممكنة (فشل إنشاء وسيط D-Bus)"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr "اعدادات البلوتوث غير ممكنة (خطأ في ايجاد مدير الشبكة:%s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "استخدم هاتفك المحمول كبطاقة شبكة (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "اتصل باﻹنترنت باستخدام هاتفك المحمول (DUN)"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "لم تُختر أي شهادة \"سلطة شهادات\""
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "عدم استخدام شهادة أمنيّة من جهة معتمدة قد يتسبّب باتصالات لا سلكية غير آمنة "
+#~ "واحتيالية. هل تريد اختيار شهادة أمنية من جهة معتمدة؟"
+
+#~ msgid "United Kingdom"
+#~ msgstr "المملكة المتّحدة"
 
 #~ msgid "Other Wireless Network..."
 #~ msgstr "شبكات لاسلكيّة أخرى..."
@@ -2872,9 +4252,6 @@ msgstr "الم_فتاح:"
 #~ msgid "Unknown"
 #~ msgstr "مجهول"
 
-#~ msgid "Save this connection for all users of this machine."
-#~ msgstr "احفظ هذا الاتصال لكل المستخدمين على هذا الجهاز."
-
 #~ msgid "_Band:"
 #~ msgstr "_Band:"
 
@@ -2902,10 +4279,6 @@ msgstr "الم_فتاح:"
 #~ msgstr "لم يعدّ اتصال VPN %s بطريقة سليمة."
 
 #, fuzzy
-#~ msgid "Could not move connection"
-#~ msgstr "لا يوجد اتصال شبكي"
-
-#, fuzzy
 #~ msgid "Could not add connection"
 #~ msgstr "لا يوجد اتصال شبكي"
 
@@ -2965,10 +4338,6 @@ msgstr "الم_فتاح:"
 #~ msgid "GSM Connections"
 #~ msgstr "إ_تّصالات VPN"
 
-#, fuzzy
-#~ msgid "GSM connection"
-#~ msgstr "إ_تّصالات VPN"
-
 #~ msgid "Preparing device %s for the wired network..."
 #~ msgstr "تحضير الجهاز %s للشبكة السلكية..."
 
@@ -3023,10 +4392,6 @@ msgstr "الم_فتاح:"
 #~ msgid "Passphrase for wireless network %s"
 #~ msgstr "عبارة السر للشبكة اللاسلكية %s"
 
-#, fuzzy
-#~ msgid "Private key password for wireless network %s"
-#~ msgstr "عبارة السر للشبكة اللاسلكية %s"
-
 #~ msgid "AES-CCMP"
 #~ msgstr "AES-CCMP"
 
@@ -3225,8 +4590,8 @@ msgstr "الم_فتاح:"
 #~ "عبارة السر أو مفتاح تشفير ضروري للنفاذ إلى الشبكة اللاسلكية '%s'."
 
 #~ msgid ""
-#~ "By default, the wireless network's name is set to your computer's name, %"
-#~ "s, with no encryption enabled"
+#~ "By default, the wireless network's name is set to your computer's name, "
+#~ "%s, with no encryption enabled"
 #~ msgstr "افتراضيا، اسم الشبكة السلكية هو اسم حاسوبك، %s، دون أي تشفير."
 
 #~ msgid "Error connecting to wireless network"
@@ -3257,6 +4622,3 @@ msgstr "الم_فتاح:"
 
 #~ msgid "_Always Trust this Wireless Network"
 #~ msgstr "ثق بهذه الشبكة اللاسلكية _دائما"
-
-#~ msgid "_Login to Network"
-#~ msgstr "ال_ولوج إلى الشبكة"
diff --git a/po/as.po b/po/as.po
index c158afbf..0203bb4b 100644
--- a/po/as.po
+++ b/po/as.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-08-19 22:04+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -21,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "নেটৱৰ্ক"
 
@@ -45,8 +44,7 @@ msgstr "সংযুক্ত অধিসূচনাসমূহ অসাম�
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
-"এটা নেটৱৰ্কলে সংযোগ কৰোতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে সংহতি "
-"কৰক।"
+"এটা নেটৱৰ্কলে সংযোগ কৰোতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে সংহতি কৰক।"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
@@ -56,8 +54,7 @@ msgstr "বিচ্ছিন্ন হোৱাৰ অধিসূচনা অ
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
-"এটা নেটৱৰ্কৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে "
-"সংহতি "
+"এটা নেটৱৰ্কৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে সংহতি "
 "কৰক।"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
@@ -69,8 +66,7 @@ msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
 msgstr ""
-"এটা VPN লে সংযোগ কৰোতে অথবা তাৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান "
-"কৰিবলে "
+"এটা VPN লে সংযোগ কৰোতে অথবা তাৰ পৰা বিচ্ছিন্ন হওতে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে "
 "ইয়াক সত্যলে সংহতি কৰক।"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:7
@@ -81,8 +77,7 @@ msgstr "উপলব্ধ নেটৱৰ্কৰ অধিসূচনা প
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
-"যেতিয়া Wi-Fi নেটৱৰ্কসমূহ উপলব্ধ থাকে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক "
-"সত্যলে "
+"যেতিয়া Wi-Fi নেটৱৰ্কসমূহ উপলব্ধ থাকে অধিসূচনাসমূহ অসামৰ্থবান কৰিবলে ইয়াক সত্যলে "
 "সংহতি কৰক।"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
@@ -92,8 +87,7 @@ msgstr "স্টেম্প"
 #: ../org.gnome.nm-applet.gschema.xml.in.h:10
 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 WiFi Create"
@@ -103,8 +97,7 @@ msgstr "WiFi সৃষ্টি অসামৰ্থবান কৰক"
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
-"এপ্লেট ব্যৱহাৰ কৰি থাকোতে adhoc নেটৱৰ্কসমূহৰ সৃষ্টি অসামৰ্থবান কৰিবলে সত্যলে "
-"সংহতি "
+"এপ্লেট ব্যৱহাৰ কৰি থাকোতে adhoc নেটৱৰ্কসমূহৰ সৃষ্টি অসামৰ্থবান কৰিবলে সত্যলে সংহতি "
 "কৰক।"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
@@ -124,8 +117,7 @@ msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
-"EAP প্ৰমাণীকৰণত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তা অসামৰ্থবান কৰিবলে ইয়াক "
-"সত্যলে "
+"EAP প্ৰমাণীকৰণত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তা অসামৰ্থবান কৰিবলে ইয়াক সত্যলে "
 "সংহতি কৰক।"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:17
@@ -133,50 +125,93 @@ msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
-"EAP প্ৰমাণীকৰণৰ স্তৰ ২ ত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তাসমূহ অসামৰ্থবান "
-"কৰিবলে "
+"EAP প্ৰমাণীকৰণৰ স্তৰ ২ ত CA প্ৰমাণপত্ৰসমূহৰ বিষয়ে সতৰ্কবাৰ্তাসমূহ অসামৰ্থবান কৰিবলে "
 "ইয়াক সত্যলে সংহতি কৰক।"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "নেটৱৰ্ক পৰিড্ৰাইভাৰ"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "নেটৱৰ্ক পৰিড্ৰাইভাৰ"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X প্ৰমাণীকৰণ"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "সংযোগ কৰা (_o)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "নেটৱৰ্কৰ নাম (_N):"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "সংযোগ যোগ/সক্ৰিয় কৰিবলে ব্যৰ্থ"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "অজ্ঞাত ত্ৰুটি"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "সংযোগ ব্যৰ্থতা"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "ডিভাইচ বিচ্ছিন্ন কৰা ব্যৰ্থ হল"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "বিচ্ছিন্ন কৰা ব্যৰ্থ হল"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "সংযোগ সক্ৰিয়কৰণ ব্যৰ্থ হল"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "এই বাৰ্তা আকৌ নেদেখুৱাব"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -186,7 +221,7 @@ msgstr ""
 "\n"
 "নেটৱৰ্ক সংযোগ বিঘ্নিত হোৱাৰ ফলত VPN সংযোগ '%s' বিফল হৈছে।"
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -195,7 +230,7 @@ msgstr ""
 "\n"
 "VPN সেৱা অপ্ৰত্যাশিতভাবে বন্ধ হোৱাৰ ফলত VPN সংযোগ '%s' বিফল হৈছে।"
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -205,7 +240,7 @@ msgstr ""
 "\n"
 "VPN সংযোগ '%s' ব্যৰ্থ হল কাৰণ VPN সেৱায় অবৈধ সংৰূপ ঘুৰাই দিছিল।"
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -214,7 +249,7 @@ msgstr ""
 "\n"
 "সংযোগ চেষ্টা সময় অন্ত হোৱা বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -223,7 +258,7 @@ msgstr ""
 "\n"
 "VPN সংযোগ সময়মতে আৰম্ভ নহোৱা বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -232,7 +267,7 @@ msgstr ""
 "\n"
 "VPN সেৱা আৰম্ভ হবলে ব্যৰ্থ হোৱা বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -241,7 +276,7 @@ msgstr ""
 "\n"
 "কোনো বৈধ VPN গোপন তথ্য নথকা বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -250,7 +285,7 @@ msgstr ""
 "\n"
 "অবৈধ VPN গোপন তথ্যৰ বাবে VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -259,7 +294,7 @@ msgstr ""
 "\n"
 "VPN সংযোগ '%s' ব্যৰ্থ হল।"
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -269,7 +304,7 @@ msgstr ""
 "\n"
 "নেটৱৰ্ক সংযোগ বাধাগ্ৰস্থ হোৱা বাবে VPN সংযোগ '%s' বিচ্ছিন্ন হল।"
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -278,7 +313,7 @@ msgstr ""
 "\n"
 "VPN সেৱা বন্ধ হোৱা বাবে VPN সংযোগ '%s' বিচ্ছিন্ন হল।"
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -287,7 +322,7 @@ msgstr ""
 "\n"
 "VPN সংযোগ '%s' বিচ্ছিন্ন হল।"
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -298,19 +333,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN সংযোগ সফলভাৱে স্থাপন কৰা হৈছে।\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN লগিন বাৰ্তা"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN সংযোগ ব্যৰ্থ হল"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -323,7 +358,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -336,835 +371,545 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "ডিভাইচ প্ৰস্তুত নহয় (ফাৰ্মৱেৰ সন্ধানহীন)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "ডিভাইচ প্ৰস্তুত নহয়"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "বিচ্ছিন্নিত"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "বিচ্ছিন্ন কৰক"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "ডিভাইচ ব্যৱস্থাপিত নহয়"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "কোনো নেটৱৰ্ক ডিভাইচ উপলব্ধ নাই"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "VPN সংযোগসমূহ (_V)"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "VPN সংৰূপণ কৰক (_C)..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "VPN ৰ সৈতে সংযোগ বিচ্ছিন্ন কৰক (_D)..."
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager চলি থকা নাই..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "নেটৱাৰ্কিং অসামৰ্থবান"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "নেটৱাৰ্কিং সামৰ্থবান কৰক (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi সামৰ্থবান কৰক (_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "ম'বাইল ব্ৰডবেণ্ড সক্ৰিয় কৰক (_M)"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMAX ম'বাইল ব্ৰডবেণ্ড সামৰ্থবান কৰক (_X)"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "অধিসূচনাসমূহ সামৰ্থবান কৰক (_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "সংযোগ তথ্য (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "সংযোগসমূহ সম্পাদন কৰক..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "সহায় (_H)"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "বিষয়ে (_A)"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "আপুনি এতিয়া '%s' লৈ সংযুক্ত।"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "বিচ্ছিন্নিত"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "নেটৱৰ্ক সংযোগ বিচ্ছিন্ন কৰা হৈছে।"
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "নেটৱৰ্ক সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "নেটৱৰ্ক সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' ৰ কাৰণে নেটৱৰ্ক ঠিকনা অনুৰোধ কৰা হৈছে..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "নেটৱৰ্ক সংযোগ '%s' সক্ৰিয়"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN সংযোগ '%s' আৰম্ভ কৰা হৈছে..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s' ৰ বাবে এটা VPN ঠিকনা অনুৰোধ কৰা হৈছে..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN সংযোগ '%s' সক্ৰিয়"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "কোনো নেটৱৰ্ক সংযোগ নাই"
 
-#: ../src/applet.c:3628
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager এপ্লেট"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "উপলব্ধ"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "সংযোগ স্থাপিত"
-
-#: ../src/applet-device-bond.c:90
-#| msgid "You are now connected to the GSM network."
-msgid "You are now connected to the bonded network."
-msgstr "আপুনি এতিয়া বান্ধীত নেটৱৰ্কৰ সৈতে সংযুক্ত।"
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing bond connection '%s'..."
-msgstr "বান্ধনী সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-#| msgid "Configuring mobile broadband connection '%s'..."
-msgid "Configuring bond connection '%s'..."
-msgstr "বান্ধনী সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for bond connection '%s'..."
-msgstr "বান্ধনী সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-#| msgid "Requesting a VPN address for '%s'..."
-msgid "Requesting address for '%s'..."
-msgstr "'%s' ৰ বাবে ঠিকনা অনুৰোধ কৰা হৈছে..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Bond connection '%s' active"
-msgstr "বান্ধনী সংযোগ '%s' সক্ৰিয়"
-
-#: ../src/applet-device-bridge.c:90
-#| msgid "You are now connected to the WiMAX network."
-msgid "You are now connected to the bridged network."
-msgstr "আপুনি এতিয়া ব্ৰিজ্ড নেটৱৰ্কলৈ সংযুক্ত।"
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing bridge connection '%s'..."
-msgstr "ব্ৰিজ সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-#| msgid "Configuring Wi-Fi network connection '%s'..."
-msgid "Configuring bridge connection '%s'..."
-msgstr "ব্ৰিজ সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "ব্ৰিজ সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Bridge connection '%s' active"
-msgstr "ব্ৰিজ সংযোগ '%s' সক্ৰিয়"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "ভুল PUK ক'ড; অনুগ্ৰহ কৰি সেৱা উপলব্ধকৰ্তাৰ সৈতে যোগাযোগ কৰক।"
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "আনলক কৰাৰ ক'ড পঠিওৱা হৈছে..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "উপলব্ধ"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
-#| msgid "New Mobile Broadband Connection"
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "নতুন ম'বাইল ব্ৰডবেণ্ড সংযোগ..."
 
-#: ../src/applet-device-broadband.c:798
-#| msgid "You are now connected to the mobile broadband network."
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "সংযোগ স্থাপিত"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "আপুনি এতিয়া ম'বাইল ব্ৰডবেণ্ড নেটৱৰ্কৰ সৈতে সংযুক্ত।"
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
-#| msgid "Mobile broadband network password"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড নেটৱৰ্ক।"
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "আপুনি এতিয়া ঘৰ নেটৱৰ্কত ৰেজিস্টাৰ্ড।"
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "আপুনি এতিয়া এটা ৰ'মিং নেটৱৰ্কত ৰেজিস্টাৰ্ড।"
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "আপুনি এতিয়া ম'বাইল ব্ৰডবেণ্ড নেটৱৰ্কৰ সৈতে সংযুক্ত।"
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' সৃষ্টি কৰা হৈছে..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr ""
-"ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰীৰ প্ৰমাণীকৰণৰ প্ৰয়োজন..."
+msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰীৰ প্ৰমাণীকৰণৰ প্ৰয়োজন..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড সংযোগ '%s' সক্ৰিয়"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "নতুন ম'বাইল ব্ৰ'ডবেণ্ড (CDMA) সংযোগ..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "আপুনি এতিয়া CDMA নেটৱৰ্কলৈ সংযুক্ত।"
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "CDMA নেটৱৰ্ক।"
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "স্বচালিত ইথাৰনেট"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "ইথাৰনেট নেটৱৰ্কসমূহ (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "ইথাৰনেট নেটৱৰ্ক (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "ইথাৰনেট নেটৱৰ্কসমূহ"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "ইথাৰনেট নেটৱৰ্ক"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "আপুনি এতিয়া ইথাৰনেট নেটৱৰ্কলৈ সংযুক্ত।"
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "ইথাৰনেট নেটৱৰ্ক সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "ইথাৰনেট নেটৱৰ্ক সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
-msgstr ""
-"ইথাৰনেট নেটৱৰ্ক সংযোগ '%s' ৰ কাৰণে ব্যৱহাৰকাৰীৰ প্ৰমাণীকৰণৰ প্ৰয়োজন..."
+msgstr "ইথাৰনেট নেটৱৰ্ক সংযোগ '%s' ৰ কাৰণে ব্যৱহাৰকাৰীৰ প্ৰমাণীকৰণৰ প্ৰয়োজন..."
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' ৰ বাবে এটা ইথাৰনেট নেটৱৰ্ক ঠিকনা অনুৰোধ কৰা হৈছে..."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "ইথাৰনেট নেটৱৰ্ক সংযোগ '%s' সক্ৰিয়"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL প্ৰমাণীকৰণ"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "নতুন ম'বাইল ব্ৰ'ডবেণ্ড (GSM) সংযোগ..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "আপুনি এতিয়া GSM নেটৱৰ্কলৈ সংযুক্ত।"
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "GSM নেটৱৰ্ক।"
-
-#: ../src/applet-device-infiniband.c:40
-#| msgid "InfiniBand"
-msgid "Auto InfiniBand"
-msgstr "স্ব InfiniBand"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-#| msgid "Wi-Fi Networks (%s)"
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand নেটৱৰ্কসমূহ (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-#| msgid "Wi-Fi Network (%s)"
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand নেটৱৰ্ক (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-#| msgid "InfiniBand"
-msgid "InfiniBand Networks"
-msgstr "InfiniBand নেটৱৰ্কসমূহ"
-
-#: ../src/applet-device-infiniband.c:99
-#| msgid "InfiniBand"
-msgid "InfiniBand Network"
-msgstr "InfiniBand নেটৱৰ্ক"
-
-#: ../src/applet-device-infiniband.c:143
-#| msgid "You are now connected to the WiMAX network."
-msgid "You are now connected to the InfiniBand network."
-msgstr "আপুনি এতিয়া InfiniBand নেটৱৰ্কলে সংযুক্ত।"
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "InfiniBand সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-#| msgid "Configuring Wi-Fi network connection '%s'..."
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "InfiniBand সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "InfiniBand সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-#| msgid "InfiniBand connection %d"
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand সংযোগ '%s' সক্ৰিয়"
-
-#: ../src/applet-device-team.c:86
-#| msgid "You are now connected to the ethernet network."
-msgid "You are now connected to the teamed network."
-msgstr "আপুনি এতিয়া দলবদ্ধ নেটৱৰ্কলৈ সংযুক্ত।"
-
-#: ../src/applet-device-team.c:110
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing team connection '%s'..."
-msgstr "দল সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-#| msgid "Configuring Wi-Fi network connection '%s'..."
-msgid "Configuring team connection '%s'..."
-msgstr "দল সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for team connection '%s'..."
-msgstr "দল সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Team connection '%s' active"
-msgstr "দল সংযোগ '%s' সক্ৰিয়"
-
-#: ../src/applet-device-vlan.c:204
-#| msgid "You are now connected to the CDMA network."
-msgid "You are now connected to the VLAN."
-msgstr "আপুনি এতিয়া VLANলৈ সংযুক্ত।"
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-#| msgid "Starting VPN connection '%s'..."
-msgid "Preparing VLAN connection '%s'..."
-msgstr "VLAN সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-#| msgid "Starting VPN connection '%s'..."
-msgid "Configuring VLAN connection '%s'..."
-msgstr "VLAN সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "VLAN সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "VLAN connection '%s' active"
-msgstr "VLAN সংযোগ '%s' সক্ৰিয়"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "লুকুৱা Wi-Fi নেটৱৰ্কলৈ সংযোগ কৰক (_C)..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "নতুন Wi-Fi নেটৱৰ্ক সৃষ্টি কৰক (_N)..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(শূণ্য)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi নেটৱৰ্কসমূহ (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi নেটৱৰ্ক (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi নেটৱৰ্ক"
 msgstr[1] "Wi-Fi নেটৱৰ্কসমূহ"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi অসামৰ্থবান আছে"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi হাৰ্ডৱেৰ চুইচ দ্বাৰা অসামৰ্থবান কৰা আছে"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "অতিৰিক্ত নেটৱৰ্ক"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi নেটৱৰ্ক উপলব্ধ"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "এটা Wi-Fi নেটৱৰ্কলে সংযোগ কৰিবলে নেটৱৰ্ক মেনু ব্যৱহাৰ কৰক"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "আপুনি এতিয়া Wi-Fi নেটৱৰ্ক '%s' ৰ সৈতে সংযুক্ত।"
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Wi-Fi নেটৱৰ্ক সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Wi-Fi নেটৱৰ্ক সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Wi-Fi নেটৱৰ্ক সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰীৰ প্ৰমাণীকৰণৰ প্ৰয়োজন..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "'%s' ৰ কাৰণে এটা Wi-Fi নেটৱৰ্ক ঠিকনা অনুৰোধ কৰা হৈছে..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wi-Fi নেটৱৰ্ক সংযোগ '%s' সক্ৰিয়: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi নেটৱৰ্ক সংযোগ '%s' সক্ৰিয়"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "সংযোগ সক্ৰিয় কৰিবলে ব্যৰ্থ"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "নতুন সংযোগ যোগ কৰিবলে ব্যৰ্থ"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX ম'বাইল ব্ৰডবেণ্ড (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX ম'বাইল ব্ৰডবেণ্ড"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX অসামৰ্থবান আছে"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX হাৰ্ডৱেৰ চুইচ দ্বাৰা অসামৰ্থবান"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "আপুনি এতিয়া WiMAX নেটৱৰ্কলে সংযুক্ত।"
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "'%s' ম'বাইল ব্ৰডবেণ্ড সংযোগ বৰ্তমানে সক্ৰিয়: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "ৰ'মিং"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "সঠিক তথ্য দেখুৱাওঁতে ত্ৰুটি:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "ডাইনামিক WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "ঠিকনাসমূহ"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "কোনো নহয়"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (অবিকল্পিত)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "অজ্ঞাত"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "অজ্ঞাত"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP ঠিকনা:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP ঠিকনা:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "প্ৰচাৰ ঠিকনা:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "চাবনেট মাস্ক:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "অবিকল্পিত পথ:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "চাবনেট মাস্ক:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ইথাৰনেট (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "সাধাৰণ"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "আন্তঃপৃষ্ঠ:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "হাৰ্ডৱেৰ ঠিকনা:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ড্ৰাইভাৰ:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "গতি:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "সুৰক্ষা:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "অবিকল্পিত পথ:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "উপেক্ষা কৰা হৈছে"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN ধৰণ:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN গেইটৱে:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN ব্যৱহাৰকাৰীনাম:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN বেনাৰ:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "ভিত্তি সংযোগ:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "কোনো বৈধ সক্ৰিয় সংযোগ চিনাক্ত কৰা নাযায়!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1172,101 +917,105 @@ msgstr ""
 "স্বত্বাধিকাৰ © ২০০৫-২০০৮ Novell, Inc.\n"
 "আৰু অন্য বহুতো সম্প্ৰদায়ৰ অৱদানকাৰী আৰু অনুবাদকসকল"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr ""
-"আপোনাৰ নেটৱৰ্ক ডিভাইচ আৰু সংযোগসমূহ ব্যৱস্থাপনাৰ বাবে অধিসূচনা স্থানৰ এপ্লেট।"
+msgstr "আপোনাৰ নেটৱৰ্ক ডিভাইচ আৰু সংযোগসমূহ ব্যৱস্থাপনাৰ বাবে অধিসূচনা স্থানৰ এপ্লেট।"
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager ৱেবছাইট"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "অনুপস্থিত সম্পদ"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড নেটৱৰ্কৰ পাছৱৰ্ড"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' লৈ সংযোগ কৰিবলৈ এটা পাছৱৰ্ডৰ প্ৰয়োজন।"
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "পাছৱৰ্ড:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN আনলক কৰা প্ৰয়োজন"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN আনলক কৰা প্ৰয়োজন"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
 "used."
 msgstr ""
-"'%s' ম'বাইল ব্ৰডবেণ্ড ডিভাইচ ব্যৱহাৰ কৰাৰ আগতে এটা SIM PIN ক'ড উপলব্ধ থকা "
-"আৱশ্যক।"
+"'%s' ম'বাইল ব্ৰডবেণ্ড ডিভাইচ ব্যৱহাৰ কৰাৰ আগতে এটা SIM PIN ক'ড উপলব্ধ থকা আৱশ্যক।"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN ক'ড:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "PIN ক'ড দেখুৱাওক"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK আনলক কৰা প্ৰয়োজন"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK আনলক কৰা প্ৰয়োজন"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
 "used."
 msgstr ""
-"'%s' ম'বাইল ব্ৰডবেণ্ড ডিভাইচ ব্যৱহাৰ কৰাৰ আগতে এটা SIM PUK ক'ড উপলব্ধ থকা "
-"আৱশ্যক।"
+"'%s' ম'বাইল ব্ৰডবেণ্ড ডিভাইচ ব্যৱহাৰ কৰাৰ আগতে এটা SIM PUK ক'ড উপলব্ধ থকা আৱশ্যক।"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK ক'ড:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "নতুন PIN ক'ড:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "নতুন PIN ক'ড পুনঃ লিখক:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK ক'ডসমূহ দেখুৱাওক"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1276,28 +1025,49 @@ msgstr ""
 "IP ঠিকনাসমূহে আপোনাৰ কমপিউটাৰক নেটৱৰ্কত চিনাক্ত কৰে। এটা IP ঠিকনা যোগ কৰিবলে "
 "\"যোগ কৰক\" বুটাম ক্লিক কৰক।"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "মচি পেলাওক (_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "স্বচালিতভাৱে প্ৰাপ্ত পথসমূহ উপেক্ষা কৰক (_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "এই সংযোগক কেৱল ইয়াৰ নেটৱৰ্কৰ সম্পসমূহৰ বাবে ব্যৱহাৰ কৰক (_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
-"যদি সামৰ্থবান, এই সংযোগক কেতিয়াও অবিকল্পিত নেটৱৰ্ক সংযোগ হিচাপে ব্যৱহাৰ কৰা "
-"নহব।"
+"যদি সামৰ্থবান, এই সংযোগক কেতিয়াও অবিকল্পিত নেটৱৰ্ক সংযোগ হিচাপে ব্যৱহাৰ কৰা নহব।"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1305,15 +1075,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "সৃষ্টি কৰক..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "এটা সংযোগ ধৰণ বাছক"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1322,8 +1092,7 @@ msgid ""
 msgstr ""
 "আপুনি সৃষ্টি কৰিব বিচৰা সংযোগৰ ধৰণ বাছক। \n"
 "\n"
-"যদি আপুনি এটা VPN সৃষ্টি কৰি আছে, আৰু আপুনি সৃষ্টি কৰিব বিচৰা VPN সংযোগ "
-"তালিকাত "
+"যদি আপুনি এটা VPN সৃষ্টি কৰি আছে, আৰু আপুনি সৃষ্টি কৰিব বিচৰা VPN সংযোগ তালিকাত "
 "নাথাকে, আপোনাৰ হয়তো সঠিক VPN প্লাগিন ইনস্টল নাই।"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
@@ -1367,142 +1136,190 @@ msgid "Bonded _connections:"
 msgstr "বান্ধীত সংযোগসমূহ (_c):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "অৱস্থা (_M):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "অৱস্থা (_o):"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "সম্পাদনা কৰক (_E)"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "মচি পেলাওক (_D)"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "সম্পাদনা কৰক (_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "কম্পনাংক পৰ্যবেক্ষণ কৰা (_f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "আন্তঃপৃষ্ঠৰ নাম (_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "লিংকৰ পৰ্যবেক্ষণ (_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP লক্ষ্যসমূহ (_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "লিংক আপ বিলম্ব (_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "লিংক ডাউন বিলম্ব (_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-#| msgid "Primary DNS:"
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "প্ৰাথমিক (_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "বাইটসমূহ"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "পথৰ মূল্য (_c):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
-#| msgid "S_ecurity:"
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "প্ৰাথমিকতা (_P):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-#| msgid "_Transport mode:"
 msgid "_Hairpin mode:"
 msgstr "হেয়াৰপিন অৱস্থা (_H):"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:1
-#| msgid "Bonded _connections:"
 msgid "Bridged _connections:"
 msgstr "ব্ৰিজ সংযোগসমূহ (_c):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
-#| msgid "Link _down delay:"
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "আগবঢ়োৱাৰ বিলম্ব (_F):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "হেলো সময় (_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-#| msgid "ms"
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "নেটৱাৰ্কিং সামৰ্থবান কৰক (_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "STP (স্পেনিং ট্ৰি প্ৰটোকল) সামৰ্থবান কৰক (_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "সৰ্বাধিক আয়ু (_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "বাৰ্ধক্যৰ সময় (_A):"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "স্বচালিত"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "অবিকল্পিত"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "ঠিকনা"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "ঠিকনা"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "যিকোনো ডিভাইচ"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "এটা অজ্ঞাত ত্ৰুটিৰ বাবে সংযোগ গোপনসমূহ আপডেইট কৰিবলে ব্যৰ্থ।"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:1
-#| msgid "Use 802.1_X security for this connection"
 msgid "Use Data Center Bridging (DCB) for this connection"
 msgstr "এই সংযোগৰ বাবে তথ্য কেন্দ্ৰ ব্ৰিজিং (DCB) ব্যৱহাৰ কৰক"
 
@@ -1527,7 +1344,6 @@ msgid "Feature"
 msgstr "বৈশিষ্ট্য"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:7
-#| msgid "Enable _Wi-Fi"
 msgid "Enable"
 msgstr "সামৰ্থবান কৰক"
 
@@ -1598,108 +1414,104 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "প্ৰাথমিকতা ফ্ল নিয়ন্ত্ৰণ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "প্ৰতিটো ব্যৱহাৰকাৰী প্ৰাথমিকতাৰ বাবে প্ৰাথমিকতা বিৰাম পৰিবহন সামৰ্থবান অথবা "
 "অসামৰ্থবান কৰক।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "প্ৰাথমিকতা:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-#| msgid "2"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-#| msgid "3"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-#| msgid "4"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "ট্ৰাফিক ক্লাচ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "স্ট্ৰিক্ট বেণ্ডৱাইড্থ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "প্ৰাথমিকতা বেণ্ডৱাইড্থ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "দল বেণ্ডৱাইড্থ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "দল ID:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr "প্ৰত্যকজন ব্যৱহাৰকাৰী প্ৰাথমিকতাৰ বাবে প্ৰাথমিকতা দল ID সুমুৱাওক।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
-"প্ৰত্যকজন ব্যৱহাৰকাৰীয়ে প্ৰাথমিকতা ব্যৱহাৰ কৰিব পৰা প্ৰাথমিকতা দল "
-"বেণ্ডৱাইড্থৰ শতাংশ সুমুৱাওক।"
+"প্ৰত্যকজন ব্যৱহাৰকাৰীয়ে প্ৰাথমিকতা ব্যৱহাৰ কৰিব পৰা প্ৰাথমিকতা দল বেণ্ডৱাইড্থৰ শতাংশ "
+"সুমুৱাওক।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
-"প্ৰত্যকজন ব্যৱহাৰকাৰী প্ৰাথমিকতাৰ বাবে স্ট্ৰিক্ট বেণ্ডৱাইড্থ সামৰ্থবান অথবা "
-"অসামৰ্থবান কৰক।"
+"প্ৰত্যকজন ব্যৱহাৰকাৰী প্ৰাথমিকতাৰ বাবে স্ট্ৰিক্ট বেণ্ডৱাইড্থ সামৰ্থবান অথবা অসামৰ্থবান "
+"কৰক।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1712,7 +1524,7 @@ 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:4
+#: ../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
@@ -1720,8 +1532,9 @@ msgid "Sho_w password"
 msgstr "পাছৱৰ্ড দেখুৱাওক (_w)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1733,7 +1546,8 @@ msgstr "পাছৱৰ্ড (_P):"
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "স্বচালিত"
@@ -1788,48 +1602,81 @@ msgstr "স্বআপোচ (_o)"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "ডিভাইচ MAC ঠিকনা (_D):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "সেৱা (_S):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "ক্লৌন্ড MAC ঠিকনা (_l):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 ""
-"ইয়াত সুমুৱা MAC ঠিকনাক এই সংযোগ সক্ৰিয় কৰা নেটৱৰ্ক ডিভাইচৰ বাবে হাৰ্ডৱেৰ "
-"ঠিকনা "
+"ইয়াত সুমুৱা MAC ঠিকনাক এই সংযোগ সক্ৰিয় কৰা নেটৱৰ্ক ডিভাইচৰ বাবে হাৰ্ডৱেৰ ঠিকনা "
 "হিচাপে ব্যৱহাৰ কৰা হব। এই বৈশিষ্টক MAC ক্লৌনিং অথবা স্পুফিং হিচাপে জনা যায়। "
 "উদাহৰণ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "MTU (_M):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "বাইটসমূহ"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "অবিকল্পিত"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "উপেক্ষা কৰক"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "প্ৰচাৰ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "ব্যক্তিগত কি' পাছৱৰ্ড (_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
 msgstr "এই সংযোগ ব্যৱহাৰ কৰি থাকোতে স্বচালিতভাৱে VPN ৰ সৈতে সংযোগ কৰক (_V)"
 
 #: ../src/connection-editor/ce-page-general.ui.h:2
-#| msgid "You are now connected to the WiMAX network."
 msgid "All _users may connect to this network"
 msgstr "সকলো ব্যৱহাৰকাৰীয়ে এই নেটৱৰ্কৰ সৈতে সংযোগ কৰিব পাৰিব (_u)"
 
@@ -1862,8 +1709,8 @@ msgstr "হস্তচালিত DNS সংহতিসমূহৰ সৈত
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "হস্তচালিত"
 
@@ -1874,8 +1721,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "অন্য কমপিউটাৰৰ সৈতে অংশীদাৰী কৰা আছে"
 
@@ -1889,73 +1736,69 @@ msgstr "পদ্ধতি (_M):"
 msgid "Addresses"
 msgstr "ঠিকনাসমূহ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 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.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "DNS চাৰ্ভাৰসমূহ (_D):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"IPv6 ৰ সৈতে সুসঙ্গত নেটৱৰ্কৰ সৈতে সংযোগ কৰোঁতে, সংযোগক সম্পূৰ্ণ হ'বলৈ দিয়ে "
-"যদি "
-"IPv4 সংৰূপ বিফল হয় কিন্তু IPv6 সংৰূপ সফল হয়।"
+"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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "পথসমূহ (_R)…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "অসামৰ্থবান"
 
@@ -1967,105 +1810,65 @@ msgstr "সামৰ্থবান (পছন্দৰ ৰাজহুৱা �
 msgid "Enabled (prefer temporary address)"
 msgstr "সামৰ্থবান (পছন্দৰ অস্থায়ী ঠিকনা)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#| msgid ""
-#| "IP addresses of domain name servers used to resolve host names. Use "
-#| "commas to separate multiple domain name server addresses."
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 ঠিকনাসমূহ। একাধিক "
-"ডমেইন "
-"নাম চাৰ্ভাৰৰ ঠিকনাসমূহ পৃথক কৰোতে কমা চিহ্ন প্ৰয়োগ কৰিব। স্থানীয়-সংযোগ "
-"ঠিকনাসমূহক "
-"সংযোগ কৰি থকা আন্তঃপৃষ্ঠলৈ স্বচালিতভাৱে অৱকাশ কৰা হব।"
+"ডমেইন নাম চাৰ্ভাৰৰ ঠিকনাসমূহ পৃথক কৰোতে কমা চিহ্ন প্ৰয়োগ কৰিব। স্থানীয়-সংযোগ "
+"ঠিকনাসমূহক সংযোগ কৰি থকা আন্তঃপৃষ্ঠলৈ স্বচালিতভাৱে অৱকাশ কৰা হব।"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 গোপনীয়তা সম্প্ৰসাৰনসমূহ (_p):"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
-"IPv4 ৰ সৈতে সুসঙ্গত নেটৱৰ্কৰ সৈতে সংযোগ কৰোঁতে, সংযোগক সম্পূৰ্ণ হ'বলৈ দিয়ে "
-"যদি "
-"IPv4 সংৰূপ বিফল হয় কিন্তু IPv4 সংৰূপ সফল হয়।"
+"IPv4 ৰ সৈতে সুসঙ্গত নেটৱৰ্কৰ সৈতে সংযোগ কৰোঁতে, সংযোগক সম্পূৰ্ণ হ'বলৈ দিয়ে যদি IPv4 "
+"সংৰূপ বিফল হয় কিন্তু IPv4 সংৰূপ সফল হয়।"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "যিকোনো"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "পছন্দ 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "পছন্দ 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-#| msgid "Prefer 3G (UMTS/HSPA)"
-msgid "Prefer 4G (LTE)"
-msgstr "পছন্দ 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "কেৱল 4G (LTE) ব্যৱহাৰ কৰক"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "মৌলিক"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "সংখ্যা (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "উন্নত"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "APN (_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "নেটৱৰ্কৰ ID (_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "ধৰণ (_T):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "পৰিবৰ্তন কৰক..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "PIN (_I):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "ঘৰ নেটৱৰ্ক উপস্থিত নাথাকিলে ৰ'মিংৰ অনুমতি দিয়ক (_r)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_w)"
 
@@ -2123,46 +1926,63 @@ msgid "_JSON config:"
 msgstr "JSON সংৰূপ (_J):"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
-#| msgid "Import a saved VPN configuration..."
 msgid "_Import team configuration from a file..."
 msgstr "এটা ফাইলৰ পৰা দল সংৰূপ ইমপোৰ্ট কৰক (_I)..."
 
 #: ../src/connection-editor/ce-page-team.ui.h:1
-#| msgid "Bonded _connections:"
 msgid "_Teamed connections:"
 msgstr "দলবদ্ধ সংযোগসমূহ (_T):"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-#| msgid "Import a saved VPN configuration..."
-msgid "I_mport team configuration from a file..."
-msgstr "এটা ফাইলৰ পৰা দল সংৰূপ ইমপোৰ্ট কৰক..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "এটা ফাইলৰ পৰা দল সংৰূপ ইমপোৰ্ট কৰক (_I)..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
-#| msgid "Interface:"
 msgid "_Parent interface:"
 msgstr "উপধায়ক আন্তঃপৃষ্ঠ (_P):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-#| msgid "_Interface name:"
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN আন্তঃপৃষ্ঠৰ নাম (_n):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#| msgid "C_loned MAC address:"
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "ক্লৌন্ড MAC ঠিকনা (_C):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN আইডি (_i):"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "ডিভাইচ নাম + সংখ্যা"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + সংখ্যা"
 
@@ -2179,774 +1999,884 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "আন্তঃগাথনী"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "পৰিবহন শক্তি (_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "হাৰ (_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "চেনেল (_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "বেণ্ড (_d):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "অৱস্থা (_o):"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SSID (_I):"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "অনুমোদিত প্ৰমাণীকৰণ পদ্ধতিসমূহ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "EAP (_E)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "প্ৰসাৰনযোগ্য প্ৰমাণীকৰণ প্ৰটোকল"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "PAP (_P)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "পাছৱৰ্ড প্ৰমাণীকৰণ প্ৰটোকল"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "CHAP (_H)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "হেণ্ডশেইক প্ৰমাণীকৰণ প্ৰটোকলক প্ৰত্যাহ্বান জনাওক"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "MSCHAP (_M)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft প্ৰত্যাহ্বান হেণ্ডছেইক প্ৰমাণীকৰণ প্ৰটোকল"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft প্ৰত্যাহ্বান হেণ্ডশেইক প্ৰমাণীকৰণ প্ৰটোকলক সংস্কৰণ ২"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
 msgstr ""
-"বেছিৰভাগ ক্ষেত্ৰত, প্ৰদানকাৰীৰ PPP চাৰ্ভাৰসমূহে সকলো প্ৰমাণীকৰণ পদ্ধতি সমৰ্থন "
-"কৰিব। "
+"বেছিৰভাগ ক্ষেত্ৰত, প্ৰদানকাৰীৰ PPP চাৰ্ভাৰসমূহে সকলো প্ৰমাণীকৰণ পদ্ধতি সমৰ্থন কৰিব। "
 "যদি সংযোগসমূহ ব্যৰ্থ হব, কিছুমান পদ্ধতিৰ বাবে সমৰ্থন অসামৰ্থবান কৰি চাওক।"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "ঠিকনা"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "নেটমাস্ক"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "গেইটৱে"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "মেট্ৰিক"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "উপসৰ্গ"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "ইথাৰনেট"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "ব্লুটুথ"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "বান্ধনী"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "দল"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "ব্ৰিজ"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
-#| msgid "Hardware Address:"
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "হাৰ্ডৱেৰ"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "ভাৰছুৱেল"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "এটা সংৰক্ষিত VPN সংৰূপ ইমপোৰ্ট কৰক..."
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "অজ্ঞাত কাৰণে সংযোগ সম্পাদন ব্যৱস্থাৰ বাৰ্তা আৰম্ভ কৰা নাযায়।"
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "নতুন সংযোগ সৃষ্টি কৰা সম্ভৱ নহয়"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "সংযোগ মচিবলৈ ব্যৰ্থ"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "আপুনি নিশ্চিতৰূপে %s সংযোগ মচিবলে ইচ্ছুক নে?"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "ঠিকনা"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "নেটমাস্ক"
+
+#: ../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
+msgid "Gateway"
+msgstr "গেইটৱে"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "মেট্ৰিক"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "উপসৰ্গ"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "%s সম্পাদন"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "নামবিহীন সংযোগ সম্পাদন"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "সংযোগৰ নাম (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "সম্পাদন ব্যৱস্থা আৰম্ভ কৰিবলৈ ত্ৰুটি"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "সংযোগ যোগ কৰিবলৈ ব্যৰ্থ"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
-msgstr ""
-"সংযোগ সম্পাদকে কিছুমান প্ৰয়োজনীয় সম্পদ বিচাৰি নাপায় (.ui ফাইল পোৱা নগল)।"
+msgstr "সংযোগ সম্পাদকে কিছুমান প্ৰয়োজনীয় সম্পদ বিচাৰি নাপায় (.ui ফাইল পোৱা নগল)।"
 
-#: ../src/connection-editor/nm-connection-editor.c:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "সংৰক্ষণ কৰক (_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "এই সংযোগলে কৰা যিকোনো পৰিবৰ্তন সংৰক্ষণ কৰক।"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "এই ডিভাইচৰ সকলো ব্যৱহাৰকাৰীৰ বাবে এই সংযোগ সংৰক্ষণ কৰাৰ বাবে প্ৰমাণীত কৰক।"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "সংযোগ সৃষ্টি কৰিব পৰা নগল"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "সংযোগ সম্পাদন কৰা সম্ভৱ নহয়"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "সংযোগ সম্পাদক ডাইলগ সৃষ্টি কৰোতে অজ্ঞাত ত্ৰুটি।"
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "সম্পাদন ব্যৱস্থা আৰম্ভ কৰিবলৈ ত্ৰুটি"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "সংযোগ যোগ কৰিবলৈ ব্যৰ্থ"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "সংযোগ সংৰক্ষণ কৰোতে ত্ৰুটি"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "বৈশিষ্ট '%s' / '%s' অবৈধ: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "সংযোগৰ নাম (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "এক্সপোৰ্ট কৰক (_E)..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "কেতিয়াও নহয়"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "এতিয়া"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d মিনিট আগতে"
 msgstr[1] "%d মিনিট আগতে"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ঘন্টা আগতে"
 msgstr[1] "%d ঘন্টা আগতে"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d দিন আগতে"
 msgstr[1] "%d দিন আগতে"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d মাহ আগতে"
 msgstr[1] "%d মাহ আগতে"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d বছৰ আগতে"
 msgstr[1] "%d বছৰ আগতে"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "নাম"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "সৰ্বশেষ ব্যৱহৃত"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "নিৰ্বাচিত সংযোগ সম্পাদন কৰক"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "নিৰ্বাচিত সংযোগ সম্পাদন কৰাৰ আগতে প্ৰমাণীত হোৱা প্ৰয়োজন"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "নিৰ্বাচিত সংযোগ মচি পেলাওক"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "নিৰ্বাচিত সংযোগ মচি পেলোৱাৰ আগতে প্ৰমাণীত হোৱা প্ৰয়োজন"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "কোনো VPN প্লাগিন ইনস্টল নাই।"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "'%s' সংযোগসমূহ কিদৰে সৃষ্টি কৰা হব জ্ঞাত নহয়"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "সংযোগ সৃষ্টি কৰোতে ত্ৰুটি"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "সংযোগ সম্পাদন কৰোতে ত্ৰুটি"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID '%s' ৰ সৈতে এটা সংযোগ পোৱা নগল"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x সুৰক্ষা"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "802.1x সুৰক্ষাৰ ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "এই সংযোগৰ বাবে 802.1X সুৰক্ষা ব্যৱহাৰ কৰক (_X)"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "DCB ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "ব্লুটুথ ডিভাইচ পোৱা নাযায়।"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "বান্ধনী সংযোগ %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "ব্লুটুথ"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "ইথাৰনেট নেটৱৰ্ক"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Wi-Fi নেটৱৰ্ক"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "বান্ধনী ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "প্ৰাথমিক (_P):"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "বান্ধনী সংযোগ %d"
 
-#: ../src/connection-editor/page-bridge.c:211
-#| msgid "Could not load bond user interface."
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "ব্ৰিজ ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
-#| msgid "Bond connection %d"
 msgid "Bridge connection %d"
 msgstr "ব্ৰিজ সংযোগ %d"
 
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "ব্ৰিজ পোৰ্ট"
 
-#: ../src/connection-editor/page-bridge-port.c:117
-#| msgid "Could not load bond user interface."
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "ব্ৰিজ পোৰ্ট ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
-#| msgid "Could not load DSL user interface."
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "DCB ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নাযায়।"
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL সংযোগ %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ঠিকনাৰে ধাৰ্য্য কৰা "
-"হৈছে "
+"এই বিকল্পয় নেটৱৰ্ক ডিভাইচ যাক ইয়াত সুমুৱা তাৰ স্থায়ী MAC ঠিকনাৰে ধাৰ্য্য কৰা হৈছে "
 "তালৈ এই সংযোগক লক কৰে। উদাহৰণস্বৰূপ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "ইথাৰনেট ব্যৱহাৰকাৰীৰ আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "ইথাৰনেট"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "ক্লৌন্ড MAC ঠিকনা (_l):"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "অবিকল্পিত"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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:57
-#| msgid "NetworkManager is not running..."
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD চলি থকা নাই।"
 
-#: ../src/connection-editor/page-general.c:330
-#| msgid "Could not load ethernet user interface."
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "সাধাৰণ ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand সংযোগ %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "স্বচালিত (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "কেৱল স্বচালিত (VPN) ঠিকনাসমূহ"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "স্বচালিত (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "কেৱল স্বচালিত (PPP) ঠিকনাসমূহ"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "স্বচালিত, কেৱল ঠিকনা"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "স্বচালিত (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "কেৱল স্বচালিত (PPPoE) ঠিকনাসমূহ"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "স্বচালিত (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "কেৱল স্বচালিত (DHCP) ঠিকনাসমূহ"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "কেৱল সংযোগ-স্থানীয়"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "অতিৰিক্ত DNS চাৰ্ভাৰসমূহ (_D):"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "অতিৰিক্ত সন্ধান ডমেইনসমূহ (_e):"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s ৰ বাবে IPv4 পথবোৰ সম্পাদন কৰা"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 সংহতিসমূহ"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "স্বচালিত, কেৱল ঠিকনা"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "উপেক্ষা কৰক"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "স্বচালিত, কেৱল DHCP"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s ৰ বাবে IPv6 পথ সম্পাদন"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 ৰ সংহতিসমূহ"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "প্ৰতিলিপি স্লেইভসমূহ"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "স্লেইভ '%s' আৰু '%s' দুয়ো ডিভাইচ '%s' লৈ প্ৰযোজ্য নহয়"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, 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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s স্লেইভ %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "ম'বাইল ব্ৰডবেণ্ড ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "ম'বাইল ব্ৰডবেণ্ড সংযোগৰ ধৰণ সমৰ্থিত নহয়।"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ম'বাইল ব্ৰডবেণ্ড উপলব্ধকৰ্তাৰ ধৰণ বাছক"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr ""
-"ম'বাইল ব্ৰডবেণ্ড সেৱা উপলব্ধকৰ্তাৰ দ্বাৰা ব্যৱহৃত সেৱা বাছক। এই তথ্য অজ্ঞাত "
-"থাকিলে, "
+"ম'বাইল ব্ৰডবেণ্ড সেৱা উপলব্ধকৰ্তাৰ দ্বাৰা ব্যৱহৃত সেৱা বাছক। এই তথ্য অজ্ঞাত থাকিলে, "
 "সেৱা উপলব্ধকৰ্তাৰ সৈতে যোগাযোগ কৰক।"
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
-"মোৰ সেৱা উপলব্ধকৰ্তাৰ দ্বাৰা GSM-ভিত্তিক প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (অৰ্থাৎ "
-"GPRS, EDGE, "
+"মোৰ সেৱা উপলব্ধকৰ্তাৰ দ্বাৰা GSM-ভিত্তিক প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (অৰ্থাৎ GPRS, EDGE, "
 "UMTS, HSDPA) (_G)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
-"মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা CDMA-ভিত্তিক প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (অৰ্থাৎ "
-"1xRTT, "
+"মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা CDMA-ভিত্তিক প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (অৰ্থাৎ 1xRTT, "
 "EVDO) (_D)"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "কোনো নহয়"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP ৰ সংহতিসমূহ"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "ইমপোৰ্ট কৰিবলৈ ফাইল বাছক"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "ত্ৰুটি: ফাইলত এটা বৈধ JSON সংৰূপ নাই"
 
-#: ../src/connection-editor/page-team.c:247
-#| msgid "Could not load DSL user interface."
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "দল ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
-#| msgid "DSL connection %d"
 msgid "Team connection %d"
 msgstr "দল সংযোগ %d"
 
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "দল পৰ্ট"
 
-#: ../src/connection-editor/page-team-port.c:159
-#| msgid "Could not load ethernet user interface."
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (\"%s\" ৰে)"
 
-#: ../src/connection-editor/page-vlan.c:489
-#| msgid "Could not load bond user interface."
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "কোনো নেটৱৰ্ক সংযোগ নাই"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "vlan ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
-#| msgid "VPN connection %d"
 msgid "VLAN connection %d"
 msgstr "VLAN সংযোগ %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' ৰ বাবে VPN প্লাগ-ইন সেৱা পোৱা নাযায়।"
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN সংযোগ %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2956,96 +2886,113 @@ msgstr ""
 "\n"
 "ত্ৰুটি: কোনো VPN সেৱাৰ ধৰণ উপলব্ধ নহয়।"
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "এটা VPN সংযোগ ধৰণ বাছক"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 প্লাগিন ইনস্টল নাই।"
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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 ""
-"এই বিকল্পই ইয়াত দিয়া BSSID এ নিৰ্ধাৰিত কৰাৰ মতে Wi-Fi অভিগম পইন্ট (AP) ত "
-"সংযোগক "
+"এই বিকল্পই ইয়াত দিয়া BSSID এ নিৰ্ধাৰিত কৰাৰ মতে Wi-Fi অভিগম পইন্ট (AP) ত সংযোগক "
 "লক কৰে। যেনে: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"এই বিকল্পয় নেটৱৰ্ক ডিভাইচ যাক ইয়াত সুমুৱা তাৰ স্থায়ী MAC ঠিকনাৰে ধাৰ্য্য কৰা হৈছে "
+"তালৈ এই সংযোগক লক কৰে। উদাহৰণস্বৰূপ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নাযায়।"
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "যিকোনো ডিভাইচ"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi সংযোগ %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP ১২৮-বিট পৰিচয়পংক্তি"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "ডাইনামিক WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA আৰু WPA2 ব্যক্তিগত"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA আৰু WPA2 এন্টাৰপ্ৰাইজ"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi সুৰক্ষা"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi সুৰক্ষাৰ ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিবলৈ ব্যৰ্থ।"
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "WiMAX ব্যৱহাৰকাৰী আন্তঃপৃষ্ঠ ল'ড কৰিব পৰা নগল।"
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX সংযোগ %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN সংযোগ ইমপোৰ্ট কৰিবলৈ ব্যৰ্থ"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3057,25 +3004,30 @@ msgstr ""
 "\n"
 "ত্ৰুটি: %s।"
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "অজ্ঞাত ত্ৰুটি"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" নামৰ ফাইল ইতিমধ্যে আছে।"
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "প্ৰতিস্থাপন কৰক (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN সংযোগ এক্সপোৰ্ট কৰা নাযায়"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3086,110 +3038,22 @@ msgstr ""
 "\n"
 "ত্ৰুটি: %s।"
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN সংযোগ এক্সপোৰ্ট কৰক..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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 ""
-"NetworkManager এপ্লেটে কিছুমান প্ৰয়োজনীয় সম্পদ বিচাৰি নাপায় (.ui ফাইল পোৱা "
-"নগল)।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "ব্লুটুথ সংৰূপ সম্ভৱ নহয় (D-Bus লৈ সংযোগ কৰিবলৈ বিফল: (%s) %s)।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "ব্লুটুথ সংৰূপ সম্ভব নহয় (NetworkManager বিচাৰি পাওতে ত্ৰুটি: (%s) %s)।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "নেটৱৰ্ক ডিভাইচ ৰূপে ম'বাইল ফোন ব্যৱহাৰ কৰা হ'ব (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "ম'বাইল ফোনৰ মাধ্যমে ইন্টাৰনেট ব্যৱহাৰ কৰক (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "ত্ৰুটি: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "DUN সংযোগ সৃষ্টি কৰিবলে ব্যৰ্থ: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "ব্যৱহাৰৰ বাবে আপোনাৰ ফোন এতিয়া প্ৰস্তুত!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "ম'বাইল উইজাৰ্ড বাতিল কৰা হৈছে"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "অজ্ঞাত ধৰণৰ ফোন ডিভাইচ (GSM বা CDMA নহয়)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "অজ্ঞাত মডেম ধৰণ।"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "ফোনৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ।"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-#| msgid "Error editing connection"
-msgid "error getting bus connection"
-msgstr "বাচ সংযোগ প্ৰাপ্ত কৰোতে ত্ৰুটি"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "ফোনৰ সৈতে অপ্ৰত্যাশিতৰূপে সংযোগ বিচ্ছিন্ন হৈছে।"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "ফোনৰ বিৱৰণ নিৰ্ধাৰণৰ সময়সীমা উত্তীৰ্ণ হৈছে।"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "ফোন সংৰূপ চিনাক্ত কৰা হৈছে..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"ডায়েল-আপ নেটৱৰ্ক সংযোগ প্ৰস্তুত কৰাৰ আগতে অবিকল্পিত ব্লুটুথ এডাপ্টাৰ সক্ৰিয় "
-"কৰা আৱশ্যক।"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "PAN সংযোগ সৃষ্টি কৰিবলে ব্যৰ্থ: %s"
+"NetworkManager এপ্লেটে কিছুমান প্ৰয়োজনীয় সম্পদ বিচাৰি নাপায় (.ui ফাইল পোৱা নগল)।"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "%s নেটৱৰ্ক"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "আনলক কৰক (_U)"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "এই ডিভাইচ স্বচালিতভাৱে আনলক কৰক"
 
@@ -3197,31 +3061,36 @@ msgstr "এই ডিভাইচ স্বচালিতভাৱে আনল
 msgid "Connection Information"
 msgstr "সংযোগ তথ্য"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "সক্ৰিয় নেটৱৰ্ক সংযোগসমূহ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "আপোনাৰ ডিভাইচ:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "আপোনাৰ সেৱা উপলব্ধকৰ্তা:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "আপোনাৰ পৰিকল্পনা:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3230,269 +3099,318 @@ msgid ""
 "Preferences menu."
 msgstr ""
 "আপোনাৰ নিৰ্বাচিত সংহতিসমূহসমূহ প্ৰয়োগ কৰি এতিয়া আপোনাৰ ম'বাইল ব্ৰডবেণ্ড সেৱা "
-"উপলব্ধকৰ্তাৰ সৈতে সংযোগ স্থাপন কৰা হ'ব।  সংযোগ বিফল হ'লে বা নেটৱৰ্ক সম্পদ "
-"ব্যৱহাৰ "
-"কৰা সম্ভৱ ন'হ'লে, নিৰ্ধাৰিত সংহতিসমূহসমূহ পৰীক্ষা কৰক।  ম'বাইল ব্ৰডবেণ্ড "
-"সংযোগৰ "
-"সংহতিসমূহ পৰিবৰ্তন কৰাৰ বাবে প্ৰণালী >> পছন্দ তালিকাৰ পৰা \"নেটৱৰ্ক সংযোগ\" "
-"বাছক।"
-
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+"উপলব্ধকৰ্তাৰ সৈতে সংযোগ স্থাপন কৰা হ'ব।  সংযোগ বিফল হ'লে বা নেটৱৰ্ক সম্পদ ব্যৱহাৰ "
+"কৰা সম্ভৱ ন'হ'লে, নিৰ্ধাৰিত সংহতিসমূহসমূহ পৰীক্ষা কৰক।  ম'বাইল ব্ৰডবেণ্ড সংযোগৰ "
+"সংহতিসমূহ পৰিবৰ্তন কৰাৰ বাবে প্ৰণালী >> পছন্দ তালিকাৰ পৰা \"নেটৱৰ্ক সংযোগ\" বাছক।"
+
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ম'বাইল ব্ৰডবেণ্ডৰ সংহতিসমূহ নিশ্চিত কৰক"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "তালিকা বহিৰ্ভূত"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "আপোনাৰ পৰিকল্পনা বাছক (_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "ব্যৱহৃত বিল পৰিকল্পনা বাছক"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "মোৰ পৰিকল্পনা তালিকাভুক্ত নহয়..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "সেৱা উপলব্ধকৰ্তা"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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):"
+msgstr "সেৱা উপলব্ধকৰ্তাৰ নাম অনুপস্থিত আৰু মই স্বয়ং সেইটো লিখিবলৈ ইচ্ছুক (_m):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "সেৱা উপলব্ধকৰ্তা:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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)"
+"মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা GSM প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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)"
+msgstr "মোৰ সেৱা উপলব্ধকৰ্তা দ্বাৰা CDMA প্ৰযুক্তি ব্যৱহাৰ কৰা হয় (1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "সেৱা উপলব্ধকৰ্তা বাছক"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "দেশ অথবা অঞ্চল তালিকা:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "দেশ অথবা অঞ্চল"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "মোৰ দেশ তালিকাত নাই"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ইনস্টল কৰা GSM ডিভাইচ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ইনস্টল কৰা CDMA ডিভাইচ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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 ""
-"এই সহায়ক ব্যৱস্থাৰ সহায়ত এটা চেলুলাৰ (3G) নেটৱৰ্কৰ সৈতে ম'বাইল ব্ৰডবেণ্ড "
-"সংযোগ "
+"এই সহায়ক ব্যৱস্থাৰ সহায়ত এটা চেলুলাৰ (3G) নেটৱৰ্কৰ সৈতে ম'বাইল ব্ৰডবেণ্ড সংযোগ "
 "স্থাপন কৰা যাব।"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "নিম্নলিখিত তথ্যৰ প্ৰয়োজন:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "ব্ৰডবেণ্ড সেৱা উপলব্ধকৰ্তাৰ নাম"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ব্ৰডবেণ্ড বিলিং পৰিকল্পনাৰ নাম"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 (এক্সেচ পইন্ট "
-"নেম)"
+msgstr "(কিছু ক্ষেত্ৰত) আপোনাৰ ব্যৱহৃত ব্ৰডবেণ্ড বিলিং পৰিকল্পনা APN (এক্সেচ পইন্ট নেম)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "এই ম'বাইল ব্ৰডবেণ্ড ডিভাইচৰ বাবে সংযোগ সৃষ্টি কৰক (_t)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "যিকোনো ডিভাইচ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ম'বাইল ব্ৰডবেণ্ড সংযোগ প্ৰস্তুত কৰক"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "নতুন ম'বাইল ব্ৰডবেণ্ড সংযোগ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "তাঁৰযুক্ত"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "ব্লুটুথ"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC মেশ"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "দ্বিতীয় পাছৱৰ্ড (_S):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "দ্বিতীয় পাছৱৰ্ড (_S):"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %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/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "নতুন..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "কোনো নহয়"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "সৃষ্টি কৰক (_r)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
-msgstr ""
-"'%s' Wi-Fi নেটৱৰ্ক ব্যৱহাৰ কৰাৰ বাবে পাছৱৰ্ড বা এনক্ৰিপশন কি'ৰ প্ৰয়োজন।"
+msgstr "'%s' Wi-Fi নেটৱৰ্ক ব্যৱহাৰ কৰাৰ বাবে পাছৱৰ্ড বা এনক্ৰিপশন কি'ৰ প্ৰয়োজন।"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi নেটৱৰ্ক প্ৰমাণীকৰণ প্ৰয়োজন"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi নেটৱৰ্কৰ দ্বাৰা প্ৰমাণীকৰণৰ প্ৰয়োজন"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "নতুন Wi-Fi নেটৱৰ্ক সৃষ্টি কৰক"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "নতুন Wi-Fi নেটৱৰ্ক"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "সৃষ্টি কৰাৰ বাবে চিহ্নিত Wi-Fi নেটৱৰ্কৰ এটা নাম নিৰ্ধাৰণ কৰক।"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "লুকুৱা Wi-Fi নেটৱৰ্কৰ সৈতে সংযোগ কৰক"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "লুকুৱা Wi-Fi নেটৱৰ্ক"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
-msgstr ""
-"সংযোগ কৰাৰ বাবে চিহ্নিত লুকুৱা Wi-Fi নেটৱৰ্কৰ নাম আৰু সুৰক্ষা তথ্য লিখক।"
+msgstr "সংযোগ কৰাৰ বাবে চিহ্নিত লুকুৱা Wi-Fi নেটৱৰ্কৰ নাম আৰু সুৰক্ষা তথ্য লিখক।"
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#| msgid "_Password:"
-msgid "_Secondary Password:"
-msgstr "দ্বিতীয় পাছৱৰ্ড (_S):"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-#| msgid "Sho_w passwords"
-msgid "Sh_ow passwords"
-msgstr "পাছৱৰ্ডসমূহ দেখুৱাওক (_o)"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi সুৰক্ষা (_s):"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "সংযোগ (_o):"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi এডাপ্টাৰ (_a):"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC মেশ"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "ব্যৱহাৰপদ্ধতি (_U):"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3500,7 +3418,7 @@ msgstr ""
 "এই প্ৰগ্ৰাম NetworkManager ৰ এটা উপাদান (https://wiki.gnome.org/Projects/"
 "NetworkManager/)।"
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3508,139 +3426,151 @@ msgstr ""
 "ইয়াক কমান্ড-শাৰীৰ মাধ্যমে ব্যৱহাৰৰ বাবে নিৰ্মিত নহয় আৰু GNOME ডেস্কটপ পৰিবেশত "
 "সঞ্চালিত হয়।"
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "সামৰ্থবান নহয়"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ৰেজিস্টাৰ্ড নহয়"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ঘৰৰ নেটৱৰ্ক (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "ঘৰৰ নেটৱৰ্ক"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "অনুসন্ধান কৰা হৈছে"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "ৰেজিস্ট্ৰেষণ নাকচ কৰা হৈছে"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ৰ'মিং)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ৰ'মিং নেটৱৰ্ক (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "ৰ'মিং নেটৱৰ্ক"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "'%s' ত SIM কাৰ্ড '%s' ৰ বাবে PIN ক'ড"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN ক'ড প্ৰয়োজনীয়"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ম'বাইল ব্ৰ'ডবেণ্ড ডিভাইচৰ কাৰণে PIN ক'ড প্ৰয়োজনীয়"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "'%s' ম'বাইল ব্ৰডবেণ্ড সংযোগ বৰ্তমানে সক্ৰিয়: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "ৰ'মিং"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s সংযোগ"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "পাছৱৰ্ডক কেৱল এই ব্যৱহাৰকাৰীৰ বাবে সংৰক্ষণ কৰক (_u)"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "সকলো ব্যৱহাৰকাৰীৰ বাবে পাছৱৰ্ড সংৰক্ষণ কৰক (_a)"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
-#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER বা PEM প্ৰমাণপত্ৰসমূহ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "এটা PAC ফাইল বাছক..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC ফাইলসমূহ (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "সকলো ফাইল"
 
@@ -3676,15 +3606,32 @@ msgstr "অভ্যন্তৰীক প্ৰমাণীকৰণ (_I):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "স্বচালিত PAC যোগানৰ অনুমতি দিয়ক (_v)"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "প্ৰমাণপত্ৰ কতৃপক্ষৰ প্ৰমাণপত্ৰ বাছক..."
 
@@ -3705,7 +3652,6 @@ msgstr "CA প্ৰমাণপত্ৰ (_A):"
 #: ../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
-#| msgid "Ignore CA certificate"
 msgid "No CA certificate is _required"
 msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন নাই (_r)"
 
@@ -3713,15 +3659,46 @@ msgstr "কোনো CA প্ৰমাণপত্ৰৰ প্ৰয়োজন
 msgid "PEAP _version:"
 msgstr "PEAP সংস্কৰণ (_v):"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "প্ৰতিবাৰ এই পাছৱৰ্ড লিখাৰ অনুৰোধ কৰা হ'ব (_k)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "CA প্ৰমাণপত্ৰ (_A):"
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "এনক্ৰিপশন বিহীন ব্যক্তিগত কি' নিৰাপদ নহয়"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3729,19 +3706,17 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"নিৰ্বাচিত ব্যক্তিগত কি' সম্ভৱত পাছৱৰ্ড সহায়ত সুৰক্ষিত নহয়। ইয়াৰ ফলত সুৰক্ষা "
-"বিষয়ক "
-"পৰিচয়ৰ সুৰক্ষা হানী হোৱাৰ সম্ভাৱনা আছে।  অনুগ্ৰহ কৰি, পাছৱৰ্ড সহায়ত সুৰক্ষিত "
-"এটা "
+"নিৰ্বাচিত ব্যক্তিগত কি' সম্ভৱত পাছৱৰ্ড সহায়ত সুৰক্ষিত নহয়। ইয়াৰ ফলত সুৰক্ষা বিষয়ক "
+"পৰিচয়ৰ সুৰক্ষা হানী হোৱাৰ সম্ভাৱনা আছে।  অনুগ্ৰহ কৰি, পাছৱৰ্ড সহায়ত সুৰক্ষিত এটা "
 "ব্যক্তিগত কি' বাছক।\n"
 "\n"
 "(openssl ৰ মাধ্যমে পাছৱৰ্ড সহায়ত ব্যক্তিগত কি' সুৰক্ষিত কৰা যাব)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "ব্যক্তিগত প্ৰমাণপত্ৰ বাছক..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "ব্যক্তিগত কি' বাছক..."
 
@@ -3761,23 +3736,36 @@ msgstr "ব্যক্তিগত কি' (_k):"
 msgid "_Private key password:"
 msgstr "ব্যক্তিগত কি' পাছৱৰ্ড (_P):"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "টানেল কৰা TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "সুৰক্ষিত EAP (PEAP)"
 
@@ -3787,6 +3775,44 @@ msgstr "সুৰক্ষিত EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "প্ৰমাণীকৰণ (_t):"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (অবিকল্পিত)"
@@ -3811,6 +3837,323 @@ msgstr "কি' দেখুৱাওক (_w)"
 msgid "WEP inde_x:"
 msgstr "WEP সূচী (_x):"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "ধৰণ (_T):"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "WiMAX ম'বাইল ব্ৰডবেণ্ড সামৰ্থবান কৰক (_X)"
+
+#~ msgid "_Help"
+#~ msgstr "সহায় (_H)"
+
+#~| msgid "You are now connected to the GSM network."
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "আপুনি এতিয়া বান্ধীত নেটৱৰ্কৰ সৈতে সংযুক্ত।"
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "বান্ধনী সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
+
+#~| msgid "Configuring mobile broadband connection '%s'..."
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "বান্ধনী সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "বান্ধনী সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
+
+#~| msgid "Requesting a VPN address for '%s'..."
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "'%s' ৰ বাবে ঠিকনা অনুৰোধ কৰা হৈছে..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "বান্ধনী সংযোগ '%s' সক্ৰিয়"
+
+#~| msgid "You are now connected to the WiMAX network."
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "আপুনি এতিয়া ব্ৰিজ্ড নেটৱৰ্কলৈ সংযুক্ত।"
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "ব্ৰিজ সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
+
+#~| msgid "Configuring Wi-Fi network connection '%s'..."
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "ব্ৰিজ সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "ব্ৰিজ সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "ব্ৰিজ সংযোগ '%s' সক্ৰিয়"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "নতুন ম'বাইল ব্ৰ'ডবেণ্ড (CDMA) সংযোগ..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "আপুনি এতিয়া CDMA নেটৱৰ্কলৈ সংযুক্ত।"
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA নেটৱৰ্ক।"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "নতুন ম'বাইল ব্ৰ'ডবেণ্ড (GSM) সংযোগ..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "আপুনি এতিয়া GSM নেটৱৰ্কলৈ সংযুক্ত।"
+
+#~ msgid "GSM network."
+#~ msgstr "GSM নেটৱৰ্ক।"
+
+#~| msgid "InfiniBand"
+#~ msgid "Auto InfiniBand"
+#~ msgstr "স্ব InfiniBand"
+
+#~| msgid "Wi-Fi Networks (%s)"
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand নেটৱৰ্কসমূহ (%s)"
+
+#~| msgid "Wi-Fi Network (%s)"
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand নেটৱৰ্ক (%s)"
+
+#~| msgid "InfiniBand"
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand নেটৱৰ্কসমূহ"
+
+#~| msgid "InfiniBand"
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand নেটৱৰ্ক"
+
+#~| msgid "You are now connected to the WiMAX network."
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "আপুনি এতিয়া InfiniBand নেটৱৰ্কলে সংযুক্ত।"
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
+
+#~| msgid "Configuring Wi-Fi network connection '%s'..."
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
+
+#~| msgid "InfiniBand connection %d"
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand সংযোগ '%s' সক্ৰিয়"
+
+#~| msgid "You are now connected to the ethernet network."
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "আপুনি এতিয়া দলবদ্ধ নেটৱৰ্কলৈ সংযুক্ত।"
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "দল সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
+
+#~| msgid "Configuring Wi-Fi network connection '%s'..."
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "দল সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "দল সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Team connection '%s' active"
+#~ msgstr "দল সংযোগ '%s' সক্ৰিয়"
+
+#~| msgid "You are now connected to the CDMA network."
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "আপুনি এতিয়া VLANলৈ সংযুক্ত।"
+
+#~| msgid "Starting VPN connection '%s'..."
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "VLAN সংযোগ '%s' প্ৰস্তুত কৰা হৈছে..."
+
+#~| msgid "Starting VPN connection '%s'..."
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "VLAN সংযোগ '%s' সংৰূপণ কৰা হৈছে..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "VLAN সংযোগ '%s' ৰ বাবে ব্যৱহাৰকাৰী প্ৰমাণীকৰণৰ প্ৰয়োজন..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN সংযোগ '%s' সক্ৰিয়"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX ম'বাইল ব্ৰডবেণ্ড (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX ম'বাইল ব্ৰডবেণ্ড"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX অসামৰ্থবান আছে"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX হাৰ্ডৱেৰ চুইচ দ্বাৰা অসামৰ্থবান"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "আপুনি এতিয়া WiMAX নেটৱৰ্কলে সংযুক্ত।"
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "অজ্ঞাত"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "অজ্ঞাত"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "অৱস্থা (_M):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "ডিভাইচ MAC ঠিকনা (_D):"
+
+#~ msgid "Any"
+#~ msgstr "যিকোনো"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "পছন্দ 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "পছন্দ 2G (GPRS/EDGE)"
+
+#~| msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "পছন্দ 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "কেৱল 4G (LTE) ব্যৱহাৰ কৰক"
+
+#~| msgid "Import a saved VPN configuration..."
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "এটা ফাইলৰ পৰা দল সংৰূপ ইমপোৰ্ট কৰক..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "আন্তঃগাথনী"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "সংযোগ সংৰক্ষণ কৰোতে ত্ৰুটি"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "বৈশিষ্ট '%s' / '%s' অবৈধ: %d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "স্বচালিত (PPP)"
+
+#~ 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)."
+#~ msgstr "ব্লুটুথ সংৰূপ সম্ভৱ নহয় (D-Bus লৈ সংযোগ কৰিবলৈ বিফল: (%s) %s)।"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "ব্লুটুথ সংৰূপ সম্ভব নহয় (NetworkManager বিচাৰি পাওতে ত্ৰুটি: (%s) %s)।"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "নেটৱৰ্ক ডিভাইচ ৰূপে ম'বাইল ফোন ব্যৱহাৰ কৰা হ'ব (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "ম'বাইল ফোনৰ মাধ্যমে ইন্টাৰনেট ব্যৱহাৰ কৰক (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "ত্ৰুটি: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "DUN সংযোগ সৃষ্টি কৰিবলে ব্যৰ্থ: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "ব্যৱহাৰৰ বাবে আপোনাৰ ফোন এতিয়া প্ৰস্তুত!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "ম'বাইল উইজাৰ্ড বাতিল কৰা হৈছে"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "অজ্ঞাত ধৰণৰ ফোন ডিভাইচ (GSM বা CDMA নহয়)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "অজ্ঞাত মডেম ধৰণ।"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "ফোনৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ।"
+
+#~| msgid "Error editing connection"
+#~ msgid "error getting bus connection"
+#~ msgstr "বাচ সংযোগ প্ৰাপ্ত কৰোতে ত্ৰুটি"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ফোনৰ সৈতে অপ্ৰত্যাশিতৰূপে সংযোগ বিচ্ছিন্ন হৈছে।"
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "ফোনৰ বিৱৰণ নিৰ্ধাৰণৰ সময়সীমা উত্তীৰ্ণ হৈছে।"
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "ফোন সংৰূপ চিনাক্ত কৰা হৈছে..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "ডায়েল-আপ নেটৱৰ্ক সংযোগ প্ৰস্তুত কৰাৰ আগতে অবিকল্পিত ব্লুটুথ এডাপ্টাৰ সক্ৰিয় কৰা "
+#~ "আৱশ্যক।"
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "PAN সংযোগ সৃষ্টি কৰিবলে ব্যৰ্থ: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s নেটৱৰ্ক"
+
 #~ msgid "Secondary DNS:"
 #~ msgstr "দ্বিতীয় DNS:"
 
@@ -3905,15 +4248,9 @@ msgstr "WEP সূচী (_x):"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "'%s' সংযোগসমূহ কিদৰে সম্পাদন কৰা হব জ্ঞাত নহয়"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "ব্লুটুথ ডিভাইচ পোৱা নাযায়।"
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "ব্লুটুথ সংৰূপ সম্ভৱ নহয় (D-Bus প্ৰক্সি সৃষ্টি কৰিবলৈ বিফল)।"
 
-#~ msgid "Network Manager"
-#~ msgstr "নেটৱৰ্ক পৰিড্ৰাইভাৰ"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "nm-applet ৰ এটা চানেকি বৰ্তমানে চলি আছে।\n"
 
diff --git a/po/ast.po b/po/ast.po
index ea5b0173..a8bbbf37 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
-"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2011-09-06 12:02+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -20,631 +19,924 @@ msgstr ""
 "X-Poedit-Language: Asturian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+msgid "Network"
+msgstr "Rede"
+
+#: ../nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr "Remana les conexones de rede"
 
-#: ../nm-applet.desktop.in.h:2
-msgid "Network"
-msgstr "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.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr "Desactivar crear WiFi"
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "Xestiona y camuda los axustes de conexón de rede"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "Desactivar los avisos de conexón"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, 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
 msgid "Disable disconnected notifications"
 msgstr "Desactivar los avisos de desconexón"
 
-#: ../nm-applet.schemas.in.h:4
-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:4
+#, 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."
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Desactivar los avisos de conexón"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
 msgstr ""
 "Conseñar como braero pa desactivar los avisos al desconeutase d'una rede."
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "Torgar avisos de redes afayadices"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Conseñar como braero pa desactivar los avisos cuando hai redes inalámbriques "
 "afayadices."
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr "Cuñu"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+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 WiFi Create"
+msgstr "Desactivar crear WiFi"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"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."
 
-#: ../nm-applet.schemas.in.h:8
-msgid "Stamp"
-msgstr "Cuñu"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
-msgstr "Torgar avisos de redes afayadices"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:10
-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:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Escueyi el certificáu CA"
 
-#: ../nm-connection-editor.desktop.in.h:1
-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:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "Network Connections"
-msgstr "Conexones de rede"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:443 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:875 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "Disponible"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Xestor de la rede"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Xestor de la rede"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:485 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_Coneutar"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "Nome de _rede:"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "Fallu al crear la conexón PAN: %s"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "Desconocida"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "Falló amestar conexón"
+
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "desconeutáu"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "Desconeutáu"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "Falló amestar conexón"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "Nun amosar esti mensax otra vegada"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "Agora ta coneutáu a «%s»."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"La conexón CPN «%s» falló porque torgóse la conexón de rede."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:489 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1280 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "Afitóse la conexón"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"la conexón de rede «%s» falló porque'l serviciu VPN  interrumpióse "
+"inesperadamente."
 
-#: ../src/applet-device-bt.c:205
-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.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"La conexón VPN « %s » falló porque'l serviciu VPN devolvió una configuración "
+"inválida."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:525 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "Tresnando la conexón móvil de banda ancha «%s»…"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"La conexón VPN « %s » falló porque'l tiempu de conexón pasóse."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "Configurando la conexón móvil de banda ancha «%s»…"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"La conexón VPN « %s » falló porque'l serviciu VPN nun arrancó a tiempu."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
 msgstr ""
-"Necesítase autenticación d'usuariu pa la conexón móvil de banda ancha «%s»…"
+"\n"
+"La conexón VPN « %s » falló porque l'arranque del serviciu VPN falló."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2479
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "Solicitando una direición de rede pa «%s»…"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"La conexón VPN « %s » falló porque nun había secretos VPN afayadizos."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:552
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "La conexón móvil de banda ancha «%s» ta activa"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"La conexón VPN « %s » falló por razones secretes VPN non afayadices."
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"La conexón VPN «%s» falló."
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:389
-#: ../src/applet-dialogs.c:405
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Banda ancha móvil (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"La conexón VPN «%s» desconeutóse porque torgóse la conexón de rede."
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:391
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1474
-msgid "Mobile Broadband"
-msgstr "Banda ancha móvil"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"La conexón VPN «%s» desconeutóse porque paró el serviciu VPN."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Conexón de banda ancha móvil (CDMA) nueva…"
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"La conexón VPN «%s» desconeutóse."
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "Agora ta coneutáu a la rede CDMA."
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "Mensaxe de Rexistru VPN"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:547
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "Falló la conexón VPN"
+
+#: ../src/applet.c:990
 #, 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)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"La conexón VPN «%s» falló porque'l serviciu VPN falló al aniciase.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "roaming"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"La conexón VPN «%s» falló al aniciase.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-msgid "CDMA network."
-msgstr "Rede CDMA."
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "el preséu nun ta llistu (falta'l firmware)"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1098
-msgid "You are now registered on the home network."
-msgstr "Agora tas rexistráu a la rede de casa."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "el preséu nun ta preparáu"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1104
-msgid "You are now registered on a roaming network."
-msgstr "Agora tas rexistráu nuna rede de roaming."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "desconeutáu"
 
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "Desconeutar"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:456
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Conexón móvil de banda ancha (GSM) nueva…"
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "el preséu nun ta remanáu"
 
-#: ../src/applet-device-gsm.c:490
-msgid "You are now connected to the GSM network."
-msgstr "Agora tas coneutáu a la rede GSM."
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "Nun hai preseos de rede disponibles"
 
-#: ../src/applet-device-gsm.c:651
-msgid "PIN code required"
-msgstr "Necesítase un códigu PIN"
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "Conexones _VPN"
 
-#: ../src/applet-device-gsm.c:659
-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/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "_Configurar VPN…"
 
-#: ../src/applet-device-gsm.c:784
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Códigu PIN incorreutu; contauta col fornidor del to serviciu."
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "_Desconeutar VPN"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager nun ta executándose…"
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "Redes deshabilitaes"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "Activar _Rede"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "Activar _Inalámbrica"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "Activar la banda ancha _móvil"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "Activar _notificaciones"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "I_nformación de la Conexón"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "Editar les conexones…"
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "Tocante _a"
+
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "Agora ta coneutáu a «%s»."
+
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "Desconeutáu"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "Desconeutóse la conexón a la rede."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Tresnando la conexón de rede «%s»…"
+
+#: ../src/applet.c:2477
+#, 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:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Solicitando una direición de rede pa «%s»…"
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "Conexón de rede «%s» activa"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Aniciando conexón VPN «%s»…"
+
+#: ../src/applet.c:2560
+#, 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:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Solicitando una direición VPN pa «%s»…"
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "Conexón VPN «%s» activa"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "Nun hai conexón de rede"
 
-#: ../src/applet-device-gsm.c:807
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "Aplicación NetworkManager"
+
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Códigu PUK incorreutu; contauta col fornidor del to serviciu."
 
+#: ../src/applet-device-broadband.c:201
+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-gsm.c:834
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Unviando códigu de desbloquéu…"
 
-#: ../src/applet-device-gsm.c:897
-msgid "SIM PIN unlock required"
-msgstr "Necesítase un códigu PIN de desbloquéu"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Banda ancha móvil (%s)"
 
-#: ../src/applet-device-gsm.c:898
-msgid "SIM PIN Unlock Required"
-msgstr "Necesítase un códigu PIN de desbloquéu"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "Banda ancha móvil"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:900
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"El preséu de banda ancha «%s» necesita un códigu SIM PIN enantes de poder "
-"usalu."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Disponible"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:902
-msgid "PIN code:"
-msgstr "Códigu PIN:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "Conexón de banda ancha móvil nueva"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:906
-msgid "Show PIN code"
-msgstr "Amosar códigu PIN"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Afitóse la conexón"
 
-#: ../src/applet-device-gsm.c:909
-msgid "SIM PUK unlock required"
-msgstr "Necesítase un códigu PUK"
+#: ../src/applet-device-broadband.c:816
+#, 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-gsm.c:910
-msgid "SIM PUK Unlock Required"
-msgstr "Necesítase un códigu PUK"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "Contraseña de la rede móvil de banda ancha"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:912
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"El preséu de banda ancha «%s» necesita un códigu SIM PUK enantes de poder "
-"usalu."
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "Agora tas rexistráu a la rede de casa."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:914
-msgid "PUK code:"
-msgstr "Códigu PUK:"
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "Agora tas rexistráu nuna rede de roaming."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:917
-msgid "New PIN code:"
-msgstr "Códigu PIN nuevu:"
+#: ../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."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:919
-msgid "Re-enter new PIN code:"
-msgstr "Reintroduz el nuevu códigu PIN:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "Tresnando la conexón móvil de banda ancha «%s»…"
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:924
-msgid "Show PIN/PUK codes"
-msgstr "Amosar los códigos PIN/PUK"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, 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
+#, 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-gsm.c:1097 ../src/applet-device-gsm.c:1103
-msgid "GSM network."
-msgstr "Rede GSM"
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "La conexón móvil de banda ancha «%s» ta activa"
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automático"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "Redes cableaes (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "Rede cableada (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "Redes cableaes"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "Rede cableada"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1485
-msgid "disconnected"
-msgstr "desconeutáu"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../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-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../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-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../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-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../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-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../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-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../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-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticación DSL"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Coneutar a otra rede inalámbrica tapecida…"
 
-#: ../src/applet-device-wifi.c:150
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "Crear _Nueva Rede Wifi..."
 
-#: ../src/applet-device-wifi.c:294
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(dengún)"
 
-#: ../src/applet-device-wifi.c:803
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "Redes Inalámbriques (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Redes cableaes (%s)"
 
-#: ../src/applet-device-wifi.c:805
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "Rede Wifi (%s)"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Rede cableada (%s)"
 
-#: ../src/applet-device-wifi.c:807
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Rede Wifi"
-msgstr[1] "Redes Wifi"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Rede cableada"
+msgstr[1] "Rede cableada"
 
-#: ../src/applet-device-wifi.c:840
-msgid "wireless is disabled"
-msgstr "la rede inalámbrica ta desactivada"
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "WiMAX ta desactivada"
 
-#: ../src/applet-device-wifi.c:841
-msgid "wireless is disabled by hardware switch"
-msgstr "la rede inalámbrica ta desactivada pol interruptor físicu"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WiMAX ta desactivada pol interruptor físicu"
 
-#: ../src/applet-device-wifi.c:902
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Más redes"
 
-#: ../src/applet-device-wifi.c:1081
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "Redes Inalámbriques Disponibles"
 
-#: ../src/applet-device-wifi.c:1083
-msgid "Click on this icon to connect to a wireless network"
-msgstr "Calca nesti iconu pa coneutate a una rede inalámbrica"
-
-#: ../src/applet-device-wifi.c:1084
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, 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:1087 ../src/applet.c:901
-msgid "Don't show this message again"
-msgstr "Nun amosar esti mensax otra vegada"
-
-#: ../src/applet-device-wifi.c:1279
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, 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:1310
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Tresnando la conexón de rede inalámbrica «%s»…"
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Tresnando la conexón de rede «%s»…"
 
-#: ../src/applet-device-wifi.c:1313
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "Configurando la conexón de rede inalámbrica «%s»…"
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Configurando la conexón de rede cableada «%s»…"
 
-#: ../src/applet-device-wifi.c:1316
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, 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:1319
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Solicitando una direición de rede inalámbrica pa «%s»…"
+#: ../src/applet-device-wifi.c:1408
+#, 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:1340
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, 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:1345
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "La conexón de rede «%s» ta activa"
-
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Banda ancha móvil WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr "Banda ancha móvil WiMAX"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "WiMAX ta desactivada"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "La conexón de rede cableada «%s» ta activa"
 
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX ta desactivada pol interruptor físicu"
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "Fallu al crear la conexón PAN: %s"
 
-#: ../src/applet-device-wimax.c:428
-msgid "You are now connected to the WiMAX network."
-msgstr "Agora tas coneutáu a la rede WiMAX."
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "Nun pudo editase la conexón nueva"
 
-#: ../src/applet-dialogs.c:56
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Fallu al amosar la información de conexón:"
 
-#: ../src/applet-dialogs.c:108
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/libnm-gtk/nm-wireless-dialog.c:949
-#: ../src/wireless-security/wireless-security.c:396
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:110
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP dinámica"
 
-#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
-#: ../src/applet-dialogs.c:223
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:219
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Direiciones"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/libnm-gtk/nm-wireless-dialog.c:906
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Denguna"
 
-#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
+#: ../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
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: ../src/applet-dialogs.c:342
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:344
-msgctxt "WiMAX CINR"
-msgid "unknown"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
 msgstr "Desconocida"
 
-#: ../src/applet-dialogs.c:356
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Direición IP:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Señes de Difusión:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
 msgstr "Desconocida"
 
-#: ../src/applet-dialogs.c:391
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Mázcara de sorrede:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:394
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:401
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:403
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:407
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Xeneral"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Señes de Hardware:"
 
 #. Driver
-#: ../src/applet-dialogs.c:441
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:470
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Velocidá:"
 
-#: ../src/applet-dialogs.c:480
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Seguridá:"
 
-#: ../src/applet-dialogs.c:493
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:506
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:523
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:534 ../src/applet-dialogs.c:641
-msgid "IP Address:"
-msgstr "Direición IP:"
-
-#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Desconocida"
-
-#: ../src/applet-dialogs.c:550
-msgid "Broadcast Address:"
-msgstr "Señes de Difusión:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:559
-msgid "Subnet Mask:"
-msgstr "Mázcara de sorrede:"
-
-#: ../src/applet-dialogs.c:561
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Desconocida"
-
-#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Camín predetermináu:"
 
-#: ../src/applet-dialogs.c:581
-msgid "Primary DNS:"
-msgstr "DNS primariu:"
-
-#: ../src/applet-dialogs.c:590
-msgid "Secondary DNS:"
-msgstr "DNS secundariu:"
-
-#: ../src/applet-dialogs.c:600
-msgid "Ternary DNS:"
-msgstr "DNS terciariu:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:615
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:624
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Inoráu"
 
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "_Triba:"
+
+#: ../src/applet-dialogs.c:822
+#, fuzzy
+msgid "VPN Gateway:"
+msgstr "Puerta d'enllaz"
+
+#: ../src/applet-dialogs.c:828
+#, fuzzy
+msgid "VPN Username:"
+msgstr "Nome d'_usuariu:"
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "Co_nexón:"
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+#, fuzzy
+msgid "Unknown"
+msgstr "Desconocida"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:732
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Nun s'alcontró denguna conexón activa válida"
 
-#: ../src/applet-dialogs.c:785
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -652,467 +944,820 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "y munchos otros contribuyentes y traductores"
 
-#: ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:988
 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:790
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Páxina web de NetworkManager"
 
-#: ../src/applet-dialogs.c:805
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Recursos que falten"
 
-#: ../src/applet-dialogs.c:830
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Contraseña de la rede móvil de banda ancha"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:1039
 #, 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:858
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/applet.c:990
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "Necesítase un códigu PIN de desbloquéu"
+
+#: ../src/applet-dialogs.c:1337
+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:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"La conexón CPN «%s» falló porque torgóse la conexón de rede."
+"El preséu de banda ancha «%s» necesita un códigu SIM PIN enantes de poder "
+"usalu."
 
-#: ../src/applet.c:993
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "Códigu PIN:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "Amosar códigu PIN"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "Necesítase un códigu PUK"
+
+#: ../src/applet-dialogs.c:1348
+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:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"la conexón de rede «%s» falló porque'l serviciu VPN  interrumpióse "
-"inesperadamente."
+"El preséu de banda ancha «%s» necesita un códigu SIM PUK enantes de poder "
+"usalu."
 
-#: ../src/applet.c:996
-#, c-format
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "Códigu PUK:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "Códigu PIN nuevu:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "Reintroduz el nuevu códigu PIN:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
+
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"La conexón VPN « %s » falló porque'l serviciu VPN devolvió una configuración "
-"inválida."
+"La direición IP identifica el to equipu na rede. Calca'l botón «Amestar» "
+"p'amestar una direición IP."
 
-#: ../src/applet.c:999
-#, c-format
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "D_esaniciar"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+#, 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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"La conexón VPN « %s » falló porque'l tiempu de conexón pasóse."
+"Si s'activa, esta conexón nunca va usase como conexón predeterminada de rede."
+
+#: ../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…"
+msgstr "Crear…"
 
-#: ../src/applet.c:1002
-#, c-format
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "Escoyer una triba de conexón VPN"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"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."
 msgstr ""
-"\n"
-"La conexón VPN « %s » falló porque'l serviciu VPN nun arrancó a tiempu."
+"Escueyi la triba de VPN que quies usar pa la nueva conexón. Si la triba de "
+"conexón VPN que quies crear nun apaez na llista, pue ser que nun tengas "
+"instaláu'l complementu de VPN correutu."
 
-#: ../src/applet.c:1005
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "Señes de Difusión:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Co_nexón:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "Interface:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"La conexón VPN « %s » falló porque l'arranque del serviciu VPN falló."
 
-#: ../src/applet.c:1008
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "DNS primariu:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "bytes"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "_Seguridá:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
 msgstr ""
-"\n"
-"La conexón VPN « %s » falló porque nun había secretos VPN afayadizos."
 
-#: ../src/applet.c:1011
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Conexón cableada %d"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Activar _Rede"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "automáticu"
+
+#: ../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
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+msgid "default"
+msgstr "predetermináu"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"\n"
-"La conexón VPN « %s » falló por razones secretes VPN non afayadices."
 
-#: ../src/applet.c:1018
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Direición"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Direición"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+msgid "invalid %s for %s (%s)"
 msgstr ""
-"\n"
-"La conexón VPN «%s» falló."
 
-#: ../src/applet.c:1036
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+msgid "invalid %s (%s)"
 msgstr ""
-"\n"
-"La conexón VPN «%s» desconeutóse porque torgóse la conexón de rede."
 
-#: ../src/applet.c:1039
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+msgid "invalid interface-name for %s (%s)"
 msgstr ""
-"\n"
-"La conexón VPN «%s» desconeutóse porque paró el serviciu VPN."
 
-#: ../src/applet.c:1045
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+msgid "invalid interface-name (%s)"
 msgstr ""
-"\n"
-"La conexón VPN «%s» desconeutóse."
 
-#: ../src/applet.c:1079
-msgid "VPN Login Message"
-msgstr "Mensaxe de Rexistru VPN"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Cualisquier preséu"
 
-#: ../src/applet.c:1085 ../src/applet.c:1093 ../src/applet.c:1143
-msgid "VPN Connection Failed"
-msgstr "Falló la conexón VPN"
+#: ../src/connection-editor/ce-page.c:591
+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/applet.c:1150
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, 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
+msgid "FCoE"
 msgstr ""
-"\n"
-"La conexón VPN «%s» falló porque'l serviciu VPN falló al aniciase.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1153
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
 msgstr ""
-"\n"
-"La conexón VPN «%s» falló al aniciase.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1473
-msgid "device not ready (firmware missing)"
-msgstr "el preséu nun ta llistu (falta'l firmware)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1475
-msgid "device not ready"
-msgstr "el preséu nun ta preparáu"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1501
-msgid "Disconnect"
-msgstr "Desconeutar"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.c:1515
-msgid "device not managed"
-msgstr "el preséu nun ta remanáu"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.c:1559
-msgid "No network devices available"
-msgstr "Nun hai preseos de rede disponibles"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.c:1647
-msgid "_VPN Connections"
-msgstr "Conexones _VPN"
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.c:1704
-msgid "_Configure VPN..."
-msgstr "_Configurar VPN…"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.c:1708
-msgid "_Disconnect VPN"
-msgstr "_Desconeutar VPN"
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.c:1806
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager nun ta executándose…"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#: ../src/applet.c:1811 ../src/applet.c:2604
-msgid "Networking disabled"
-msgstr "Redes deshabilitaes"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2032
-msgid "Enable _Networking"
-msgstr "Activar _Rede"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2041
-msgid "Enable _Wireless"
-msgstr "Activar _Inalámbrica"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2050
-msgid "Enable _Mobile Broadband"
-msgstr "Activar la banda ancha _móvil"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2059
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Activar la banda ancha móvil WiMA_X"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#. Toggle notifications item
-#: ../src/applet.c:2070
-msgid "Enable N_otifications"
-msgstr "Activar _notificaciones"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#. 'Connection Information' item
-#: ../src/applet.c:2081
-msgid "Connection _Information"
-msgstr "I_nformación de la Conexón"
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2091
-msgid "Edit Connections..."
-msgstr "Editar les conexones…"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2105
-msgid "_Help"
-msgstr "_Ayuda"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2114
-msgid "_About"
-msgstr "Tocante _a"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2291
-msgid "Disconnected"
-msgstr "Desconeutáu"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2292
-msgid "The network connection has been disconnected."
-msgstr "Desconeutóse la conexón a la rede."
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2473
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "Tresnando la conexón de rede «%s»…"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:2476
-#, 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/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:2482
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "Conexón de rede «%s» activa"
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.c:2560
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "Aniciando conexón VPN «%s»…"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
 
-#: ../src/applet.c:2563
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "Necesítase autenticación d'usuariu pa la conexón VPN «%s»…"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
 
-#: ../src/applet.c:2566
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Solicitando una direición VPN pa «%s»…"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
 
-#: ../src/applet.c:2569
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "Conexón VPN «%s» activa"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.c:2608
-msgid "No network connection"
-msgstr "Nun hai conexón de rede"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/applet.c:3258
-msgid "NetworkManager Applet"
-msgstr "Aplicación NetworkManager"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "_Unlock"
-msgstr "_Desbloquiar"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Active Network Connections"
-msgstr "Conexones de rede actives"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Connection Information"
-msgstr "Información de la conexón"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "Autenticación cableada 802.1x"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:4
-msgid "_Network name:"
-msgstr "Nome de _rede:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:67
-msgid "automatic"
-msgstr "automáticu"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:305
-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:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+"Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
-"Si s'activa, esta conexón nunca va usase como conexón predeterminada de "
-"rede."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "Ig_nore automatically obtained routes"
-msgstr "I_norar caminos sacaos automáticamente"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "Use this c_onnection only for resources on its network"
-msgstr "Usar esta c_onexón sólo pa los recursos na so rede"
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:2
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "Sho_w password"
-msgstr "A_mosar la contraseña"
+msgid "_Username:"
+msgstr "Nome d'_usuariu:"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Password:"
-msgstr "_Contraseña:"
-
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "_Serviciu:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../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:4
+#: ../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
-msgid "_Username:"
-msgstr "Nome d'_usuariu:"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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
-msgid "Addresses"
-msgstr "Direiciones"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
+#: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automáticu"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-msgid "Automatic with manual DNS settings"
-msgstr "Automática con configuración manual de DNS"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Par cruzáu (TP)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-msgid "D_HCP client ID:"
-msgstr "ID del veceru D_HCP:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Interfaz d'unidá d'acoplamientu (AUI)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Interfaz independiente de medios (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "_Puertu:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_Velocidá:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "Full duple_x"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "Aut_onegociar"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "_Serviciu:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#, fuzzy
+msgid "C_loned MAC address:"
+msgstr "Direición MAC _clonada:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid ""
-"Domains used when resolving host names. Use commas to separate multiple "
-"domains."
+"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 ""
-"Dominios usaos al resolver nomes de host. Use comes pa xebrar múltiples "
-"dominios."
+"La dirección MAC introducida equí, va usase como direición de hardware pal "
+"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-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Predetermináu"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Inorar"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Señes de Difusión:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Contraseña de clave pri_vada:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
-"IP addresses of domain name servers used to resolve host names. Use commas "
-"to separate multiple domain name server addresses."
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
-"Direiciones IP de los sirvidores de nomes de dominiu usaos pa resolver nomes "
-"de host. Use comes pa xebrar múltiples direiciones de sirvidores de nomes "
-"de dominiu."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "Link-Local"
-msgstr "Enllaz-Llocal"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:191
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "_Coneutar"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr "Automática con configuración manual de DNS"
+
+#: ../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:10
-msgid "Require IPv4 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:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
+msgstr "Enllaz-Llocal"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/page-ip4.c:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../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
 msgid "Shared to other computers"
 msgstr ""
 "Automáticu\n"
@@ -1121,7 +1766,17 @@ msgstr ""
 "Enllaz llocal\n"
 "Compartida con otros equipos"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "_Method:"
+msgstr "_Métodu:"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Addresses"
+msgstr "Direiciones"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1131,39 +1786,95 @@ 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:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
-"When connecting to IPv6-capable networks, allows the connection to complete "
-"if IPv4 configuration fails but IPv6 configuration succeeds."
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
 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."
+"Dominios usaos al resolver nomes de host. Use comes pa xebrar múltiples "
+"dominios."
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr "ID del veceru D_HCP:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-msgid "DNS ser_vers:"
-msgstr "Sirvidores _DNS:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
+#, fuzzy
+msgid "S_earch domains:"
+msgstr "Dominios de _gueta:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "_Method:"
-msgstr "_Métodu:"
+#: ../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:"
+msgstr "Sirvidores _DNS:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses."
+msgstr ""
+"Direiciones IP de los sirvidores de nomes de dominiu usaos pa resolver nomes "
+"de host. Use comes pa xebrar múltiples direiciones de sirvidores de nomes de "
+"dominiu."
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#, 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:18
+msgid ""
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
+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:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Rutes…"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "_Search domains:"
-msgstr "Dominios de _gueta:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Desactiváu"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 ""
+"Direiciones IP de los sirvidores de nomes de dominiu usaos pa resolver nomes "
+"de host. Use comes pa xebrar múltiples direiciones de sirvidores de nomes de "
+"dominiu."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#, 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:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1172,274 +1883,262 @@ msgstr ""
 "configuración IPv6 falla pero la configuración IPv4 tien éxitu."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
+msgid "Basic"
+msgstr "Básica"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
+msgid "Nu_mber:"
+msgstr "Nú_mberu:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Avanzaes"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-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:5
-msgid "Any"
-msgstr "Cualquiera"
-
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Basic"
-msgstr "Básica"
+msgid "_APN:"
+msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "Cambiar…"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "N_etwork ID:"
 msgstr "ID de R_ede:"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr "Cambiar…"
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "Nu_mber:"
-msgstr "Nú_mberu:"
+msgid "P_IN:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "PI_N:"
-msgstr "PI_N:"
+#, 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
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Preferir 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Preferir 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "Sho_w passwords"
 msgstr "A_mosar les contraseñes"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
-msgstr "_APN:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "_Type:"
-msgstr "_Triba:"
-
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
-msgstr "Permitir compresión de datos _BSD"
+msgid "Authentication"
+msgstr "Identificación"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
-msgstr "Permitir compresión de datos _deflate"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Allowed methods:"
 msgstr "Métodos permitíos:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "Authentication"
-msgstr "Identificación"
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
+msgstr "Configurar _métodos…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Compression"
 msgstr "Compresión"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr "_Usar cifráu puntu-a-puntu (MPPE)"
+
 #: ../src/connection-editor/ce-page-ppp.ui.h:6
-msgid "Configure _Methods…"
-msgstr "Configurar _métodos…"
+msgid "_Require 128-bit encryption"
+msgstr "_Requerir cifráu de 128-bits"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:7
-msgid "Echo"
-msgstr "Ecu"
+msgid "Use _stateful MPPE"
+msgstr "Usar _estaos MPPE"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:8
-msgid "Send PPP _echo packets"
-msgstr "Unviar paquetes _echo PPP"
+msgid "Allow _BSD data compression"
+msgstr "Permitir compresión de datos _BSD"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Use TCP _header compression"
-msgstr "Usar compresión de ca_beceres TCP"
+msgid "Allow _Deflate data compression"
+msgstr "Permitir compresión de datos _deflate"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Use _stateful MPPE"
-msgstr "Usar _estaos MPPE"
+msgid "Use TCP _header compression"
+msgstr "Usar compresión de ca_beceres TCP"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "_Require 128-bit encryption"
-msgstr "_Requerir cifráu de 128-bits"
+msgid "Echo"
+msgstr "Ecu"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
-msgid "_Use point-to-point encryption (MPPE)"
-msgstr "_Usar cifráu puntu-a-puntu (MPPE)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+msgid "Send PPP _echo packets"
+msgstr "Unviar paquetes _echo PPP"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Co_nexón:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Interfaz d'unidá d'acoplamientu (AUI)"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
-msgstr "Aut_onegociar"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "Interface:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
-msgstr "BNC"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "Full duple_x"
-msgstr "Full duple_x"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "Direición MAC _clonada:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
-msgstr "Interfaz independiente de medios (MII)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-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"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
 msgstr ""
-"La dirección MAC introducida equí, va usase como direición de hardware pal "
-"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-wired.ui.h:13
-msgid "Twisted Pair (TP)"
-msgstr "Par cruzáu (TP)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid "_Cloned MAC address:"
-msgstr "Direición MAC _clonada:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-msgid "_Device MAC address:"
-msgstr "Direición MAC del _preséu:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-msgid "_Port:"
-msgstr "_Puertu:"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Speed:"
-msgstr "_Velocidá:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "bytes"
-msgstr "bytes"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "Seguridá:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
-msgid "Ban_d:"
-msgstr "Ban_da:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "C_hannel:"
-msgstr "_Canal:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "Infrastructure"
-msgstr "Infraestructura"
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "M_ode:"
-msgstr "M_ou:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr "_Potencia de la tresmisión:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-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/ce-page-wireless.ui.h:13
-msgid "Transmission po_wer:"
-msgstr "_Potencia de la tresmisión:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr "_Rate:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
-msgid "_Rate:"
-msgstr "_Rate:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr "_Canal:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_SSID:"
-msgstr "_SSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr "Ban_da:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "mW"
-msgstr "mW"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
-msgstr "_Seguridá:"
+#: ../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:1
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
 msgid "Allowed Authentication Methods"
 msgstr "Métodos d'identificación permitíos"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr "_EAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr "Extensible Authentication Protocol"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr "_PAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr "Password Authentication Protocol"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
-msgid "Extensible Authentication Protocol"
-msgstr "Extensible Authentication Protocol"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft Challenge Handshake Authentication Protocol"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft Challenge Handshake Authentication Protocol version 2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1448,196 +2147,654 @@ msgstr ""
 "d'identificación. Si la conexón falla, intenta desactivar el soporte pa "
 "dellos métodos."
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+#: ../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 automático"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Microsoft Challenge Handshake Authentication Protocol"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft Challenge Handshake Authentication Protocol version 2"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-msgid "Password Authentication Protocol"
-msgstr "Password Authentication Protocol"
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "DSL"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "_EAP"
-msgstr "_EAP"
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
+msgid "InfiniBand"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
+#: ../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
+msgid "Bond"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid "_PAP"
-msgstr "_PAP"
+#: ../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
+msgid "Team"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "Escoyer una triba de conexón VPN"
+#: ../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
+msgid "Bridge"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Create…"
-msgstr "Crear…"
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "Señes de Hardware:"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "Exportar conexón VPN…"
+
+#: ../src/connection-editor/connection-helpers.c:323
 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."
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
 msgstr ""
-"Escueyi la triba de VPN que quies usar pa la nueva conexón. Si la triba de "
-"conexón VPN que quies crear nun apaez na llista, pue ser que nun tengas "
-"instaláu'l complementu de VPN correutu."
+"El diálogu de l'editor de conexones nun pudo inicializase por un error "
+"desconocíu."
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "Nun pudo crease la nueva conexón"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "Falló desaniciar conexón"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:901
-#: ../src/connection-editor/page-ip6.c:867
+#: ../src/connection-editor/connection-helpers.c:517
+#, 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:804
+#: ../src/connection-editor/ip6-routes-dialog.c:746
+#: ../src/connection-editor/page-ip4.c:1068
+#: ../src/connection-editor/page-ip6.c:1066
 msgid "Address"
 msgstr "Direición"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:918
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Mázcara de rede"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:935
-#: ../src/connection-editor/page-ip6.c:901
+#: ../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
 msgid "Gateway"
 msgstr "Puerta d'enllaz"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Métricu"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:884
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefixu"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "Editando %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "Editando la conexón ensin nome"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Nome de la conexón:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Error al anicializar l'editor"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Falló amestar conexón"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+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:419
+msgid "_Save"
+msgstr "_Guardar"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "Guardar cualesquier cambéu fechu nesta conexón."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+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:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "Nun pudo crease la nueva conexón"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "Nun pudo editase la conexón"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, 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:581
+msgid "Error initializing editor"
+msgstr "Error al anicializar l'editor"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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-list.c:1482
-msgid "DSL"
-msgstr "DSL"
+msgid "Connection _name:"
+msgstr "_Nome de la conexón:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "E_sportar"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "nunca"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "agora"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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:623
+msgid "Name"
+msgstr "Nome"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "Caberu emplegu"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "Editar la conexón seleicionada"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "Autentíquese pa editar la conexón seleicionada"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "Desaniciar la conexón seleicionada"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "Autentíquese pa desaniciar la conexón seleicionada"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, 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:933
+msgid "Error creating connection"
+msgstr "Fallu al crear la conexón"
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr "Fallu al editar la conexón"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, 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
+msgid "802.1x Security"
+msgstr "Seguridá 802.1x"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "Nun pudo cargase l'interfaz d'usuariu pa seguridá WiFi."
+
+#: ../src/connection-editor/page-8021x-security.c:125
+#, 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
+msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:125
+#, 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
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "nun pudo alcontrase'l preséu Bluetooth."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Conexón cableada %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Activar _Rede"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Rede Wifi"
+
+#: ../src/connection-editor/page-bond.c:447
+#, fuzzy
+msgid "Could not load bond user interface."
+msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "DNS primariu:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "Conexón cableada %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+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
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, 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:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "Nun puede cargase l'interfaz d'usuariu DSL"
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Nun puede cargase l'interfaz d'usuariu DSL"
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexón DSL %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+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:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, 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
+#, fuzzy
+msgid "cloned MAC"
+msgstr "Direición MAC _clonada:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "Predetermináu"
+
+#: ../src/connection-editor/page-general.c:52
+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 nun ta executándose…"
+
+#: ../src/connection-editor/page-general.c:350
+#, 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
+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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+#, fuzzy
+msgid "Could not load InfiniBand user interface."
+msgstr "Nun pudo cargase l'interfaz d'usuariu pa WiFi."
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "Conexón cableada %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automáticu (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Namái direiciones automátiques (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Automáticu (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Namái direiciones automátiques (PPP)"
+msgid "Automatic, addresses only"
+msgstr "Automáticu, namái direiciones"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automáticu (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Namái direiciones automátiques (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automáticu (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 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:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Namái enllaz llocal"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Desactiváu"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "Sirvidores _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "Dominios de _gueta:"
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editando los caminos IPv4 pa %s"
 
-#: ../src/connection-editor/page-ip4.c:982
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Axustes de IPv4"
 
-#: ../src/connection-editor/page-ip4.c:984
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Nun puede cargase l'interfaz d'usuariu IPv4"
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "Automáticu, namái direiciones"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:285
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Inorar"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automáticu, DHCP únicamente"
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editando les rutes IPv6 pa %s"
 
-#: ../src/connection-editor/page-ip6.c:946
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Axustes de IPv6"
 
-#: ../src/connection-editor/page-ip6.c:948
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Nun pudo cargase la interface d'usuariu pa IPv6."
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
 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:398
+#: ../src/connection-editor/page-mobile.c:327
 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:639
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Esbillar la triba de proveedor de banda ancha móvil"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1645,426 +2802,268 @@ 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:679
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:568
 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-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "nengún"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Axustes de PPP"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Nun puede cargase l'interfaz d'usuariu pa PPP."
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1478
-msgid "VPN"
-msgstr "VPN"
+#: ../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 "Esbilla'l ficheru pa importar"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+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:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+msgid "Could not load team port user interface."
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Nun hai conexón de rede"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "Nun puede cargase l'interfaz d'usuariu IPv4"
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "Conexón VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Nun se puede cargar la interfaz d'usuariu de VPN."
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Nun pudo alcontrase'l serviciu plugin VPN pa '%s'."
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:884
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexón VPN %d"
 
-#: ../src/connection-editor/page-wired.c:88
-#: ../src/connection-editor/page-wireless.c:93
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 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-wired.c:267
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1466
-msgid "Wired"
-msgstr "Cableada"
-
-#: ../src/connection-editor/page-wired.c:269
-msgid "Could not load wired user interface."
-msgstr "Nun pudo cargase l'interfaz d'usuariu pa cable."
-
-#: ../src/connection-editor/page-wired.c:444
-#, c-format
-msgid "Wired connection %d"
-msgstr "Conexón cableada %d"
+"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/page-wired-security.c:116
-msgid "802.1x Security"
-msgstr "Seguridá 802.1x"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "Escoyer una triba de conexón VPN"
 
-#: ../src/connection-editor/page-wired-security.c:118
-msgid "Could not load Wired Security security user interface."
-msgstr "Nun se puede cargar la interfaz d'usuariu de seguridá de Wired Security"
+#: ../src/connection-editor/page-vpn.c:255
+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 ""
+"Escueyi la triba de VPN que quies usar pa la nueva conexón. Si la triba de "
+"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-wired-security.c:136
-msgid "Use 802.1X security for this connection"
-msgstr "Emplegar la seguridá 802.1x pa esta conexón"
+#: ../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 ""
+"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-wireless.c:166
-#: ../src/connection-editor/page-wireless.c:170
-#: ../src/connection-editor/page-wireless.c:191
-#, c-format
-msgid "default"
-msgstr "predetermináu"
+#: ../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)\""
+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-wireless.c:195
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:452
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1470
-msgid "Wireless"
-msgstr "Inalámbrica"
-
-#: ../src/connection-editor/page-wireless.c:454
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa WiFi."
 
-#: ../src/connection-editor/page-wireless.c:658
-#, c-format
-msgid "Wireless connection %d"
-msgstr "Conexón inalámbrica %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Cualisquier preséu"
 
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/libnm-gtk/nm-wireless-dialog.c:923
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Conexón cableada %d"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:272
-#: ../src/libnm-gtk/nm-wireless-dialog.c:932
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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-wireless-security.c:298
-#: ../src/libnm-gtk/nm-wireless-dialog.c:962
+#: ../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)"
 msgstr "WEP dinámica (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/libnm-gtk/nm-wireless-dialog.c:976
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 personal"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:990
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wireless-security.c:360
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Nun pudo cargase l'interfaz d'usuariu pa seguridá WiFi; falten los axustes "
 "WiFi."
 
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "Seguridá inalámbrica"
 
-#: ../src/connection-editor/page-wireless-security.c:372
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
 msgstr "Nun pudo cargase l'interfaz d'usuariu pa seguridá WiFi."
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Editing %s"
-msgstr "Editando %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:105
-msgid "Editing un-named connection"
-msgstr "Editando la conexón ensin nome"
-
-#: ../src/connection-editor/nm-connection-editor.c:288
-msgid ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
+msgid "missing SSID"
 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:391
-msgid "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:403
-msgid "_Save"
-msgstr "_Guardar"
-
-#: ../src/connection-editor/nm-connection-editor.c:404
-msgid "Save any changes made to this connection."
-msgstr "Guardar cualesquier cambéu fechu nesta conexón."
-
-#: ../src/connection-editor/nm-connection-editor.c:405
-msgid "_Save..."
-msgstr "_Guardar…"
-
-#: ../src/connection-editor/nm-connection-editor.c:406
-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.ui.h:1
-msgid "A_vailable to all users"
-msgstr "Disponible pa tolos usuarios"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "Coneutar _automáticamente"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
-msgstr "_Nome de la conexón:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "E_xport"
-msgstr "E_sportar"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "_Import"
-msgstr "_Importar"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "nunca"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "agora"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, 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:249
-#, 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:261
-#, 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:267
-#, 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:271
-#, 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:486
-msgid "Connection add failed"
-msgstr "Falló amestar conexón"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "Fallu al guardar la conexón"
 
-#: ../src/connection-editor/nm-connection-list.c:516
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "La propiedá «%s» / «%s» nun val: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
-msgid "An unknown error occurred."
-msgstr "Hebo un fallu desconocíu"
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "Error initializing editor"
-msgstr "Error al anicializar l'editor"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:703
-#: ../src/connection-editor/nm-connection-list.c:870
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
+msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
-"El diálogu de l'editor de conexones nun pudo inicializase por un error "
-"desconocíu."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "Nun pudo crease la nueva conexón"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "Nun pudo editase la conexón nueva"
-
-#: ../src/connection-editor/nm-connection-list.c:717
-msgid "Could not edit connection"
-msgstr "Nun pudo editase la conexón"
-
-#: ../src/connection-editor/nm-connection-list.c:747
-msgid "Connection delete failed"
-msgstr "Falló desaniciar conexón"
-
-#: ../src/connection-editor/nm-connection-list.c:779
-#, 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/nm-connection-list.c:914
-#: ../src/connection-editor/vpn-helpers.c:227
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Nun se ye quien a importar la conexón VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:916
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-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/nm-connection-list.c:929
-msgid "Could not edit imported connection"
-msgstr "Nun pudo editase la conexón importada"
-
-#: ../src/connection-editor/nm-connection-list.c:1099
-msgid "Name"
-msgstr "Nome"
-
-#: ../src/connection-editor/nm-connection-list.c:1111
-msgid "Last Used"
-msgstr "Caberu emplegu"
-
-#: ../src/connection-editor/nm-connection-list.c:1227
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr ""
-"Nun hai un complementu de VPN disponible. Instala ún p'activar esti botón."
-
-#: ../src/connection-editor/nm-connection-list.c:1238
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../src/connection-editor/nm-connection-list.c:1239
-msgid "Edit the selected connection"
-msgstr "Editar la conexón seleicionada"
-
-#: ../src/connection-editor/nm-connection-list.c:1240
-msgid "_Edit..."
-msgstr "_Editar..."
-
-#: ../src/connection-editor/nm-connection-list.c:1241
-msgid "Authenticate to edit the selected connection"
-msgstr "Autentíquese pa editar la conexón seleicionada"
-
-#: ../src/connection-editor/nm-connection-list.c:1256
-msgid "_Delete"
-msgstr "D_esaniciar"
-
-#: ../src/connection-editor/nm-connection-list.c:1257
-msgid "Delete the selected connection"
-msgstr "Desaniciar la conexón seleicionada"
-
-#: ../src/connection-editor/nm-connection-list.c:1258
-msgid "_Delete..."
-msgstr "_Desaniciar..."
-
-#: ../src/connection-editor/nm-connection-list.c:1259
-msgid "Authenticate to delete the selected connection"
-msgstr "Autentíquese pa desaniciar la conexón seleicionada"
-
-#: ../src/connection-editor/nm-connection-list.c:1538
-msgid "Error creating connection"
-msgstr "Fallu al crear la conexón"
-
-#: ../src/connection-editor/nm-connection-list.c:1539
-#, 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:1594
-#: ../src/connection-editor/nm-connection-list.c:1606
-msgid "Error editing connection"
-msgstr "Fallu al editar la conexón"
-
-#: ../src/connection-editor/nm-connection-list.c:1595
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "Desconozse cómo editar conexones «%s»"
-
-#: ../src/connection-editor/nm-connection-list.c:1607
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "Nun s'alcontró una conexón con UUID «%s»"
-
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2077,29 +3076,30 @@ msgstr ""
 "\n"
 "Erreur : %s."
 
-#: ../src/connection-editor/vpn-helpers.c:261
-msgid "Select file to import"
-msgstr "Esbilla'l ficheru pa importar"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Desconocida"
 
-#: ../src/connection-editor/vpn-helpers.c:309
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Un ficheru denomáu « %s » yá existe."
 
-#: ../src/connection-editor/vpn-helpers.c:311
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Trocar"
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:349
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Nun se pue esportar la conexón VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:351
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2110,121 +3110,61 @@ msgstr ""
 "\n"
 "Fallu : %s."
 
-#: ../src/connection-editor/vpn-helpers.c:385
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exportar conexón VPN…"
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Fallu al crear la conexón PAN: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "El to teléfonu ta llistu pa usase."
-
-#: ../src/gnome-bluetooth/bt-widget.c:249
-#, c-format
-msgid "%s Network"
-msgstr "Rede %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:375
-#, c-format
-msgid "Error: %s"
-msgstr "Fallu: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:488
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Fallu al crear la conexón DUN: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:511
-msgid "Mobile wizard was canceled"
-msgstr "Encaboxóse l'asistente móvil"
-
-#: ../src/gnome-bluetooth/bt-widget.c:520
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Triba de preséu de teléfonu desconocíu (nun ye GSM nin CDMA)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
-msgid "failed to connect to the phone."
-msgstr "falló al coneutar col teléfonu."
-
-#: ../src/gnome-bluetooth/bt-widget.c:753
-msgid "unexpectedly disconnected from the phone."
-msgstr "el teléfonu desconeutóse de sópitu."
-
-#: ../src/gnome-bluetooth/bt-widget.c:762
-msgid "timed out detecting phone details."
-msgstr "caducó'l tiempu al deteutar los detalles del teléfonu."
-
-#: ../src/gnome-bluetooth/bt-widget.c:774
-msgid "Detecting phone configuration..."
-msgstr "Deteutando la configuración del teléfonu…"
-
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "nun pudo alcontrase'l preséu Bluetooth."
-
-#: ../src/gnome-bluetooth/bt-widget.c:975
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"L'adautador de Bluetooth predetermináu tien de tar activáu enantes de "
-"configurar una conexón de rede de marcáu telefónicu."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1007
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"La configuración de Bluetooth nun ye dable (Nun pudo coneutase a D-Bus: %s)."
+"La miniaplicación Xestor de rede nun fue a atopar dellos ficheros de "
+"recursos (nun s'atopó'l ficheru .ui)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1017
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr ""
-"La configuración de Bluetooth nun ye dable (Nun pudo crease proxy D-Bus)"
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "_Desbloquiar"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1026
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
 msgstr ""
-"La configuración de Bluetooth nun ye dable (fallu al guetar NetworkManager: "
-"%s)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1093
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Usar el teléfonu móvil como un preséu de rede (PAN/NAP)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Información de la conexón"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1102
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Acceder a Internet usando'l teléfonu (DUN)"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "Conexones de rede actives"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
+#: ../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/libnm-gtk/nm-mobile-wizard.c:205
+#: ../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/libnm-gtk/nm-mobile-wizard.c:216
+#: ../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/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "El to plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
+#: ../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 "
@@ -2238,23 +3178,28 @@ msgstr ""
 "conexón de la banda ancha móvil, esbille «Conexones de rede» dende'l menú "
 "Sistema » Preferencies."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:264
+#: ../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/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Non llistáu"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../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/libnm-gtk/nm-mobile-wizard.c:504
+#: ../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/libnm-gtk/nm-mobile-wizard.c:528
+#: ../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"
@@ -2266,67 +3211,83 @@ msgstr ""
 "\n"
 "Si nun tu ta seguru del so plan de precios, entrugue al so proveedor."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../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/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "El mio plan nun ta na llista…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../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/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Fornidor"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../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 "Nun puedo alcontrar el mio fornidor y quiero introducilu a _man:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:789
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Proveedor:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../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/libnm-gtk/nm-mobile-wizard.c:819
+#: ../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/libnm-gtk/nm-mobile-wizard.c:830
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1092
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1099
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1145
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Escueye'l país o rexón del to fornidor"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1199
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Preséu GSM instaláu"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1202
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Preséu CDMA instaláu"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1374
+#: ../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."
@@ -2334,118 +3295,219 @@ 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/libnm-gtk/nm-mobile-wizard.c:1379
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Necesitará la siguiente información:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1394
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "El nome del fornidor de banda ancha"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1400
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "El nome del to plan de precios"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1406
+#: ../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 ""
 "(en dalgunos casos) El nome del plan de precios del to APN (nome del puntu "
 "d'accesu)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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 "Crear una conexón pa _esti preséu móvil de banda ancha:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Cualisquier preséu"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1625
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Conexón de banda ancha móvil nueva"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Contraseña:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Contraseña:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "A_mosar les contraseñes"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nuevu..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1077
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Denguna"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1161
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Necesítense les contraseñes o les claves d'encriptación pa l'accesu a la "
 "rede inalámbrica « %s »."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1163
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "Requierse autentificación pa la rede inalámbrica"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1165
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "Necesítase autentificación pa la rede inalámbrica"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1170
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "Crear Nueva Rede Wifi"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "Nueva rede inalámbrica"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1173
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, 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/libnm-gtk/nm-wireless-dialog.c:1175
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Coneutar a redes invisibles inalámbriques"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "Rede invisible inalámbrica"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "Escueyi'l nome y los detalles de seguridá de la rede invisibles inalámbrica "
 "a la que te quies coneutar."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Seguridá inalámbrica:"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Co_nexón:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
 msgstr "_Adaptador Wifi:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _security:"
-msgstr "_Seguridá inalámbrica:"
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
 
-#: ../src/main.c:73
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Usu:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"Esti programa ye un componente de NetworkManager "
-"(https://wiki.gnome.org/Projects/NetworkManager/)."
+"Esti programa ye un componente de NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -2453,178 +3515,286 @@ 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:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "Non habilitáu"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nun ta rexistráu"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Rede doméstica (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Rede doméstica"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "guetando"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "torgóse'l rexistru"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../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:153 ../src/mb-menu-item.c:159
+#: ../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:162
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Rede roaming (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Rede roaming"
 
-#: ../src/utils/nmn-mobile-providers.c:78
-msgid "United Kingdom"
-msgstr "Reinu Xuníu"
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
 
-#: ../src/utils/nmn-mobile-providers.c:512
-msgid "Default"
-msgstr "Predetermináu"
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "Necesítase un códigu PIN"
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"La miniaplicación Xestor de rede nun fue a atopar dellos ficheros de "
-"recursos (nun s'atopó'l ficheru .ui)."
+#: ../src/mobile-helpers.c:472
+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/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
-msgstr "Nun escoyiste dengún certificáu d'autoridá de certificación"
+#: ../src/mobile-helpers.c:619
+#, 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/wireless-security/eap-method.c:280
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "roaming"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Conexón DSL %d"
+
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"Nun emplegar el certificáu d'una Autoridá de certificación (CA) puede "
-"empobinate a una conexón a redes inalámbriques corrompíes o insegures. "
-"¿Quies escoyer un certificáu d'una Autoridá de certificación?"
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
-msgstr "Escueyi el certificáu CA"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:648
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:651
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificaos DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:372
-msgid "MD5"
-msgstr "MD5"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
-msgid "Choose a Certificate Authority certificate..."
-msgstr "Escueyi un certificáu d'una autoridá de certificación..."
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "Identidá anóni_ma:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "Identificación"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
 msgstr "Identidá anóni_ma:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "C_A certificate:"
-msgstr "Certificáu C_A:"
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file:"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
-msgid "I_nner authentication:"
+#: ../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
+#, fuzzy
+msgid "_Inner authentication:"
 msgstr "Autenticación i_nterna:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+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 "Escueyi un certificáu d'una autoridá de certificación..."
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
 msgstr "Versión 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:4
 msgid "Version 1"
 msgstr "Versión 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "_PEAP version:"
+#: ../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áu C_A:"
+
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "Certificáu C_A:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#, fuzzy
+msgid "PEAP _version:"
 msgstr "Versión _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-msgid "As_k for this password every time"
-msgstr "_Entrugar esta contraseña cada vegada"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Certificáu C_A:"
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Les claves privaes ensin cifrar nun son segures"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../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 "
@@ -2638,63 +3808,111 @@ msgstr ""
 "\n"
 "(Puedes protexer la to clave privada con una contraseña con openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Escueyi'l to certificáu personal..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Escueyi la to clave..."
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "I_dentidá:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "Certificáu del _usuariu:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "C_lave privada:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "Contraseña de clave pri_vada:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_User certificate:"
-msgstr "Certificáu del _usuariu:"
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:384
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:408
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:419
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:2
 #: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
-msgid "_Authentication:"
+#, fuzzy
+msgid "Au_thentication:"
 msgstr "_Autenticación:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Predetermináu)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
 msgid "Open System"
@@ -2705,22 +3923,273 @@ msgid "Shared Key"
 msgstr "Contraseña compartida"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "_Clave:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
 msgid "Sho_w key"
 msgstr "A_mosar la clave"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "Índ_iz WEP:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
-msgid "_Key:"
-msgstr "_Clave:"
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Triba:"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Conexón de banda ancha móvil (CDMA) nueva…"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Agora ta coneutáu a la rede CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "Rede CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Conexón móvil de banda ancha (GSM) nueva…"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Agora tas coneutáu a la rede GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "Rede GSM"
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Redes Inalámbriques (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Rede Wifi (%s)"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "la rede inalámbrica ta desactivada"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "la rede inalámbrica ta desactivada pol interruptor físicu"
+
+#~ msgid "Click on this icon to connect to a wireless network"
+#~ msgstr "Calca nesti iconu pa coneutate a una rede inalámbrica"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Tresnando la conexón de rede inalámbrica «%s»…"
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "Configurando la conexón de rede inalámbrica «%s»…"
 
-#~ msgid " "
-#~ msgstr " "
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Solicitando una direición de rede inalámbrica pa «%s»…"
 
-#~ msgid "Network Manager"
-#~ msgstr "Xestor de la rede"
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "La conexón de rede «%s» ta activa"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Banda ancha móvil WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Banda ancha móvil WiMAX"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Agora tas coneutáu a la rede WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "Desconocida"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ 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"
+
+#~ msgid "_Help"
+#~ msgstr "_Ayuda"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "Any"
+#~ msgstr "Cualquiera"
+
+#~ msgid "PI_N:"
+#~ msgstr "PI_N:"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Preferir 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Preferir 3G (UMTS/HSPA)"
+
+#~ msgid "MT_U:"
+#~ msgstr "MT_U:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Direición MAC del _preséu:"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infraestructura"
+
+#~ msgid "_SSID:"
+#~ msgstr "_SSID:"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Automáticu (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Namái direiciones automátiques (PPP)"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr ""
+#~ "Nun se puede cargar la interfaz d'usuariu de seguridá de Wired Security"
+
+#~ msgid "Wireless"
+#~ msgstr "Inalámbrica"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "Conexón inalámbrica %d"
+
+#~ msgid "_Save..."
+#~ msgstr "_Guardar…"
+
+#~ 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"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "La propiedá «%s» / «%s» nun val: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "Hebo un fallu desconocíu"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "Nun pudo editase la conexón importada"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr ""
+#~ "Nun hai un complementu de VPN disponible. Instala ún p'activar esti botón."
+
+#~ msgid "_Edit..."
+#~ msgstr "_Editar..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Desaniciar..."
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "Desconozse cómo editar conexones «%s»"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "El to teléfonu ta llistu pa usase."
+
+#~ msgid "%s Network"
+#~ msgstr "Rede %s"
+
+#~ 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"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Triba de preséu de teléfonu desconocíu (nun ye GSM nin CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "falló al coneutar col teléfonu."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "el teléfonu desconeutóse de sópitu."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "caducó'l tiempu al deteutar los detalles del teléfonu."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Deteutando la configuración del teléfonu…"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "L'adautador de Bluetooth predetermináu tien de tar activáu enantes de "
+#~ "configurar una conexón de rede de marcáu telefónicu."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr ""
+#~ "La configuración de Bluetooth nun ye dable (Nun pudo coneutase a D-Bus: "
+#~ "%s)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr ""
+#~ "La configuración de Bluetooth nun ye dable (Nun pudo crease proxy D-Bus)"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr ""
+#~ "La configuración de Bluetooth nun ye dable (fallu al guetar "
+#~ "NetworkManager: %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Usar el teléfonu móvil como un preséu de rede (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Acceder a Internet usando'l teléfonu (DUN)"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Reinu Xuníu"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Nun escoyiste dengún certificáu d'autoridá de certificación"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Nun emplegar el certificáu d'una Autoridá de certificación (CA) puede "
+#~ "empobinate a una conexón a redes inalámbriques corrompíes o insegures. "
+#~ "¿Quies escoyer un certificáu d'una Autoridá de certificación?"
 
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "Yá hai una instancia de nm-applet n'execución.\n"
@@ -2740,9 +4209,6 @@ msgstr "_Clave:"
 #~ msgid "GSM network"
 #~ msgstr "Rede GSM"
 
-#~ msgid "C_onnect"
-#~ msgstr "_Coneutar"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "Otra Rede Wifi..."
 
diff --git a/po/be.po b/po/be.po
index 3b5d94d8..485f85ff 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2013-01-15 13:02+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -18,7 +17,7 @@ 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
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Сетка"
 
@@ -90,62 +89,114 @@ msgid ""
 msgstr "Выключыць для аплета магчымасць стварэння adhoc-сеткі."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "Ігнараваць сертыфікат CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 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:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 "Выключыць папярэджанні аб сертыфікатах CA у другой фазе EAP-ідэнтыфікацыі."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Аплет NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Аплет NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Ідэнтыфікацыя 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "Да_лучыцца"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Назва сеткі:"
 
-#: ../src/applet.c:545
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Не ўдалося дадаць/уключыць злучэнне"
 
-#: ../src/applet.c:547 ../src/applet.c:591 ../src/applet.c:617
-#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Невядомая памылка"
 
-#: ../src/applet.c:550 ../src/applet.c:620 ../src/applet-device-wifi.c:1379
-#: ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Няўдалае злучэнне"
 
-#: ../src/applet.c:589
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Не ўдалося адлучыць прыстасаванне"
 
-#: ../src/applet.c:594
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Няўдалае адлучэнне"
 
-#: ../src/applet.c:615
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Не ўдалося ўключыць злучэнне"
 
-#: ../src/applet.c:985 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Больш не паказваць гэта паведамленне"
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -155,7 +206,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе з прычыны яго перапынення."
 
-#: ../src/applet.c:1077
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -164,7 +215,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе з прычыны нечаканага спынення VPN-службы."
 
-#: ../src/applet.c:1080
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -175,7 +226,7 @@ msgstr ""
 "VPN-злучэнне \"%s\" не працуе, бо VPN-служба вярнула хібную канфігурацыю "
 "настроек."
 
-#: ../src/applet.c:1083
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -185,7 +236,7 @@ msgstr ""
 "VPN-злучэнне \"%s\" не працуе, бо дасягнута максімальная колькасць спроб "
 "злучэння."
 
-#: ../src/applet.c:1086
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +245,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе, бо VPN-служба не запусцілася да часу."
 
-#: ../src/applet.c:1089
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -203,7 +254,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе з прычыны няўдалася запуску VPN-службы."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -213,7 +264,7 @@ msgstr ""
 "VPN-злучэнне \"%s\" не працуе з прычыны адсутнасці прыдатных сакрэтных "
 "ключоў."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -222,7 +273,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе праз хібныя сакрэтныя ключы."
 
-#: ../src/applet.c:1102
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -231,7 +282,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" не працуе."
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -241,7 +292,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" разарвана з прычыны яго перапынення."
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -250,7 +301,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" разарвана, бо VPN-служба была спынена."
 
-#: ../src/applet.c:1129
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -259,7 +310,7 @@ msgstr ""
 "\n"
 "VPN-злучэнне \"%s\" разарвана."
 
-#: ../src/applet.c:1159
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -270,19 +321,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1161
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Злучэнне VPN паспяхова ўсталявана.\n"
 
-#: ../src/applet.c:1163
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Паведамленне VPN-уваходу"
 
-#: ../src/applet.c:1169 ../src/applet.c:1177 ../src/applet.c:1227
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Няўдалае VPN-злучэнне"
 
-#: ../src/applet.c:1234
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -295,7 +346,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1237
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -308,667 +359,553 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1552
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "прыстасаванне не гатова (няма апаратнага апраграмавання)"
 
-#: ../src/applet.c:1554
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "прыстасаванне не гатова"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1564 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "няма злучэння"
 
-#: ../src/applet.c:1580
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Адлучыцца"
 
-#: ../src/applet.c:1594
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "прыстасаваннем нельга кіраваць"
 
-#: ../src/applet.c:1638
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Няма сеткавых прыстасаванняў"
 
-#: ../src/applet.c:1726
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "VPN-з_лучэнні"
 
-#: ../src/applet.c:1783
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Настройка VPN..."
 
-#: ../src/applet.c:1787
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Адлучыцца ад VPN"
 
-#: ../src/applet.c:1881
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager не запушчаны..."
 
-#: ../src/applet.c:1886 ../src/applet.c:2738
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Сеткавыя паслугі выключаны"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2107
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "_Уключыць сеткавыя паслугі"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2116
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "_Уключыць Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2125
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Уключыць _шырокапалосную мабільную сувязь"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2134
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Уключыць шырокапалосную _мабільную WiMAX-сувязь"
-
 #. Toggle notifications item
-#: ../src/applet.c:2145
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Уключыць _апавяшчэнні"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2156
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Інфармацыя аб _злучэнні"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2166
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Настройка злучэнняў..."
 
-#. Help item
-#: ../src/applet.c:2180
-msgid "_Help"
-msgstr "_Дапамога"
-
-#. About item
-#: ../src/applet.c:2189
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Аб праграме"
 
-#: ../src/applet.c:2367
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "Вы злучаны з \"%s\"."
+
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Адлучана"
 
-#: ../src/applet.c:2368
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Сеткавае злучэнне разарвана."
 
-#: ../src/applet.c:2601
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Падрыхтоўка сеткавага злучэння \"%s\"..."
 
-#: ../src/applet.c:2604
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr ""
 "Для сеткавага злучэння \"%s\" патрабуецца ідэнтыфікацыя карыстальніка..."
 
-#: ../src/applet.c:2607 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:615
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Запыт сеткавага адрасу для \"%s\"..."
 
-#: ../src/applet.c:2610
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Сеткавае злучэнне \"%s\" уключана"
 
-#: ../src/applet.c:2693
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Запуск VPN-злучэння \"%s\"..."
 
-#: ../src/applet.c:2696
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Для VPN-злучэння \"%s\" патрабуецца ідэнтыфікацыя карыстальніка..."
 
-#: ../src/applet.c:2699
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Запыт сеткавага адрасу для VPN-злучэння \"%s\"..."
 
-#: ../src/applet.c:2702
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-злучэнне \"%s\" уключана"
 
-#: ../src/applet.c:2743
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Няма сеткавага злучэння"
 
-#: ../src/applet.c:3444
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Аплет NetworkManager"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:767
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr "Хібны PUK-код. Звярніцеся да правайдара паслуг."
+
+#: ../src/applet-device-broadband.c:201
+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:252
+msgid "Sending unlock code..."
+msgstr "Пасылка коду разблакіравання..."
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Шырокапалоснае мабільнае злучэнне (%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
+msgid "Mobile Broadband"
+msgstr "Шырокапалоснае мабільнае злучэнне"
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Даступна"
 
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:811
-#: ../src/applet-device-gsm.c:399 ../src/applet-device-wimax.c:419
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "Вы злучаны з \"%s\"."
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr "Новае шырокапалоснае мабільнае злучэнне..."
 
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:815
-#: ../src/applet-device-gsm.c:403 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Злучэнне ўсталявана"
 
-#: ../src/applet-device-bt.c:200
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "Вы злучаны з шырокапалоснай мабільнай сеткай."
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr "Шырокапалосная мабільная сетка."
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "Вы зарэгістраваны ў дамашняй сетцы."
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "Вы зарэгістраваны ў роўмінг-сетцы."
+
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Вы злучаны з шырокапалоснай мабільнай сеткай."
 
-#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:606
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Падрыхтоўка шырокапалоснага мабільнага злучэння \"%s\"..."
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:609
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Настройка шырокапалоснага мабільнага злучэння \"%s\"..."
 
-#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:612
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
 "Для шырокапалоснага мабільнага злучэння \"%s\" патрабуецца ідэнтыфікацыя "
 "карыстальніка..."
 
-#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:632
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Шырокапалоснае мабільнае злучэнне \"%s\" уключана"
 
-#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:713
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:424
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Шырокапалоснае мабільнае злучэнне (%s)"
-
-#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:715
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
-#: ../src/libnm-gtk/nm-ui-utils.c:333
-msgid "Mobile Broadband"
-msgstr "Шырокапалоснае мабільнае злучэнне"
-
-#. Default connection item
-#: ../src/applet-device-cdma.c:316
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Новае шырокапалоснае мабільнае злучэнне (CDMA)..."
-
-#: ../src/applet-device-cdma.c:350
-msgid "You are now connected to the CDMA network."
-msgstr "Вы злучаны з CDMA-сеткай."
-
-#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
-msgid "CDMA network."
-msgstr "CDMA-сетка."
-
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:953
-#: ../src/applet-device-gsm.c:677
-msgid "You are now registered on the home network."
-msgstr "Вы зарэгістраваны ў дамашняй сетцы."
-
-#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:959
-#: ../src/applet-device-gsm.c:683
-msgid "You are now registered on a roaming network."
-msgstr "Вы зарэгістраваны ў роўмінг-сетцы."
-
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Аўта Ethernet"
 
-#: ../src/applet-device-ethernet.c:202
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Сеткі Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:204
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Сетка Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Сеткі Ethernet"
 
-#: ../src/applet-device-ethernet.c:209
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Сетка Ethernet"
 
-#: ../src/applet-device-ethernet.c:271
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Вы злучаны з сеткай Ethernet."
 
-#: ../src/applet-device-ethernet.c:297
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Падрыхтоўка сеткавага злучэння Ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Настройка сеткавага злучэння Ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:303
+#: ../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:306
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Запыт сеткавага адрасу для злучэння Ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:310
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Сеткавае злучэнне Ethernet \"%s\" уключана"
 
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-ідэнтыфікацыя"
 
-#: ../src/applet-device-broadband.c:165 ../src/applet-device-gsm.c:518
-msgid "Wrong PUK code; please contact your provider."
-msgstr "Хібны PUK-код. Звярніцеся да правайдара паслуг."
-
-#: ../src/applet-device-broadband.c:207 ../src/applet-device-gsm.c:495
-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:258 ../src/applet-device-gsm.c:545
-msgid "Sending unlock code..."
-msgstr "Пасылка коду разблакіравання..."
-
-#. Default connection item
-#: ../src/applet-device-broadband.c:780
-msgid "New Mobile Broadband connection..."
-msgstr "Новае шырокапалоснае мабільнае злучэнне..."
-
-#: ../src/applet-device-broadband.c:816
-msgid "You are now connected to the Mobile Broadband network."
-msgstr "Вы злучаны з шырокапалоснай мабільнай сеткай."
-
-#: ../src/applet-device-broadband.c:952 ../src/applet-device-broadband.c:958
-msgid "Mobile Broadband network."
-msgstr "Шырокапалосная мабільная сетка."
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Новае шырокапалоснае мабільнае злучэнне (GSM)..."
-
-#: ../src/applet-device-gsm.c:404
-msgid "You are now connected to the GSM network."
-msgstr "Вы злучаны з GSM-сеткай."
-
-#: ../src/applet-device-gsm.c:676 ../src/applet-device-gsm.c:682
-msgid "GSM network."
-msgstr "GSM-сетка."
-
-#: ../src/applet-device-wifi.c:98
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Злучыцца са схаванай сеткай Wi-Fi..."
 
-#: ../src/applet-device-wifi.c:149
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Стварыць _новую сетку Wi-Fi..."
 
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(няма)"
 
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Сеткі Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:789
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Сетка Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:905
 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:824
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi выключаны"
 
-#: ../src/applet-device-wifi.c:825
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi выключаны з дапамогай апаратнага пераключальніка"
 
-#: ../src/applet-device-wifi.c:886
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Больш сетак"
 
-#: ../src/applet-device-wifi.c:1065
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Даступныя сеткі Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1066
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Выкарыстайце меню са спісам сетак, каб злучыцца з сеткай Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Вы злучаны з сеткай Wi-Fi \"%s\"."
 
-#: ../src/applet-device-wifi.c:1291
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Падрыхтоўка сеткавага злучэння Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Настройка сеткавага злучэння Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr ""
 "Для сеткавага злучэння Wi-Fi \"%s\" патрабуецца ідэнтыфікацыя "
 "карыстальніка..."
 
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Запыт сеткавага адрасу для сеткі Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Сеткавае злучэнне Wi-Fi \"%s\" уключана: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Сеткавае злучэнне Wi-Fi \"%s\" уключана"
 
-#: ../src/applet-device-wifi.c:1374
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Не ўдалося ўключыць злучэнне"
 
-#: ../src/applet-device-wifi.c:1393
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Не ўдалося дадаць новае злучэнне"
 
-#: ../src/applet-device-wimax.c:227
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Шырокапалоснае мабільнае WiMAX-злучэнне (%s)"
-
-#: ../src/applet-device-wimax.c:229
-msgid "WiMAX Mobile Broadband"
-msgstr "Шырокапалоснае мабільнае WiMAX-злучэнне"
-
-#: ../src/applet-device-wimax.c:255
-msgid "WiMAX is disabled"
-msgstr "WiMAX-прыстасаванне выключана"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX-прыстасаванне выключана з дапамогай апаратнага пераключальніка"
-
-#: ../src/applet-device-wimax.c:424
-msgid "You are now connected to the WiMAX network."
-msgstr "Вы злучаны з WiMAX-сеткай."
-
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:627
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Шырокапалоснае мабільнае злучэнне \"%s\" уключана: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:630
-msgid "roaming"
-msgstr "роўмінг"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Памылка паказу інфармацыі аб злучэнні:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Дынамічны WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Адрасы"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Няма"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (прадвызначана)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мбіт/с"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Невядома"
 
-#: ../src/applet-dialogs.c:361
-#, c-format
-msgid "%d dB"
-msgstr "%d дБ"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Невядома"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP-адрас:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Адрас шырокай трансляцыі:"
 
-#: ../src/applet-dialogs.c:363
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "невядома"
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Невядома"
 
-#: ../src/applet-dialogs.c:375
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "невядома"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Маска падсеткі:"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Агульнае"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Інтэрфейс:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Апаратны адрас:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Драйвер:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Хуткасць:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Бяспека:"
 
-#: ../src/applet-dialogs.c:512
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:525
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "IP-адрас:"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Невядома"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "Адрас шырокай трансляцыі:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "Маска падсеткі:"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Невядома"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Прадвызначаны маршрут:"
 
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "Першы DNS:"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "Другі DNS:"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "Трэці DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ігнаравана"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Тып VPN:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Сеткавая брама VPN:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Карыстальнік VPN:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Банер VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Асноўнае злучэнне:"
 
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Невядома"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Дзейных злучэнняў не знойдзена!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -976,44 +913,44 @@ msgstr ""
 "Аўтарскія правы © 2005-2008 Novell, Inc.\n"
 "ды іншыя ўдзельнікі праекта"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Аплет абшару апавяшчэння для кіравання сеткавымі прыстасаваннямі і "
 "злучэннямі."
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Сеціўная пляцоўка NetworkManager"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Адсутныя рэсурсныя файлы"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Пароль да шырокапалоснай мабільнай сеткі"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Для злучэння з сеткай \"%s\" патрэбны пароль."
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:1310
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Патрэбны код разблакіравання PIN-коду"
 
-#: ../src/applet-dialogs.c:1311
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "Патрэбны код разблакіравання PIN-коду"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1313
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1023,25 +960,25 @@ msgstr ""
 "патрэбны код разблакіравання PIN-коду."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1315
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN-код:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1319
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Паказаць PIN-код"
 
-#: ../src/applet-dialogs.c:1321
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Патрэбны код разблакіравання PUK-коду"
 
-#: ../src/applet-dialogs.c:1322
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "Патрэбны код разблакіравання PUK-коду"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1324
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1051,29 +988,36 @@ msgstr ""
 "патрэбны код разблакіравання PUK-коду."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK-код:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Новы PIN-код:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Паўторна ўпішыце новы PIN-код:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Паказаць PIN- і PUK-коды"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1081,26 +1025,48 @@ msgstr ""
 "IP-адрасы вызначаюць ваш камп'ютар у сетцы. Пстрыкніце ў кнопку \"Дадаць\", "
 "каб дадаць IP-адрас."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Выдаліць"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "І_гнараваць аўтаматычна атрыманыя маршруты"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "_Выкарыстоўваць злучэнне толькі для рэсурсаў гэтай сеткі"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "Калі ўключана, гэтае злучэнне ніколі не будзе прадвызначаным."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1108,11 +1074,15 @@ msgstr "Калі ўключана, гэтае злучэнне ніколі не
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+msgid "Create…"
+msgstr "Стварыць..."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "Выберыце тып злучэння"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1124,10 +1094,6 @@ msgstr ""
 "Калі вы ствараеце VPN-злучэнне, а патрэбнага тыпу VPN няма ў спісе, гэта "
 "значыць, што ў сістэме не ўсталяваны адпаведны VPN-плугін."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:6
-msgid "Create…"
-msgstr "Стварыць..."
-
 #: ../src/connection-editor/ce-page-bond.ui.h:1
 msgid "Round-robin"
 msgstr ""
@@ -1169,65 +1135,91 @@ msgid "Bonded _connections:"
 msgstr "_Звязаныя злучэнні:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
 msgstr "_Рэжым:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
-msgid "_Edit"
-msgstr "_Змяніць"
-
-#. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "_Delete"
-msgstr "_Выдаліць"
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Змяніць"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "_Частата назіранняў:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "мс"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: ../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:"
 msgstr "_Назва інтэрфейсу:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "_Назіранне за фізічным злучэннем:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP-_мэты:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "_Затрымка для вызначэння ўсталявання злучэння:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "З_атрымка для вызначэння знікнення злучэння:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "Першы DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "байтаў"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "_Кошт маршруту:"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Прыярытэт:"
 
@@ -1239,41 +1231,287 @@ msgstr ""
 msgid "Bridged _connections:"
 msgstr "_Злучэнні моста:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "За_трымка перасылкі:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Час прывітання:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "с"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "_Уключыць сеткавыя паслугі"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_Уключыць STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Максімальны час існавання:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_Час старэння:"
 
-#: ../src/connection-editor/ce-page.c:72
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "аўтаматычна"
 
-#: ../src/connection-editor/ce-page.c:356
+#: ../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
+msgid "default"
+msgstr "прадвызначана"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Адрас"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Адрас"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Любое прыстасаванне"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "З прычыны невядомай памылкі не ўдалося абнавіць сакрэтныя ключы злучэння."
 
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "Ужыць _802.1X для бяспекі гэтага злучэння"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#, fuzzy
+msgid "Enable"
+msgstr "_Уключыць Wi-Fi"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#, fuzzy
+msgid "Priority"
+msgstr "_Прыярытэт:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#, fuzzy
+msgid "Priority Groups"
+msgstr "_Прыярытэт:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Priority:"
+msgstr "_Прыярытэт:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Priority Bandwidth:"
+msgstr "_Прыярытэт:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:10
+#: ../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
@@ -1286,15 +1524,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 msgid "Sho_w password"
 msgstr "_Паказаць пароль"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../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
@@ -1306,7 +1546,8 @@ msgstr "П_ароль:"
 #: ../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-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Аўтаматычна"
@@ -1361,18 +1602,18 @@ msgstr "_Аўтаматычнае дамаўленне"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "MAC-адрас _прыстасавання:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "Па_слуга:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "_Кланіраваны MAC-адрас:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1382,35 +1623,70 @@ msgstr ""
 "гэтага злучэння. Гэтую магчымасць яшчэ называюць кланіраваннем ці спуфінгам "
 "MAC-адрасу. Прыклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "байтаў"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Прадвызначана"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ігнараваць"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Шырокая трансляцыя"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Пароль прыватнага ключа:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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 this network when it is available"
-msgstr "_Аўтаматычна злучацца з гэтай сеткай пры яе наяўнасці"
+msgid "Automatically connect to _VPN when using this connection"
+msgstr "_Аўтаматычна злучацца з VPN для гэтага злучэння"
 
 #: ../src/connection-editor/ce-page-general.ui.h:2
 msgid "All _users may connect to this network"
 msgstr "Усе _карыстальнікі могуць злучацца з гэтай сеткай"
 
 #: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "Firewall _zone:"
-msgstr "Зона _брандмаўэра:"
+msgid "_Automatically connect to this network when it is available"
+msgstr "_Аўтаматычна злучацца з гэтай сеткай пры яе наяўнасці"
 
 #: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "_Аўтаматычна злучацца з VPN для гэтага злучэння"
+msgid "Firewall _zone:"
+msgstr "Зона _брандмаўэра:"
 
 #: ../src/connection-editor/ce-page-infiniband.ui.h:1
 msgid "_Transport mode:"
@@ -1433,8 +1709,8 @@ msgstr "Аўтаматычныя настройкі з уласным DNS"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Ручныя настройкі"
 
@@ -1445,22 +1721,22 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Даступна для іншых камп'ютараў"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_Метад:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Адрасы"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1470,8 +1746,8 @@ msgstr ""
 "дадатковыя настройкі для вашага камп'ютара. Калі вы хочаце выкарыстоўваць "
 "такі ідэнтыфікатар, упішыце яго тут."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1479,26 +1755,25 @@ msgstr ""
 "Дамены для вызначэння адрасоў хостаў. Можна падаць некалькі даменаў, "
 "падзяліўшы іх коскамі."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 msgid "D_HCP client ID:"
 msgstr "DHCP-ідэнтыфікатар _кліента:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "_Дамены пошуку:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "DNS-_серверы:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1506,98 +1781,92 @@ msgstr ""
 "IP-адрасы сервераў даменных назваў для вызначэння адрасоў хостаў. Можна "
 "падаць некалькі сервераў, падзяліўшы іх назвы коскамі."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 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:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "М_аршруты..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Выключана"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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-адрасы сервераў даменных назваў для вызначэння адрасоў хостаў. Можна "
+"падаць некалькі сервераў, падзяліўшы іх назвы коскамі."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Вымагаць настройкі IPv_6-сеткі для паспяховага злучэння"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 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
-msgid "Any"
-msgstr "Любы"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Аддаваць перавагу 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Аддаваць перавагу 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Аддаваць перавагу 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Ужыць толькі 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Просты"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "_Нумар:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Адмысловае"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "Пункт д_оступу (APN):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "Ідэнтыфікатар _сеткі:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Тып:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Змяніць..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "PIN-к_од:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr ""
 "Дазволіць _карыстанне роўмінг-паслугамі пры недаступнасці дамашняй сеткі"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "_Паказаць паролі"
 
@@ -1649,29 +1918,71 @@ msgstr "Рэха"
 msgid "Send PPP _echo packets"
 msgstr "Пасылаць р_эхавыя PPP-пакеты"
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+msgid "_Import team configuration from a file..."
+msgstr "Імпартаваць захаваную VPN-канфігурацыю..."
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "_Звязаныя злучэнні:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "Імпартаваць захаваную VPN-канфігурацыю..."
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Бацькоўскі інтэрфейс:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Назва VLAN-інтэрфейсу:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Кланіраваны MAC-адрас:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN-ід_энтыфікатар:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Назва прыстасавання + нумар"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + нумар"
 
@@ -1688,94 +1999,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 ГГц)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Інфраструктура"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "мВт"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "_Магутнасць перадачы:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Мбіт/с"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Частата:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Канал:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_Паласа:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "_Рэжым:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Дазволеныя метады ідэнтыфікацыі"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1784,98 +2099,78 @@ msgstr ""
 "ідэнтыфікацыі. Калі ж узнікаюць памылкі злучэння, паспрабуйце выключыць "
 "некаторыя з метадаў."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip4.c:928
-#: ../src/connection-editor/page-ip6.c:894
-msgid "Address"
-msgstr "Адрас"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/page-ip4.c:945
-msgid "Netmask"
-msgstr "Сеткавая маска"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-#: ../src/connection-editor/page-ip4.c:962
-#: ../src/connection-editor/page-ip6.c:928
-msgid "Gateway"
-msgstr "Сеткавая брама"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:813
-#: ../src/connection-editor/ip6-routes-dialog.c:755
-msgid "Metric"
-msgstr "Метрыка"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip6.c:911
-msgid "Prefix"
-msgstr "Прэфікс"
-
-#: ../src/connection-editor/new-connection.c:101
-#: ../src/connection-editor/page-ethernet.c:251
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:471 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:134
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:131
-#: ../src/connection-editor/page-infiniband.c:168
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/new-connection.c:143
-#: ../src/connection-editor/page-bridge.c:211
+#: ../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
+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
 msgid "Bridge"
 msgstr "Мост"
 
-#: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:252
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Апаратнае"
 
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Віртуальнае"
 
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Імпартаваць захаваную VPN-канфігурацыю..."
 
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -1883,29 +2178,79 @@ msgstr ""
 "Не ўдалося ініцыяваць дыялогавае акенца рэдактара злучэнняў з прычыны "
 "невядомай памылкі."
 
-#: ../src/connection-editor/new-connection.c:380
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Не ўдалося стварыць новае злучэнне"
 
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Не ўдалося выдаліць злучэнне"
 
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Ці вы сапраўды хочаце выдаліць злучэнне \"%s\"?"
 
-#: ../src/connection-editor/nm-connection-editor.c:118
+#: ../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
+msgid "Address"
+msgstr "Адрас"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Сеткавая маска"
+
+#: ../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
+msgid "Gateway"
+msgstr "Сеткавая брама"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Метрыка"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Прэфікс"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Змяненне %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Змяненне безназоўнага злучэння"
 
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Назва злучэння:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Памылка ініцыяцыі рэдактара"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Не ўдалося дадаць злучэнне"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -1913,72 +2258,63 @@ msgstr ""
 "Рэдактар злучэнняў не здолеў адшукаць некаторыя патрэбныя рэсурсы (.ui-файл "
 "не знойдзены)."
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Захаваць"
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Захаваць усе змены, зробленыя для гэтага злучэння."
 
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "_Save..."
-msgstr "_Захаваць..."
-
-#: ../src/connection-editor/nm-connection-editor.c:411
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Ідэнтыфікуйце сябе, каб захаваць гэта злучэнне для ўсіх карыстальнікаў "
 "камп'ютара."
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Не ўдалося стварыць злучэнне"
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Не ўдалося змяніць злучэнне"
 
-#: ../src/connection-editor/nm-connection-editor.c:429
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Невядомая памылка стварэння дыялогавага акенца для рэдактара злучэння."
 
-#: ../src/connection-editor/nm-connection-editor.c:536
-msgid "Error saving connection"
-msgstr "Памылка захавання злучэння"
-
-#: ../src/connection-editor/nm-connection-editor.c:537
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Уласцівасць \"%s\" / \"%s\" хібная: %d"
-
-#: ../src/connection-editor/nm-connection-editor.c:631
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Памылка ініцыяцыі рэдактара"
 
-#: ../src/connection-editor/nm-connection-editor.c:952
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Не ўдалося дадаць злучэнне"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: ../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
 msgid "Connection _name:"
 msgstr "_Назва злучэння:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Экспартаваць..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "ніколі"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "зараз"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -1986,7 +2322,7 @@ msgstr[0] "%d хвіліна таму"
 msgstr[1] "%d хвіліны таму"
 msgstr[2] "%d хвілін таму"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -1994,7 +2330,7 @@ msgstr[0] "%d гадзіна таму"
 msgstr[1] "%d гадзіны таму"
 msgstr[2] "%d гадзін таму"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2002,7 +2338,7 @@ msgstr[0] "%d дзень таму"
 msgstr[1] "%d дні таму"
 msgstr[2] "%d дзён таму"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2010,7 +2346,7 @@ msgstr[0] "%d месяц таму"
 msgstr[1] "%d месяцы таму"
 msgstr[2] "%d месяцаў таму"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2018,86 +2354,124 @@ msgstr[0] "%d год таму"
 msgstr[1] "%d гады таму"
 msgstr[2] "%d гадоў таму"
 
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Дата апошняга выкарыстання"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Змяніць вылучанае злучэнне"
 
-#: ../src/connection-editor/nm-connection-list.c:687
-msgid "_Edit..."
-msgstr "_Змяніць..."
-
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Ідэнтыфікуйце сябе, каб змагчы змяняць вылучанае злучэнне"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Выдаліць вылучанае злучэнне"
 
-#: ../src/connection-editor/nm-connection-list.c:704
-msgid "_Delete..."
-msgstr "_Выдаліць..."
-
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Ідэнтыфікуйце сябе,, каб змагчы выдаліць вылучанае злучэнне"
 
-#: ../src/connection-editor/nm-connection-list.c:942
-msgid "Error creating connection"
-msgstr "Памылка стварэння злучэння"
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:943
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Невядома, як ствараць злучэнні \"%s\""
 
-#: ../src/connection-editor/nm-connection-list.c:998
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "Памылка стварэння злучэння"
+
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Памылка змянення злучэння"
 
-#: ../src/connection-editor/nm-connection-list.c:999
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Злучэнне з UUID \"%s\" не знойдзена"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x-бяспека"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек бяспекі "
 "802.1x."
 
-#: ../src/connection-editor/page-8021x-security.c:141
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Ужыць _802.1X для бяспекі гэтага злучэння"
 
-#: ../src/connection-editor/page-bond.c:422
-msgid "Could not load bond user interface."
+#: ../src/connection-editor/page-bluetooth.c:58
+msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr ""
-"Не ўдалося загрузіць інтэрфейс карыстальніка для bond-злучэнняў."
 
-#: ../src/connection-editor/page-bond.c:561
+#: ../src/connection-editor/page-bluetooth.c:125
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr ""
+"Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек Ethernet."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Bond-злучэнне %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Сетка Ethernet"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Сетка Wi-Fi"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
+msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для bond-злучэнняў."
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "Першы DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bond-злучэнне %d"
 
-#: ../src/connection-editor/page-bridge.c:214
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
-msgstr ""
-"Не ўдалося загрузіць інтэрфейс карыстальніка для злучэнняў-мастоў."
+msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для злучэнняў-мастоў."
 
-#: ../src/connection-editor/page-bridge.c:309
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Злучэнне-мост %d"
@@ -2105,53 +2479,78 @@ msgstr "Злучэнне-мост %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Порт моста"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
+msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для порта злучэння-моста."
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
 msgstr ""
-"Не ўдалося загрузіць інтэрфейс карыстальніка для порта злучэння-моста."
+"Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек DSL."
 
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек DSL."
 
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL злучэнне %d"
 
-#: ../src/connection-editor/page-ethernet.c:90
-#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:113
-#: ../src/connection-editor/page-wimax.c:70
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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-адрасам. Прыклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:253
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек Ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:396
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Кланіраваны MAC-адрас:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:57
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: ../src/connection-editor/page-general.c:58
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2161,145 +2560,199 @@ msgstr ""
 "зона, а азначае, што будзе ўжыта прадвызначаная зона брандмаўэра. Настройка "
 "будзе карыснай, толькі калі ўключаны firewalld."
 
-#: ../src/connection-editor/page-general.c:59
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD не запушчаны."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
+msgstr "Не ўдалося загрузіць асноўны інтэрфейс карыстальніка."
+
+#: ../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 ""
-"Не ўдалося загрузіць асноўны інтэрфейс карыстальніка."
 
-#: ../src/connection-editor/page-infiniband.c:171
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек "
 "InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:263
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Злучэнне InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Аўтаматычна (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Толькі аўтаматычна атрыманыя адрасы (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Аўтаматычна (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Толькі аўтаматычна атрыманыя адрасы (PPP)"
+msgid "Automatic, addresses only"
+msgstr "Аўтаматычна, толькі адрасы"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Аўтаматычна (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Толькі аўтаматычна атрыманыя адрасы (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Аўтаматычна (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Толькі аўтаматычна атрыманыя адрасы (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Толькі лакальнае злучэнне"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Выключана"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Д_адатковыя DNS-серверы:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "_Дадатковыя домены пошуку:"
 
-#: ../src/connection-editor/page-ip4.c:860
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Змяненне IPv4-маршрутаў для %s"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4-настройкі"
 
-#: ../src/connection-editor/page-ip4.c:1013
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення IPv4-настроек."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "Аўтаматычна, толькі адрасы"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ігнараваць"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Аўтаматычна, толькі DHCP"
 
-#: ../src/connection-editor/page-ip6.c:826
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Змяненне IPv6-маршрутаў для %s"
 
-#: ../src/connection-editor/page-ip6.c:975
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6-настройкі"
 
-#: ../src/connection-editor/page-ip6.c:977
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення IPv6-настроек."
 
-#: ../src/connection-editor/page-master.c:290
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
 #, c-format
 msgid "%s slave %d"
 msgstr "Падпарадкаванае злучэнне %2$d (%1$s)"
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек "
 "шырокапалоснага мабільнага злучэння."
 
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Гэты тып шырокапалоснага мабільнага злучэння не падтрымліваецца."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:658
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Выберыце тып правайдара шырокапалоснага мабільнага злучэння"
 
-#: ../src/connection-editor/page-mobile.c:693
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2307,100 +2760,150 @@ msgstr ""
 "Вызначыце тэхналогію, якой карыстаецца ваш мабільны аператар. Калі вы не "
 "ўпэўнены, спытайце ў яго прадстаўнікоў."
 
-#: ../src/connection-editor/page-mobile.c:698
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Мой аператар выкарыстоўвае GSM-_тэхналогію (напрыклад, GPRS, EDGE, UMTS, "
 "HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:705
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Мой аператар выкарыстоўвае CDMA-т_эхналогію (напрыклад, 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:266
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "нічога"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:284
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Настройкі PPP-злучэння"
 
-#: ../src/connection-editor/page-ppp.c:286
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек PPP-"
 "злучэння."
 
-#: ../src/connection-editor/page-vlan.c:482
+#: ../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 "Выберыце файл для імпартавання"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для VLAN."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "DSL злучэнне %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+#, fuzzy
+msgid "Team Port"
+msgstr "Порт моста"
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Няма сеткавага злучэння"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
+msgstr "Не ўдалося загрузіць інтэрфейс карыстальніка для VLAN."
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
 msgstr ""
-"Не ўдалося загрузіць інтэрфейс карыстальніка для VLAN."
 
-#: ../src/connection-editor/page-vlan.c:678
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-злучэнне %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек VPN-"
 "злучэння."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Не ўдалося адшукаць службу VPN-плугіна для \"%s\"."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN злучэнне %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2410,11 +2913,11 @@ msgstr ""
 "\n"
 "Памылка: тып VPN-службы не вызначаны."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Выберыце тып VPN-злучэння"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2423,7 +2926,7 @@ msgstr ""
 "Вызначыце тып новага VPN-злучэння. Калі патрэбнага тыпу няма ў спісе, гэта "
 "значыць, што ў сістэме не ўсталяваны адпаведны VPN-плугін."
 
-#: ../src/connection-editor/page-wifi.c:98
+#: ../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"
@@ -2431,89 +2934,96 @@ msgstr ""
 "Гэтай опцыяй можна прывязаць злучэнне да пэўнага пункту доступу Wi-Fi, "
 "вызначанага яго BSSID-ідэнтыфікатарам. Прыклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:190
-#: ../src/connection-editor/page-wifi.c:194
-#: ../src/connection-editor/page-wifi.c:215
-#, c-format
-msgid "default"
-msgstr "прадвызначана"
+#: ../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)\""
+msgstr ""
+"Гэтай опцыяй можна прывязаць злучэнне да пэўнага сеткавага прыстасавання, "
+"вызначанага яго MAC-адрасам. Прыклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:219
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u МГц)"
 
-#: ../src/connection-editor/page-wifi.c:473
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек WiFi."
 
-#: ../src/connection-editor/page-wifi.c:650
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Любое прыстасаванне"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Злучэнне Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:265
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "Няма"
-
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP, 128-бітны пароль"
 
-#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Дынамічны WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:396
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек бяспекі "
 "WiFi. Адсутнічае настройка Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:407
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Бяспека Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:409
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек бяспекі "
 "WiFi."
 
-#: ../src/connection-editor/page-wimax.c:137
-msgid "Could not load WiMAX user interface."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
 msgstr ""
-"Не ўдалося загрузіць інтэрфейс карыстальніка для змянення настроек WiMAX."
 
-#: ../src/connection-editor/page-wimax.c:233
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Злучэнне WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Не ўдалося імпартаваць VPN-злучэнне"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2526,30 +3036,31 @@ msgstr ""
 "\n"
 "Памылка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "Выберыце файл для імпартавання"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Невядомая памылка"
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Файл з назвай \"%s\" ужо існуе."
 
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Замяніць"
 
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:332
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Не ўдалося экспартаваць VPN-злучэнне"
 
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2560,11 +3071,11 @@ msgstr ""
 "\n"
 "Памылка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Экспартаваць VPN-злучэнне..."
 
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../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)."
@@ -2572,131 +3083,49 @@ msgstr ""
 "Аплет NetworkManager не здолеў адшукаць некаторыя патрэбныя рэсурсы (.ui-"
 "файл не знойдзены)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "Немагчыма настроіць Bluetooth (не ўдалося злучыцца з D-Bus: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Немагчыма настроіць Bluetooth (не ўдалося знайсці NetworkManager: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:445
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Выкарыстоўваць мабільны тэлефон як сеткавае прыстасаванне (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:454
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Злучыцца з інтэрнэтам праз мабільны тэлефон (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:336
-#, c-format
-msgid "Error: %s"
-msgstr "Памылка: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:443
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Не ўдалося стварыць DUN-злучэнне: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:445
-#: ../src/gnome-bluetooth/nma-bt-device.c:959
-msgid "Your phone is now ready to use!"
-msgstr "Цяпер вы можаце карыстацца сваім тэлефонам."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:468
-msgid "Mobile wizard was canceled"
-msgstr "Мабільны памочнік скасаваны"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:477
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Невядомы тып тэлефона (ні GSM, ні CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:513
-msgid "unknown modem type."
-msgstr "невядомы тып мадэма."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:733
-#: ../src/gnome-bluetooth/nma-bt-device.c:739
-msgid "failed to connect to the phone."
-msgstr "не ўдалося злучыцца з тэлефонам."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:770
-msgid "unexpectedly disconnected from the phone."
-msgstr "нечакана адлучана ад тэлефона."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:780
-msgid "timed out detecting phone details."
-msgstr "вычарпаны тэрмін чакання падрабязнасцяў аб тэлефоне."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:791
-msgid "Detecting phone configuration..."
-msgstr "Апазнанне канфігурацыі тэлефона..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:823
-msgid "error getting bus connection"
-msgstr "памылка ўсталявання злучэння з камунікацыйнай магістраллю"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:920
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Для настройкі мадэмнага злучэння спачатку трэба ўключыць прадвызначаны "
-"Bluetooth-адаптар."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Не ўдалося стварыць PAN-злучэнне: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:978
-#, c-format
-msgid "%s Network"
-msgstr "Сетка %s"
-
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "Аўтаматычна разблакіраваць гэта прыстасаванне"
-
 #: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Разблакіраваць"
 
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "Аўтаматычна разблакіраваць гэта прыстасаванне"
+
 #: ../src/info.ui.h:1
 msgid "Connection Information"
 msgstr "Інфармацыя аб злучэнні"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Дзейныя сеткавыя злучэнні"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:208
+#: ../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/libnm-gtk/nm-mobile-wizard.c:215
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Прыстасаванне:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:226
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Мабільны аператар:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:237
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Тарыфны план:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: ../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 "
@@ -2710,23 +3139,28 @@ msgstr ""
 "шырокапалоснага мабільнага злучэння, выберыце пункт \"Сеткавыя злучэнні\" ў "
 "меню \"Асабістыя настройкі\"."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:274
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Пацвярджэнне настроек шырокапалоснай мабільнай сувязі"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:338
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Не ў спісе"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:493
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Вызначыце тарыфны план:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:517
+#: ../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/libnm-gtk/nm-mobile-wizard.c:541
+#: ../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"
@@ -2739,67 +3173,83 @@ msgstr ""
 "Калі вы не ўпэўнены, якім тарыфным планам вы карыстаецеся, спытайце ў свайго "
 "мабільнага аператара аб патрэбным пункце доступу (APN)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:548
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Выбар тарыфнага плана"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:597
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Мой тарыфны план адсутнічае ў спісе..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Выберыце свайго мабільнага _аператара са спіса:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Аператар"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: ../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/libnm-gtk/nm-mobile-wizard.c:803
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Аператар:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:827
+#: ../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/libnm-gtk/nm-mobile-wizard.c:833
+#: ../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/libnm-gtk/nm-mobile-wizard.c:844
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Выбар мабільнага аператара"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "Спіс краін і рэгіёнаў:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Краіна ці рэгіён"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Маёй краіны няма ў спісе"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1227
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Усталяванае GSM-прыстасаванне"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Усталяванае CDMA-прыстасаванне"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../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."
@@ -2807,118 +3257,142 @@ msgstr ""
 "Гэты памочнік дапаможа вам лёгка настроіць шырокапалоснае мабільнае злучэнне "
 "з сотавай 3G-сеткай."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Вам спатрэбіцца наступная інфармацыя:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Назва вашага мабільнага аператара"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Назва вашага тарыфнага плана"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../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 ""
 "Стварыць злучэнне для _гэтага прыстасавання шырокапалоснай мабільнай сувязі:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Любое прыстасаванне"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Настройка шырокапалоснага мабільнага злучэння"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Новае шырокапалоснае мабільнае злучэнне"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:367
-msgid "Wired"
-msgstr "Правадны"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:341
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:402
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "П_ароль:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:404
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "П_ароль:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%$2s (%$1s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:480 ../src/libnm-gtk/nm-ui-utils.c:500
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_Паказаць паролі"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Стварыць..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Няма"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Стварыць"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "Для доступу да сеткі Wi-Fi \"%s\" патрэбны пароль або ключ шыфравання."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Патрэбна ідэнтыфікацыя для сеткі Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Патрэбна ідэнтыфікацыя для сеткі Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Стварэнне новай сеткі Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Новая сетка Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Упішыце назву новай сеткі Wi-Fi."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Злучэнне са схаванай сеткай Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Схаваная сетка Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -2926,31 +3400,63 @@ msgstr ""
 "Упішыце назву і вызначыце настройкі бяспекі для схаванай сеткі Wi-Fi, з якой "
 "трэба злучыцца."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_Бяспека Wi-Fi:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "_Злучэнне:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "_Адаптар Wi-Fi:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Правілы карыстання:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"Гэта праграма з'яўляецца складовай часткай NetworkManager (https://wiki.gnome."
-"org/Projects/NetworkManager/)."
+"Гэта праграма з'яўляецца складовай часткай NetworkManager (https://wiki."
+"gnome.org/Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -2958,149 +3464,154 @@ msgstr ""
 "Яна не прызначана для запуску з загаднага радка, а выконваецца ў працоўным "
 "асяроддзі GNOME."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "выключана"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "няма рэгістрацыі"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Асноўная сетка (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Асноўная сетка"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "пошук"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "адмоўлена ў рэгістрацыі"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роўмінг)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Роўмінг-сетка (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Роўмінг-сетка"
 
-#: ../src/mobile-helpers.c:297
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN-код для SIM-карты \"%s\" у \"%s\""
 
-#: ../src/mobile-helpers.c:471
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Патрэбны PIN-код"
 
-#: ../src/mobile-helpers.c:479
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 "Для выкарыстання прыстасавання шырокапалоснага мабільнага інтэрнэту патрэбны "
 "PIN-код"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Шырокапалоснае мабільнае злучэнне \"%s\" уключана: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "роўмінг"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Злучэнне %s"
 
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "Сертыфікат CA не абраны"
-
-#: ../src/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"Адмова ад выкарыстання сертыфіката CA можа прывесці да злучэння з нічым не "
-"забяспечанымі ад несанкцыянаванага доступу сетак Wi-Fi. Вызначыць сертыфікат "
-"CA?"
 
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "Вызначэнне сертыфіката CA"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:648
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- ці PEM-сертыфікаты (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Выберыце PAC-файл..."
 
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC-файлы (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Усе файлы"
 
@@ -3127,8 +3638,8 @@ msgid "PAC _file:"
 msgstr "PAC-ф_айл:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "_Унутраная ідэнтыфікацыя:"
 
@@ -3136,14 +3647,32 @@ msgstr "_Унутраная ідэнтыфікацыя:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дазволіць _аўтаматычнае забеспячэнне PAC"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "Выберыце сертыфікат CA..."
 
@@ -3161,19 +3690,57 @@ msgstr "Версія 1"
 msgid "C_A certificate:"
 msgstr "_Сертыфікат CA:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "Ігнараваць сертыфікат CA"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "_Версія PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "_Штораз запытваць гэты пароль"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "_Сертыфікат CA:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Выкарыстанне незашыфраваных прыватных ключоў небяспечна"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../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 "
@@ -3187,11 +3754,11 @@ msgstr ""
 "\n"
 "(Абараніць прыватны ключ паролем можна з дапамогай openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Выберыце свой асабісты сертыфікат..."
 
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Выберыце свой прыватны ключ..."
 
@@ -3203,27 +3770,44 @@ msgstr "Ід_энтычнасць:"
 msgid "_User certificate:"
 msgstr "_Сертыфікат карыстальніка:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Прыватны _ключ:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "_Пароль прыватнага ключа:"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Тунэльны TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Абаронены EAP (PEAP)"
 
@@ -3233,29 +3817,55 @@ msgstr "Абаронены EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Ід_энтыфікацыя:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "Адкрытая сістэма"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "Супольны ключ"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:4
-msgid "2"
-msgstr "2"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "3"
+msgid "Open System"
+msgstr "Адкрытая сістэма"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "4"
+msgid "Shared Key"
+msgstr "Супольны ключ"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -3269,3 +3879,224 @@ msgstr "_Паказаць ключ"
 msgid "WEP inde_x:"
 msgstr "WEP-і_ндэкс:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Тып:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Уключыць шырокапалосную _мабільную WiMAX-сувязь"
+
+#~ msgid "_Help"
+#~ msgstr "_Дапамога"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Новае шырокапалоснае мабільнае злучэнне (CDMA)..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Вы злучаны з CDMA-сеткай."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA-сетка."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Новае шырокапалоснае мабільнае злучэнне (GSM)..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Вы злучаны з GSM-сеткай."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM-сетка."
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Шырокапалоснае мабільнае WiMAX-злучэнне (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Шырокапалоснае мабільнае WiMAX-злучэнне"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX-прыстасаванне выключана"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr ""
+#~ "WiMAX-прыстасаванне выключана з дапамогай апаратнага пераключальніка"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Вы злучаны з WiMAX-сеткай."
+
+#~ msgid "%d dB"
+#~ msgstr "%d дБ"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "невядома"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "невядома"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "Другі DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "Трэці DNS:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Рэжым:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "MAC-адрас _прыстасавання:"
+
+#~ msgid "Any"
+#~ msgstr "Любы"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Аддаваць перавагу 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Аддаваць перавагу 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Аддаваць перавагу 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Ужыць толькі 4G (LTE)"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Інфраструктура"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "_Save..."
+#~ msgstr "_Захаваць..."
+
+#~ msgid "Error saving connection"
+#~ msgstr "Памылка захавання злучэння"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Уласцівасць \"%s\" / \"%s\" хібная: %d"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Змяніць..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Выдаліць..."
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Аўтаматычна (PPP)"
+
+#~ 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)."
+#~ msgstr ""
+#~ "Немагчыма настроіць Bluetooth (не ўдалося злучыцца з D-Bus: (%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Немагчыма настроіць Bluetooth (не ўдалося знайсці NetworkManager: (%s) "
+#~ "%s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Выкарыстоўваць мабільны тэлефон як сеткавае прыстасаванне (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Злучыцца з інтэрнэтам праз мабільны тэлефон (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Памылка: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Не ўдалося стварыць DUN-злучэнне: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Цяпер вы можаце карыстацца сваім тэлефонам."
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Мабільны памочнік скасаваны"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Невядомы тып тэлефона (ні GSM, ні CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "невядомы тып мадэма."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "не ўдалося злучыцца з тэлефонам."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "нечакана адлучана ад тэлефона."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "вычарпаны тэрмін чакання падрабязнасцяў аб тэлефоне."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Апазнанне канфігурацыі тэлефона..."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "памылка ўсталявання злучэння з камунікацыйнай магістраллю"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Для настройкі мадэмнага злучэння спачатку трэба ўключыць прадвызначаны "
+#~ "Bluetooth-адаптар."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Не ўдалося стварыць PAN-злучэнне: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Сетка %s"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Сертыфікат CA не абраны"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Адмова ад выкарыстання сертыфіката CA можа прывесці да злучэння з нічым "
+#~ "не забяспечанымі ад несанкцыянаванага доступу сетак Wi-Fi. Вызначыць "
+#~ "сертыфікат CA?"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "Вызначэнне сертыфіката CA"
diff --git a/po/be@latin.po b/po/be@latin.po
index 0744fd46..04083219 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -7,406 +7,206 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-14 12:18+0200\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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
-msgid "Control your network connections"
-msgstr "Kiruj sietkavymi spałučeńniami"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#, fuzzy
+msgid "Network"
+msgstr "Sietka:"
 
 #: ../nm-applet.desktop.in.h:2
-msgid "Network Manager"
-msgstr "Sietkavy kiraŭnik"
+#, fuzzy
+msgid "Manage your network connections"
+msgstr "Kiruj sietkavymi spałučeńniami"
 
 #: ../nm-connection-editor.desktop.in.h:1
-msgid "Manage and change your network connection settings"
-msgstr "Kiruj i źmianiaj nałady sietkavych spałučeńniaŭ"
-
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.glade.h:7
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Network Connections"
 msgstr "Sietkavyja spałučeńni"
 
-#: ../src/applet-device-cdma.c:54
-msgid "Auto Mobile Broadband (CDMA) connection"
-msgstr "Aŭtamatyčnaje spałučeńnie Mobile Broadband (CDMA)"
-
-#: ../src/applet-device-cdma.c:204 ../src/applet-device-gsm.c:205
-msgid "Disconnect"
-msgstr "Adłučy"
-
-#: ../src/applet-device-cdma.c:243 ../src/applet-device-gsm.c:244
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Mobile Broadband (%s)"
-
-#: ../src/applet-device-cdma.c:245 ../src/applet-device-gsm.c:246
-#: ../src/connection-editor/page-mobile.c:286
-#: ../src/connection-editor/nm-connection-editor.glade.h:6
-#: ../src/connection-editor/nm-connection-list.c:1585
-msgid "Mobile Broadband"
-msgstr "Mabilny Broadband"
-
-#: ../src/applet-device-cdma.c:298 ../src/applet-device-gsm.c:299
-#: ../src/applet-device-wired.c:261
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "Ciapier ty spałučany z „%s”."
-
-#: ../src/applet-device-cdma.c:302 ../src/applet-device-gsm.c:303
-#: ../src/applet-device-wired.c:265 ../src/applet-device-wifi.c:1184
-msgid "Connection Established"
-msgstr "Spałučeńnie ŭstalavanaje"
-
-#: ../src/applet-device-cdma.c:303
-msgid "You are now connected to the CDMA network."
-msgstr "Ciapier ty spałučyŭsia ź sietkaj CDMA."
-
-#: ../src/applet-device-cdma.c:329 ../src/applet-device-gsm.c:330
-#, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "Padrychtoŭka spałučeńnia „Mobile Broadband” z „%s”..."
-
-#: ../src/applet-device-cdma.c:332 ../src/applet-device-gsm.c:333
-#, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "Kanfihuravańnie spałučeńnia „Mobile Broadband” z „%s”..."
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "Kiruj i źmianiaj nałady sietkavych spałučeńniaŭ"
 
-#: ../src/applet-device-cdma.c:335 ../src/applet-device-gsm.c:336
-#, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "Dla spałučeńnia „Mobile Broadband” z „%s” patrebnaja aŭtaryzacyja..."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+msgid "Disable connected notifications"
+msgstr ""
 
-#: ../src/applet-device-cdma.c:338 ../src/applet-device-gsm.c:339
-#: ../src/applet.c:1822
-#, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "Zapyt sietkavaha adrasu dla \"%s\"..."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
 
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:343
-#, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "Spałučeńnie „Mobile Broadband” z „%s” dziejničaje"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+msgid "Disable disconnected notifications"
+msgstr ""
 
-#: ../src/applet-device-cdma.c:458 ../src/applet-device-gsm.c:541
-msgid "Mobile broadband network password"
-msgstr "Parol dla sietki „Mobile Broadband”"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
 
-#: ../src/applet-device-cdma.c:467 ../src/applet-device-gsm.c:550
-#, c-format
-msgid "A password is required to connect to '%s'."
-msgstr "Kab spałučycca z sietkaju „%s”, treba padać parol."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+msgid "Disable VPN notifications"
+msgstr ""
 
-#: ../src/applet-device-cdma.c:485 ../src/applet-device-gsm.c:568
-#: ../src/applet.glade.h:22 ../src/connection-editor/ce-page-dsl.glade.h:1
-#: ../src/connection-editor/ce-page-mobile.glade.h:14
-msgid "Password:"
-msgstr "Parol:"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
 
-#: ../src/applet-device-gsm.c:55
-msgid "Auto Mobile Broadband (GSM) connection"
-msgstr "Aŭtamatyčnaje spałučeńnie „Mobile Broadband” (GSM)"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+#, fuzzy
+msgid "Suppress networks available notifications"
+msgstr "Jość biazdrotavyja sietki"
 
-#: ../src/applet-device-gsm.c:304
-msgid "You are now connected to the GSM network."
-msgstr "Ciapier ty spałučyŭsia ź sietkaj GSM."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
 
-#: ../src/applet-device-gsm.c:481
-msgid "PIN code required"
-msgstr "Vymahaje kodu PIN"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr ""
 
-#: ../src/applet-device-gsm.c:483
-msgid "PUK code required"
-msgstr "Vymahaje kodu PUK"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
 
-#: ../src/applet-device-gsm.c:492
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "Dla pryłady „Mobile Broadband” patrebny kod PIN."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
+msgid "Disable WiFi Create"
+msgstr ""
 
-#: ../src/applet-device-gsm.c:494
-msgid "PUK code is needed for the mobile broadband device"
-msgstr "Dla pryłady „Mobile Broadband” patrebny kod PUK."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
 
-#: ../src/applet-device-wired.c:63
-msgid "Auto Ethernet"
-msgstr "Auto Ethernet"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../src/applet-device-wired.c:197
-#, c-format
-msgid "Wired Networks (%s)"
-msgstr "Dracianyja sietki (%s)"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
 
-#: ../src/applet-device-wired.c:199
-#, c-format
-msgid "Wired Network (%s)"
-msgstr "Dracianaja sietka (%s)"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Abiary sertyfikat CA"
 
-#: ../src/applet-device-wired.c:202
-msgid "Wired Networks"
-msgstr "Dracianyja sietki"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
 
-#: ../src/applet-device-wired.c:204
-msgid "Wired Network"
-msgstr "Dracianaja sietka"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:227
-msgid "disconnected"
-msgstr "adłučana"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Sietkavy kiraŭnik"
 
-#: ../src/applet-device-wired.c:266
-msgid "You are now connected to the wired network."
-msgstr "Ciapier ty spałučany z dracianoj sietkaj."
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Sietkavy kiraŭnik"
 
-#: ../src/applet-device-wired.c:292
-#, c-format
-msgid "Preparing wired network connection '%s'..."
-msgstr "Padrychtoŭka dracianoha sietkavaha spałučeńnia \"%s\"..."
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
 
-#: ../src/applet-device-wired.c:295
-#, c-format
-msgid "Configuring wired network connection '%s'..."
-msgstr "Kanfihuravańnie dracianoha sietkavaha spałučeńnia \"%s\"..."
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
 
-#: ../src/applet-device-wired.c:298
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
-msgstr "Dla dracianoha sietkavaha spałučeńnia \"%s\" patrebnaja aŭtaryzacyja..."
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#, fuzzy
+msgid "802.1X authentication"
+msgstr "Aŭtaryzacyja dla dracianoj sietki 802.1X"
 
-#: ../src/applet-device-wired.c:301
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
-msgstr "Zapyt sietkavaha adrasu dla dracianoha spałučeńnia \"%s\"..."
+#: ../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
+msgid "_Cancel"
+msgstr ""
 
-#: ../src/applet-device-wired.c:305
-#, c-format
-msgid "Wired network connection '%s' active"
-msgstr "Dracianoje sietkavaje spałučeńnie \"%s\" dziejničaje"
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_Spałučy"
 
-#: ../src/applet-device-wired.c:558
-msgid "DSL authentication"
-msgstr "Aŭtaryzacyja DSL"
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#, fuzzy
+msgid "_Network name:"
+msgstr "_Nazva sietki:"
 
-#: ../src/applet-device-wifi.c:91
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "_Spałučy sa schavanaj biazdrotavaj sietkaju..."
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr ""
 
-#: ../src/applet-device-wifi.c:122
-msgid "Create _New Wireless Network..."
-msgstr "Stvary _novuju biazdrotavuju sietku..."
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
 
-#: ../src/applet-device-wifi.c:693
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "Biazdrotavyja sietki (%s)"
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "Spałučeńnie „Mobile Broadband”"
 
-#: ../src/applet-device-wifi.c:695
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "Biazdrotavaja sietka (%s)"
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "Nieviadoma"
 
-#: ../src/applet-device-wifi.c:697
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Biazdrotavaja sietka"
-msgstr[1] "Biazdrotavyja sietki"
-msgstr[2] "Biazdrotavyja sietki"
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "Niaŭdałaje spałučeńnie VPN"
 
-#: ../src/applet-device-wifi.c:714
-msgid "wireless is disabled"
-msgstr "biazdrotavyja sietkavyja pasłuhi vyklučanyja"
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "adłučana"
 
-#: ../src/applet-device-wifi.c:977
-msgid "Wireless Networks Available"
-msgstr "Jość biazdrotavyja sietki"
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "Adłučany"
 
-#: ../src/applet-device-wifi.c:978
-msgid "Click on this icon to connect to a wireless network"
-msgstr "Kab spałučycca ź biazdrotavaj sietkaj, klikni ŭ hetuju ikonu"
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "Niaŭdałaje spałučeńnie VPN"
 
-#: ../src/applet-device-wifi.c:981 ../src/applet.c:437
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Bolš nie pakazvaj hetaje paviedamleńnie"
 
-#: ../src/applet-device-wifi.c:1182
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "Ciapier ty spałučany ź biazdrotavaj sietkaj \"%s\"."
-
-#: ../src/applet-device-wifi.c:1183 ../src/applet-device-wifi.c:1214
-msgid "(none)"
-msgstr "(niama)"
-
-#: ../src/applet-device-wifi.c:1224
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Padrychtoŭka biazdrotavaha sietkavaha spałučeńnia \"%s\"..."
-
-#: ../src/applet-device-wifi.c:1227
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "Kanfihuravańnie biazdrotavaha sietkavaha spałučeńnia \"%s\"..."
-
-#: ../src/applet-device-wifi.c:1230
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr "Dla biazdrotavaj sietki \"%s\" patrebnaja aŭtaryzacyja..."
-
-#: ../src/applet-device-wifi.c:1233
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Zapyt sietkavaha adrasu dla biazdrotavaj sietki \"%s\"..."
-
-#: ../src/applet-device-wifi.c:1253
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "Biazdrotavaje sietkavaje spałučeńnie \"%s\" dziejničaje: %s (%d%%)"
-
-#: ../src/applet-device-wifi.c:1257
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "Biazdrotavaje sietkavaje spałučeńnie \"%s\" dziejničaje"
-
-#: ../src/applet-dialogs.c:53
-msgid "Error displaying connection information:"
-msgstr "Pamyłka pakazu źviestak ab spałučeńni:"
-
-#: ../src/applet-dialogs.c:84
-#: ../src/connection-editor/page-wireless-security.c:300
-#: ../src/wireless-dialog.c:815
-#: ../src/wireless-security/wireless-security.c:317
-msgid "LEAP"
-msgstr "LEAP"
-
-#: ../src/applet-dialogs.c:86
-msgid "Dynamic WEP"
-msgstr "Dynamičny WEP"
-
-#: ../src/applet-dialogs.c:88 ../src/applet-dialogs.c:189
-#: ../src/applet-dialogs.c:191
-msgid "WPA/WPA2"
-msgstr "WPA/WPA2"
-
-#: ../src/applet-dialogs.c:187
-msgid "WEP"
-msgstr "WEP"
-
-#: ../src/applet-dialogs.c:195 ../src/applet-dialogs.c:204
-#: ../src/connection-editor/page-wireless-security.c:261
-#: ../src/wireless-dialog.c:768
-msgid "None"
-msgstr "Niama"
-
-#: ../src/applet-dialogs.c:207 ../src/applet-dialogs.c:322
-msgid "Unknown"
-msgstr "Nieviadoma"
-
-#: ../src/applet-dialogs.c:258
-#, c-format
-msgid "Ethernet (%s)"
-msgstr "Ethernet (%s)"
-
-#: ../src/applet-dialogs.c:260
-#, c-format
-msgid "802.11 WiFi (%s)"
-msgstr "802.11 WiFi (%s)"
-
-#: ../src/applet-dialogs.c:262
-#, c-format
-msgid "GSM (%s)"
-msgstr "GSM (%s)"
-
-#: ../src/applet-dialogs.c:264
-#, c-format
-msgid "CDMA (%s)"
-msgstr "CDMA (%s)"
-
-#: ../src/applet-dialogs.c:269
-msgid "Interface:"
-msgstr "Interfejs:"
-
-#: ../src/applet-dialogs.c:285
-msgid "Hardware Address:"
-msgstr "Aparatny adras:"
-
-#: ../src/applet-dialogs.c:295
-msgid "Driver:"
-msgstr "Drajver:"
-
-#: ../src/applet-dialogs.c:314
-#, c-format
-msgid "%u Mb/s"
-msgstr "%u Mb/s"
-
-#: ../src/applet-dialogs.c:319
-msgid "Speed:"
-msgstr "Chutkaść:"
-
-#: ../src/applet-dialogs.c:329
-#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
-msgid "Security:"
-msgstr "Biaśpieka:"
-
-#: ../src/applet-dialogs.c:349
-msgid "IP Address:"
-msgstr "Adras IP:"
-
-#: ../src/applet-dialogs.c:365
-msgid "Broadcast Address:"
-msgstr "Tranślacyjny adras:"
-
-#: ../src/applet-dialogs.c:376
-msgid "Subnet Mask:"
-msgstr "Maska padsietki:"
-
-#: ../src/applet-dialogs.c:388
-msgid "Default Route:"
-msgstr "Zmoŭčany šlach:"
-
-#: ../src/applet-dialogs.c:403
-msgid "Primary DNS:"
-msgstr "Pieršy DNS:"
-
-#: ../src/applet-dialogs.c:414
-msgid "Secondary DNS:"
-msgstr "Druhi DNS:"
-
-#. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:477
-msgid "No valid active connections found!"
-msgstr "Niama pravilnych aktyŭnych spałučeńniaŭ!"
-
-#: ../src/applet-dialogs.c:603
-msgid ""
-"Copyright © 2004-2008 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc."
-msgstr ""
-"Aŭtarskija pravy © 2004-2008 Red Hat, Inc.\n"
-"Aŭtarskija pravy © 2005-2008 Novell, Inc."
-
-#: ../src/applet-dialogs.c:605
-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:607
-msgid "NetworkManager Website"
-msgstr "Sajt NetworkManagera"
-
-#: ../src/applet-dialogs.c:610
-msgid "translator-credits"
-msgstr "Ihar Hračyška <ihar.hrachyshka@gmail.com>"
-
-#: ../src/applet.c:507
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -416,7 +216,7 @@ msgstr ""
 "\n"
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\", bo sietka była pierarvanaja."
 
-#: ../src/applet.c:510
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -426,7 +226,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:513
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -437,7 +237,7 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\", bo pasłuha VPN viarnuła "
 "nieprydatnuju kanfihuracyju."
 
-#: ../src/applet.c:516
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -447,7 +247,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:519
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -457,7 +257,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:522
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -467,7 +267,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:525
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -477,7 +277,7 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\", bo nie staje prydatnych "
 "sakretaŭ VPN."
 
-#: ../src/applet.c:528
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -487,7 +287,7 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN „%s”, bo padadzienyja niapravilnyja "
 "sakrety VPN."
 
-#: ../src/applet.c:535
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -496,7 +296,7 @@ msgstr ""
 "\n"
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\"."
 
-#: ../src/applet.c:553
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -506,7 +306,7 @@ msgstr ""
 "\n"
 "Spałučeńnie VPN \"%s\" vyklučyłasia, bo sietka była abarvanaja."
 
-#: ../src/applet.c:556
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -515,7 +315,7 @@ msgstr ""
 "\n"
 "Spałučeńnie VPN \"%s\" vyklučyłasia, bo pasłuha VPN pierapyniła rabotu."
 
-#: ../src/applet.c:562
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -524,15 +324,27 @@ msgstr ""
 "\n"
 "Spałučeńnie VPN \"%s\" vyklučyłasia."
 
-#: ../src/applet.c:640
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Paviedamleńnie aŭtaryzacyi VPN"
 
-#: ../src/applet.c:652 ../src/applet.c:660 ../src/applet.c:704
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Niaŭdałaje spałučeńnie VPN"
 
-#: ../src/applet.c:711
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -545,7 +357,7 @@ msgstr ""
 "VPN.\n"
 "%s"
 
-#: ../src/applet.c:714
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -557,913 +369,2020 @@ msgstr ""
 "Nie ŭdałosia ŭklučyć spałučeńnie VPN \"%s\".\n"
 "%s"
 
-#: ../src/applet.c:1005
+#: ../src/applet.c:1280
+#, fuzzy
+msgid "device not ready (firmware missing)"
+msgstr "pryłada nie padrychtavanaja"
+
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "pryłada nie padrychtavanaja"
 
-#: ../src/applet.c:1021
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "adłučana"
+
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "Adłučy"
+
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "pryłada nie absłuhoŭvajecca"
 
-#: ../src/applet.c:1065
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Niama sietkavych pryładaŭ"
 
-#: ../src/applet.c:1153
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Spałučeńni _VPN"
 
-#: ../src/applet.c:1203
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Kanfihuruj VPN..."
 
-#: ../src/applet.c:1207
-msgid "_Disconnect VPN..."
+#: ../src/applet.c:1508
+#, fuzzy
+msgid "_Disconnect VPN"
 msgstr "_Adłučy VPN..."
 
-#: ../src/applet.c:1256
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nie ŭruchomleny..."
 
-#: ../src/applet.c:1261 ../src/applet.c:1951
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Sietkavyja pasłuhi vyklučanyja"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1441
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Uklučy _sietkavyja pasłuhi"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:1450
-msgid "Enable _Wireless"
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
 msgstr "Uklučy _biazdrotavuju sietku"
 
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+#, fuzzy
+msgid "Enable _Mobile Broadband"
+msgstr "Mabilny Broadband"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr ""
+
 #. 'Connection Information' item
-#: ../src/applet.c:1461
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Źviestki ab spałučeńni"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1471
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Redahuj spałučeńni..."
 
-#. Help item
-#: ../src/applet.c:1485
-msgid "_Help"
-msgstr "_Dapamoha"
-
-#. About item
-#: ../src/applet.c:1494
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Ab"
 
-#: ../src/applet.c:1667
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "Ciapier ty spałučany z „%s”."
+
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Adłučany"
 
-#: ../src/applet.c:1668
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Sietkavaje spałučeńnie adłučanaje."
 
-#: ../src/applet.c:1816
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Padrychtoŭka sietkavaha spałučeńnia \"%s\"..."
 
-#: ../src/applet.c:1819
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Dla sietkavaha spałučeńnia \"%s\" patrebnaja aŭtaryzacyja..."
 
-#: ../src/applet.c:1825
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Zapyt sietkavaha adrasu dla \"%s\"..."
+
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Sietkavaje spałučeńnie \"%s\" dziejničaje"
 
-#: ../src/applet.c:1906
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Uruchomleńnie spałučeńnia VPN \"%s\"..."
 
-#: ../src/applet.c:1909
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Dla spałučeńnia VPN „%s” patrebnaja aŭtaryzacyja..."
 
-#: ../src/applet.c:1912
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Zapyt adrasu VPN dla spałučeńnia \"%s\"..."
 
-#: ../src/applet.c:1915
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Spałučeńnie VPN \"%s\" dziejničaje"
 
-#: ../src/applet.c:1955
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Niama sietkavaha spałučeńnia"
 
-#: ../src/applet.c:2279
-msgid ""
-"The NetworkManager applet could not find some required resources.  It cannot "
-"continue.\n"
-msgstr ""
-"Aplet NetworkManager nia zmoh znajści niekatorych vymahanych resursaŭ. "
-"Niemahčyma praciahvać.\n"
-
-#: ../src/applet.c:2464
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Aplet NetworkManager"
 
-#: ../src/applet.c:2469 ../src/wired-dialog.c:128
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
 msgstr ""
-"Aplet NetworkManager nia zmoh znajści niekatorych vymahanych resursaŭ (fajł "
-"glade nia znojdzieny)."
 
-#: ../src/applet.glade.h:1 ../src/connection-editor/ce-mobile-wizard.glade.h:1
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:1
-msgid " "
-msgstr " "
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr ""
 
-#: ../src/applet.glade.h:2
-msgid ""
-"1 (Default)\n"
-"2\n"
-"3\n"
-"4"
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
 msgstr ""
-"1 (zmoŭčana)\n"
-"2\n"
-"3\n"
-"4"
 
-#: ../src/applet.glade.h:6
-msgid "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Mobile Broadband (%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
+msgid "Mobile Broadband"
+msgstr "Mabilny Broadband"
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
 msgstr ""
-"<span size=\"larger\" weight=\"bold\">Aktyŭnyja sietkavyja spałučeńni</span>"
 
-#: ../src/applet.glade.h:7
-msgid "Anonymous Identity:"
-msgstr "Ananimnaja tojesnaść:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "Spałučeńnie „Mobile Broadband”"
 
-#: ../src/applet.glade.h:8
-msgid "Authentication:"
-msgstr "Aŭtaryzacyja:"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Spałučeńnie ŭstalavanaje"
 
-#: ../src/applet.glade.h:9
-msgid "CA Certificate:"
-msgstr "Sertyfikat CA:"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "Ciapier ty spałučany z dracianoj sietkaj."
 
-#: ../src/applet.glade.h:10
-msgid "C_onnect"
-msgstr "_Spałučy"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "Parol dla sietki „Mobile Broadband”"
 
-#: ../src/applet.glade.h:11
-msgid "Connection Information"
-msgstr "Źviestki ab spałučeńni"
+#: ../src/applet-device-broadband.c:957
+#, fuzzy
+msgid "You are now registered on the home network."
+msgstr "Ciapier ty spałučany z dracianoj sietkaj."
+
+#: ../src/applet-device-broadband.c:963
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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:624
+#, 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
+msgid "Auto Ethernet"
+msgstr "Auto Ethernet"
+
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
+msgstr "Dracianyja sietki (%s)"
+
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
+msgstr "Dracianaja sietka (%s)"
+
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
+msgstr "Dracianyja sietki"
+
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
+msgstr "Dracianaja sietka"
+
+#: ../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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "DSL authentication"
+msgstr "Aŭtaryzacyja DSL"
+
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "_Spałučy sa schavanaj biazdrotavaj sietkaju..."
+
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
+msgstr "Stvary _novuju biazdrotavuju sietku..."
+
+#: ../src/applet-device-wifi.c:431
+msgid "(none)"
+msgstr "(niama)"
+
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Dracianyja sietki (%s)"
+
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Dracianaja sietka (%s)"
+
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Dracianaja sietka"
+msgstr[1] "Dracianaja sietka"
+msgstr[2] "Dracianaja sietka"
+
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "biazdrotavyja sietkavyja pasłuhi vyklučanyja"
+
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:996
+#, fuzzy
+msgid "More networks"
+msgstr "Dracianyja sietki"
+
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
+msgstr "Jość biazdrotavyja sietki"
+
+#: ../src/applet-device-wifi.c:1181
+#, 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:1364
+#, 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:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Padrychtoŭka sietkavaha spałučeńnia \"%s\"..."
+
+#: ../src/applet-device-wifi.c:1402
+#, 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:1405
+#, 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:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "Zapyt sietkavaha adrasu dla \"%s\"..."
+
+#: ../src/applet-device-wifi.c:1419
+#, 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:1423
+#, 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:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "Niama pravilnych aktyŭnych spałučeńniaŭ!"
+
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "Dadaj novaje spałučeńnie VPN"
+
+#: ../src/applet-dialogs.c:41
+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:332
+#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:948
+#: ../src/wireless-security/wireless-security.c:448
+msgid "LEAP"
+msgstr "LEAP"
+
+#: ../src/applet-dialogs.c:74
+msgid "Dynamic WEP"
+msgstr "Dynamičny WEP"
+
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
+msgid "WPA/WPA2"
+msgstr "WPA/WPA2"
+
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adras _MAC:"
+
+#: ../src/applet-dialogs.c:226
+msgid "WEP"
+msgstr "WEP"
+
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, 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
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
+
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#, fuzzy
+msgctxt "Speed"
+msgid "Unknown"
+msgstr "Nieviadoma"
+
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#, fuzzy
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Nieviadoma"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Adras IP:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Tranślacyjny adras:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+#, fuzzy
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Nieviadoma"
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Maska padsietki:"
+
+#: ../src/applet-dialogs.c:492
+#, c-format
+msgid "Ethernet (%s)"
+msgstr "Ethernet (%s)"
+
+#: ../src/applet-dialogs.c:495
+#, c-format
+msgid "802.11 WiFi (%s)"
+msgstr "802.11 WiFi (%s)"
+
+#: ../src/applet-dialogs.c:502
+#, c-format
+msgid "GSM (%s)"
+msgstr "GSM (%s)"
+
+#: ../src/applet-dialogs.c:504
+#, 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
+msgid "General"
+msgstr ""
+
+#: ../src/applet-dialogs.c:516
+msgid "Interface:"
+msgstr "Interfejs:"
+
+#: ../src/applet-dialogs.c:536
+msgid "Hardware Address:"
+msgstr "Aparatny adras:"
+
+#. Driver
+#: ../src/applet-dialogs.c:550
+msgid "Driver:"
+msgstr "Drajver:"
+
+#: ../src/applet-dialogs.c:585
+msgid "Speed:"
+msgstr "Chutkaść:"
 
-#: ../src/applet.glade.h:12
-msgid "Connection:"
+#: ../src/applet-dialogs.c:600
+msgid "Security:"
+msgstr "Biaśpieka:"
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+msgid "IPv4"
+msgstr ""
+
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Zmoŭčany šlach:"
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+msgid "IPv6"
+msgstr ""
+
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#, fuzzy
+msgid "Ignored"
+msgstr "Ihnaruj"
+
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "Typ:"
+
+#: ../src/applet-dialogs.c:822
+#, fuzzy
+msgid "VPN Gateway:"
+msgstr "Sietkavaja brama"
+
+#: ../src/applet-dialogs.c:828
+#, fuzzy
+msgid "VPN Username:"
+msgstr "Karystalnik:"
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
 msgstr "Spałučeńnie:"
 
-#: ../src/applet.glade.h:13
-msgid "Don't warn me again"
-msgstr "Bolš nie nahadvaj"
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr "Nieviadoma"
 
-#: ../src/applet.glade.h:14
-msgid "Identity:"
-msgstr "Tojesnaść:"
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:957
+msgid "No valid active connections found!"
+msgstr "Niama pravilnych aktyŭnych spałučeńniaŭ!"
 
-#: ../src/applet.glade.h:15
-msgid "Inner Authentication:"
-msgstr "Unutranaja aŭtaryzacyja:"
+#: ../src/applet-dialogs.c:985
+#, fuzzy
+msgid ""
+"Copyright © 2004-2014 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.glade.h:16
-msgid "Key:"
-msgstr "Kluč:"
+#: ../src/applet-dialogs.c:988
+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.glade.h:17
-msgid "No"
-msgstr "Nie"
+#: ../src/applet-dialogs.c:990
+msgid "NetworkManager Website"
+msgstr "Sajt NetworkManagera"
+
+#: ../src/applet-dialogs.c:1005
+msgid "Missing resources"
+msgstr ""
 
-#: ../src/applet.glade.h:18
+#: ../src/applet-dialogs.c:1030
+msgid "Mobile broadband network password"
+msgstr "Parol dla sietki „Mobile Broadband”"
+
+#: ../src/applet-dialogs.c:1039
+#, 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:1054
+msgid "Password:"
+msgstr "Parol:"
+
+#: ../src/applet-dialogs.c:1336
+#, fuzzy
+msgid "SIM PIN unlock required"
+msgstr "Vymahaje kodu PIN"
+
+#: ../src/applet-dialogs.c:1337
+#, 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:1339
+#, c-format
 msgid ""
-"Open System\n"
-"Shared Key"
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"Adkrytaja systema\n"
-"Supolny kluč"
 
-#: ../src/applet.glade.h:20
-msgid "Other Wireless Network..."
-msgstr "Inšaja biazdrotavaja sietka..."
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+#, fuzzy
+msgid "PIN code:"
+msgstr "Vymahaje kodu PIN"
 
-#: ../src/applet.glade.h:21
-msgid "PEAP Version:"
-msgstr "Versija PEAP:"
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr ""
 
-#: ../src/applet.glade.h:23
-msgid "Private Key Password:"
-msgstr "Parol pryvatnaha kluča:"
+#: ../src/applet-dialogs.c:1347
+#, fuzzy
+msgid "SIM PUK unlock required"
+msgstr "Vymahaje kodu PUK"
 
-#: ../src/applet.glade.h:24
-msgid "Private Key:"
-msgstr "Pryvatny kluč:"
+#: ../src/applet-dialogs.c:1348
+#, fuzzy
+msgid "SIM PUK Unlock Required"
+msgstr "Vymahaje kodu PUK"
 
-#: ../src/applet.glade.h:25
-msgid "Select A File"
-msgstr "Abiary fajł"
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr ""
 
-#: ../src/applet.glade.h:26
-msgid "Show key"
-msgstr "Pakažy kluč"
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+#, fuzzy
+msgid "PUK code:"
+msgstr "Vymahaje kodu PUK"
 
-#: ../src/applet.glade.h:27 ../src/connection-editor/ce-page-dsl.glade.h:3
-msgid "Show password"
-msgstr "Pakažy parol"
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr ""
 
-#: ../src/applet.glade.h:28 ../src/connection-editor/ce-page-mobile.glade.h:16
-msgid "Type:"
-msgstr "Typ:"
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr ""
 
-#: ../src/applet.glade.h:29
-msgid "User Certificate:"
-msgstr "Sertyfikat karystalnika:"
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+msgid "Show PIN/PUK codes"
+msgstr ""
 
-#: ../src/applet.glade.h:30
-msgid "User Name:"
-msgstr "Nazva karystalnika:"
+#: ../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 ""
 
-#: ../src/applet.glade.h:31
+#: ../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
 msgid ""
-"Version 0\n"
-"Version 1"
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"Versija 0\n"
-"Versija 1"
 
-#: ../src/applet.glade.h:33
-msgid "WEP Index:"
-msgstr "Indeks WEP:"
+#: ../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
+msgid "_Add"
+msgstr ""
 
-#: ../src/applet.glade.h:34
-msgid "Wireless _adapter:"
-msgstr "Biazdrotavy _adapter:"
+#. 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
+msgid "_Delete"
+msgstr ""
 
-#: ../src/applet.glade.h:35
-msgid "Yes"
-msgstr "Tak"
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+#, fuzzy
+msgid "Ig_nore automatically obtained routes"
+msgstr "Nie zvažaj na aŭtamatyčna atrymanyja maršruty"
 
-#: ../src/applet.glade.h:36
-msgid "_Network Name:"
-msgstr "_Nazva sietki:"
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+#, 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
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+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: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/applet.glade.h:37
-msgid "_Wireless Security:"
-msgstr "_Biazdrotavaja biaśpieka:"
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+#, fuzzy
+msgid "Create…"
+msgstr "_Stvary"
 
-#: ../src/applet.glade.h:38
-msgid "alert text"
-msgstr "tekst tryvohi"
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "Stvary spałučeńnie CDMA"
 
-#: ../src/connection-editor/ce-mobile-wizard.glade.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Choose a Mobile Broadband Connection</"
-"span>\n"
+"Select the type of connection you wish to create.\n"
 "\n"
-"Select or connect the mobile broadband device you wish to use for the new "
-"connection.  If the device is not available, you may select a generic "
-"connection type."
+"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."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Vybiery spałučeńnie \"Mobile Broadband\"</"
-"span>\n"
+"<span weight=\"bold\" size=\"larger\">Vybiery typ spałučeńnia VPN</span>\n"
 "\n"
-"Vybiery albo padłučy pryładu mabilnaha internetu, jakuju chočaš zadziejničać "
-"dla hetaha kamputara. Kali pryłady niama, možaš pasprabavać vybrać standartny "
-"typ spałučeńnia."
+"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
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "Tranślacyjny adras:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Niama sietkavaha spałučeńnia"
 
-#: ../src/connection-editor/ce-page.c:52
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "Interfejs:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "Pieršy DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "bajtaŭ"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+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.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Dracianoje spałučeńnie %d"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Uklučy _sietkavyja pasłuhi"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "aŭtamatyčna"
 
-#: ../src/connection-editor/ce-page-dsl.glade.h:2
-msgid "Service:"
+#: ../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
+msgid "default"
+msgstr "zmoŭčana"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adras _MAC:"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adras"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
 msgstr "Słužba:"
 
-#: ../src/connection-editor/ce-page-dsl.glade.h:4
-#: ../src/connection-editor/ce-page-mobile.glade.h:17
-msgid "Username:"
+#: ../src/connection-editor/ce-page.c:591
+#, 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
+#, 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
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+#, fuzzy
+msgid "FIP"
+msgstr "IP"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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
+#, fuzzy
+msgid "_Username:"
 msgstr "Karystalnik:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:1
-msgid "<b>Addresses</b>"
-msgstr "<b>Adrasy</b>"
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+#, fuzzy
+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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#, 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:"
+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
+#, fuzzy
+msgid "Automatic"
+msgstr "aŭtamatyčna"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:2
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#, fuzzy
+msgid "10 Mb/s"
+msgstr "Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#, fuzzy
+msgid "100 Mb/s"
+msgstr "%u Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_Chutkaść:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "Poŭny _dupleks"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "Aŭtamatyčna _damaŭlajsia"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "Słužba:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#, fuzzy
+msgid "C_loned MAC address:"
+msgstr "Adras _MAC:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid ""
-"Automatic\n"
-"Automatic with manual DNS settings\n"
-"Manual\n"
-"Link-Local\n"
-"Shared to other computers"
+"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 ""
-"Aŭtamatyčna\n"
-"Aŭtamatyčna z ułasnymi naładami DNS\n"
-"Uručnuju\n"
-"Miascovaje spałučeńnie\n"
-"Supolny ź inšymi kamputarami"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:7
-msgid "DHCP Client ID:"
-msgstr "Identyfikatar klijenta DHCP:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:8
-msgid "DNS Servers:"
-msgstr "Servery DNS:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "zmoŭčana"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ihnaruj"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Tranślacyjny adras:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:9
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Pakažy parol"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 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-page-ip4.glade.h:10
-msgid "Ignore automatically obtained routes"
-msgstr "Nie zvažaj na aŭtamatyčna atrymanyja maršruty"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:11
-msgid "Method:"
-msgstr "Metad:"
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, fuzzy
+msgid "All _users may connect to this network"
+msgstr "Ciapier ty spałučany z dracianoj sietkaj."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:12
-msgid "Routes..."
-msgstr "Maršruty..."
+#: ../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-ip4.glade.h:13
-msgid "Search Domains:"
-msgstr "Dameny pošuku:"
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:14
-msgid "Use this connection only for resources on its network"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:1
+msgid "_Transport mode:"
 msgstr ""
-"Vykarystaj hetaje spałučeńnie tolki dla suviazi z resursami ŭ jahonaj sietcy"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>Asablivaje</b>"
+#. IP-over-InfiniBand "datagram mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
+msgid "Datagram"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:2
-msgid "<b>Basic</b>"
-msgstr "<b>Prostaje</b>"
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "_Spałučy"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:3
-msgid "APN:"
-msgstr "APN:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr ""
+
+#: ../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 "Uručnuju"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#, 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:186
+#: ../src/connection-editor/page-ip6.c:204
+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
+#, fuzzy
+msgid "_Method:"
+msgstr "Metad:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:4
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#, fuzzy
+msgid "Addresses"
+msgstr "Adras"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
-"Any\n"
-"3G (UMTS/HSPA)\n"
-"2G (GPRS/EDGE)\n"
-"Prefer 3G (UMTS/HSPA)\n"
-"Prefer 2G (GPRS/EDGE)"
+"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 ""
-"Luboje\n"
-"3G (UMTS/HSPA)\n"
-"2G (GPRS/EDGE)\n"
-"Lepš 3G (UMTS/HSPA)\n"
-"Lepš 2G (GPRS/EDGE)"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:9
-msgid "Band:"
-msgstr "Pałasa:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:10
-msgid "Network:"
-msgstr "Sietka:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#, fuzzy
+msgid "D_HCP client ID:"
+msgstr "Identyfikatar klijenta DHCP:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:11
-msgid "Number:"
-msgstr "Numar:"
+#: ../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
+#, fuzzy
+msgid "S_earch domains:"
+msgstr "Dameny pošuku:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:12
-msgid "PIN:"
-msgstr "PIN:"
+#: ../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
+#, fuzzy
+msgid "DNS ser_vers:"
+msgstr "Servery DNS:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:13
-msgid "PUK:"
-msgstr "PUK:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+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-mobile.glade.h:15
-msgid "Show passwords"
-msgstr "Pakažy paroli"
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:1
-msgid "<b>Allowed Authentication Methods</b>"
-msgstr "<b>Dazvolenyja sposaby aŭtaryzacyi</b>"
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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-ppp.glade.h:2
-msgid "<b>Authentication</b>"
-msgstr "<b>Aŭtaryzacyja</b>"
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+#, fuzzy
+msgid "_Routes…"
+msgstr "Maršruty..."
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:3
-msgid "<b>Compression</b>"
-msgstr "<b>Kampresija</b>"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:4
-msgid "<b>Echo</b>"
-msgstr "<b>Recha</b>"
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:5
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 msgid ""
-"<i>In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods.</i>"
+"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 ""
-"<i>Čaściej za ŭsio, servery PPP tvajho pravajdera padtrmvajuć usie sposaby "
-"aŭtaryzacyi. Kali spałučeńni chibiać, pasprabuj vyklučyć niekatoryja sposaby "
-"aŭtaryzacyi.</i>"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:6
-msgid "Allow BSD data compression"
-msgstr "Dazvol kampresiju BSD"
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:7
-msgid "Allow Deflate data compression"
-msgstr "Dazvol kampresiju Deflate"
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:8
-msgid "Allowed methods:"
-msgstr "Dazvolenyja sposaby aŭtaryzacyi:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+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-ppp.glade.h:9
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:348
-msgid "CHAP"
-msgstr "CHAP"
+#: ../src/connection-editor/ce-page-mobile.ui.h:1
+msgid "Basic"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:10
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "Challenge Handshake Authentication Protocol"
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+#, fuzzy
+msgid "Nu_mber:"
+msgstr "Numar:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:11
-msgid "Configure Methods..."
-msgstr "Naładź sposaby aŭtaryzacyi..."
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "<b>Asablivaje</b>"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:12
-#: ../src/connection-editor/page-ppp.c:132
-msgid "EAP"
-msgstr "EAP"
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+#, fuzzy
+msgid "_APN:"
+msgstr "APN:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:13
-msgid "Extensible Authentication Protocol"
-msgstr "Extensible Authentication Protocol"
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#, fuzzy
+msgid "N_etwork ID:"
+msgstr "Sietka:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:14
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:318
-msgid "MSCHAP"
-msgstr "MSCHAP"
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#, fuzzy
+msgid "Change..."
+msgstr "Stvary..."
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:15
-msgid "MSCHAP v2"
-msgstr "MSCHAP v2"
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:16
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Microsoft Challenge Handshake Authentication Protocol"
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:17
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft Challenge Handshake Authentication Protocol version 2"
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#, fuzzy
+msgid "Sho_w passwords"
+msgstr "Pakažy paroli"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:18
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:303
-msgid "PAP"
-msgstr "PAP"
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#, fuzzy
+msgid "Authentication"
+msgstr "Aŭtaryzacyja:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:19
-msgid "Password Authentication Protocol"
-msgstr "Password Authentication Protocol"
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
+msgid "Allowed methods:"
+msgstr "Dazvolenyja sposaby aŭtaryzacyi:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:20
-msgid "Require 128-bit encryption"
-msgstr "Vymahaj 128-bitavaje šyfravańnie"
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+#, fuzzy
+msgid "Configure _Methods…"
+msgstr "Naładź sposaby aŭtaryzacyi..."
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:21
-msgid "Send PPP echo packets"
-msgstr "Vysyłaj rechavyja pakunki PPP"
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#, fuzzy
+msgid "Compression"
+msgstr "<b>Kampresija</b>"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:22
-msgid "Use Point-to-Point Encryption (MPPE)"
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#, fuzzy
+msgid "_Use point-to-point encryption (MPPE)"
 msgstr "Užyj šyfravańnie PPP (MPPE)"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:23
-msgid "Use Stateful MPPE"
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
+#, fuzzy
+msgid "_Require 128-bit encryption"
+msgstr "Vymahaj 128-bitavaje šyfravańnie"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+#, fuzzy
+msgid "Use _stateful MPPE"
 msgstr "Užyj poŭnastanavy MPPE"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:24
-msgid "Use TCP header compression"
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+#, fuzzy
+msgid "Allow _BSD data compression"
+msgstr "Dazvol kampresiju BSD"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
+#, fuzzy
+msgid "Allow _Deflate data compression"
+msgstr "Dazvol kampresiju Deflate"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+#, fuzzy
+msgid "Use TCP _header compression"
 msgstr "Užyj kampresiju zahałoŭkaŭ TCP"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:25
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:26
-msgid "gtk-ok"
-msgstr "gtk-ok"
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+#, fuzzy
+msgid "Send PPP _echo packets"
+msgstr "Vysyłaj rechavyja pakunki PPP"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:1
-msgid "Aut_onegotiate"
-msgstr "Aŭtamatyčna _damaŭlajsia"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.glade.h:2
-msgid ""
-"Automatic\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
 msgstr ""
-"Aŭtamatyčna\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:7
-msgid ""
-"Automatic\n"
-"Twisted Pair (TP)\n"
-"Attachment Unit Interface (AUI)\n"
-"BNC\n"
-"Media Independent Interface (MII)"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Dracianoje spałučeńnie %d"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
 msgstr ""
-"Aŭtamatyčna\n"
-"Źvitaja para (TP)\n"
-"Attachment Unit Interface (AUI)\n"
-"BNC\n"
-"Media Independent Interface (MII)"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:12
-msgid "Full duple_x"
-msgstr "Poŭny _dupleks"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "Interfejs:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:13
-#: ../src/connection-editor/ce-page-wireless.glade.h:8
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.glade.h:14
-#: ../src/connection-editor/ce-page-wireless.glade.h:13
-msgid "_MAC address:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "Adras _MAC:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:15
-msgid "_Port:"
-msgstr "_Port:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.glade.h:16
-msgid "_Speed:"
-msgstr "_Chutkaść:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.glade.h:17
-#: ../src/connection-editor/ce-page-wireless.glade.h:16
-msgid "bytes"
-msgstr "bajtaŭ"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:1
-msgid ""
-"Automatic\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
 msgstr ""
-"Aŭtamatyčna\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:4
-msgid "Ban_d:"
-msgstr "_Pałasa:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:5
-msgid "C_hannel:"
-msgstr "_Kanał:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:6
-msgid ""
-"Infrastructure\n"
-"Ad-hoc"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
 msgstr ""
-"Infrastruktura\n"
-"Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:9
-msgid "M_ode:"
-msgstr "_Režym:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:10
-msgid "Mb/s"
-msgstr "Mb/s"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "Biaśpieka:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:11
-msgid "Transmission po_wer:"
-msgstr "_Siła pieradačy:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
-msgid "_BSSID:"
-msgstr "_BSSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:14
-msgid "_Rate:"
-msgstr "_Častata:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:15
-msgid "_SSID:"
-msgstr "_SSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:2
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Choose a VPN Connection Type</span>\n"
-"\n"
-"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 ""
-"<span weight=\"bold\" size=\"larger\">Vybiery typ spałučeńnia VPN</span>\n"
-"\n"
-"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-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr "_Siła pieradačy:"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:5
-msgid "Create..."
-msgstr "Stvary..."
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr "Mb/s"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:501
-#: ../src/connection-editor/page-ip4.c:669
-msgid "Address"
-msgstr "Adras"
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr "_Častata:"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:517
-#: ../src/connection-editor/page-ip4.c:685
-msgid "Netmask"
-msgstr "Sietkavaja maska"
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr "_BSSID:"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:533
-#: ../src/connection-editor/page-ip4.c:701
-msgid "Gateway"
-msgstr "Sietkavaja brama"
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr "_Kanał:"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:549
-msgid "Metric"
-msgstr "Metryka"
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr "_Pałasa:"
 
-#: ../src/connection-editor/mobile-wizard.c:73
-msgid "Installed GSM device"
-msgstr "Zainstalavanaja pryłada GSM"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
 
-#: ../src/connection-editor/mobile-wizard.c:84
-msgid "Installed CDMA device"
-msgstr "Pryłada CDMA zainstalavanaja"
+#: ../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/mobile-wizard.c:150
-msgid "Create a GSM connection"
-msgstr "Stvary spałučeńnie GSM"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#, fuzzy
+msgid "Allowed Authentication Methods"
+msgstr "<b>Dazvolenyja sposaby aŭtaryzacyi</b>"
 
-#: ../src/connection-editor/mobile-wizard.c:151
-msgid "Create a CDMA connection"
-msgstr "Stvary spałučeńnie CDMA"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:143
-#: ../src/connection-editor/nm-connection-editor.glade.h:4
-#: ../src/connection-editor/nm-connection-list.c:1591
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/page-ip4.c:116
-msgid "Automatic (VPN)"
-msgstr "Aŭtamatyčna (VPN)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:117
-msgid "Automatic (VPN) addresses only"
-msgstr "Tolki aŭtamatyčnyja adrasy (VPN)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/page-ip4.c:120
-msgid "Automatic (PPP)"
-msgstr "Aŭtamatyčna (PPP)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:121
-msgid "Automatic (PPP) addresses only"
-msgstr "Tolki aŭtamatyčnyja adrasy (PPP)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/page-ip4.c:123
-msgid "Automatic (PPPoE)"
-msgstr "Aŭtamatyčna (PPPoE)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#, fuzzy
+msgid "_MSCHAP"
+msgstr "MSCHAP"
 
-#: ../src/connection-editor/page-ip4.c:124
-msgid "Automatic (PPPoE) addresses only"
-msgstr "Tolki aŭtamatyčnyja adrasy (PPPoE)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/page-ip4.c:126
-msgid "Automatic (DHCP)"
-msgstr "Aŭtamatyčna (DHCP)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#, fuzzy
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v2"
 
-#: ../src/connection-editor/page-ip4.c:127
-msgid "Automatic (DHCP) addresses only"
-msgstr "Tolki aŭtamatyčnyja adrasy (DHCP)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft Challenge Handshake Authentication Protocol version 2"
 
-#: ../src/connection-editor/page-ip4.c:152
-msgid "Manual"
-msgstr "Uručnuju"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#, 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 ""
+"<i>Čaściej za ŭsio, servery PPP tvajho pravajdera padtrmvajuć usie sposaby "
+"aŭtaryzacyi. Kali spałučeńni chibiać, pasprabuj vyklučyć niekatoryja sposaby "
+"aŭtaryzacyi.</i>"
 
-#: ../src/connection-editor/page-ip4.c:164
-msgid "Link-Local Only"
-msgstr "Tolki miascovaje spałučeńnie"
+#: ../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 "Auto Ethernet"
 
-#: ../src/connection-editor/page-ip4.c:170
-msgid "Shared to other computers"
-msgstr "Supolny ź inšymi kamputarami"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:597
-#, c-format
-msgid "Editing IPv4 routes for %s"
-msgstr "Redahavańnie maršrutaŭ IPv4 dla %s"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:638
-msgid "IPv4 Settings"
-msgstr "Nałady IPv4"
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "DSL"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-peap.c:304
-#: ../src/wireless-security/eap-method-ttls.c:333
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
+msgid "InfiniBand"
+msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:138
-msgid "none"
-msgstr "niama"
+#: ../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
+msgid "Bond"
+msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:198
-#, c-format
-msgid "Editing PPP authentication methods for %s"
-msgstr "Źmianieńnie sposabaŭ aŭtaryzacyi PPP dla %s"
+#: ../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
+msgid "Team"
+msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:282
-msgid "PPP Settings"
-msgstr "Nałady PPP"
+#: ../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
+msgid "Bridge"
+msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:70
-#: ../src/connection-editor/nm-connection-editor.glade.h:8
-#: ../src/connection-editor/nm-connection-list.c:1588
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/page-wired.c:180
-#: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:1578
-msgid "Wired"
-msgstr "Dracianoje"
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "Aparatny adras:"
 
-#: ../src/connection-editor/page-wired-security.c:81
-msgid "802.1x Security"
-msgstr "Biaśpieka 802.1x"
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
 
-#: ../src/connection-editor/page-wired-security.c:91
-msgid "Use 802.1X security for this connection"
-msgstr "Užyj biaśpieku dla hetaha spałučeńnia 802.1X"
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "Ekspartuj spałučeńnie VPN..."
 
-#: ../src/connection-editor/page-wireless.c:144
-#: ../src/connection-editor/page-wireless.c:148
-msgid "default"
-msgstr "zmoŭčana"
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:166
-#, c-format
-msgid "%u (%u MHz)"
-msgstr "%u (%u MHz)"
+#: ../src/connection-editor/connection-helpers.c:332
+#, fuzzy
+msgid "Could not create new connection"
+msgstr "Stvary spałučeńnie GSM"
 
-#: ../src/connection-editor/page-wireless.c:326
-#: ../src/connection-editor/nm-connection-editor.glade.h:10
-#: ../src/connection-editor/nm-connection-list.c:1581
-msgid "Wireless"
-msgstr "_Biazdrotavaje"
+#: ../src/connection-editor/connection-helpers.c:469
+#, fuzzy
+msgid "Connection delete failed"
+msgstr "Niaŭdałaje spałučeńnie VPN"
 
-#: ../src/connection-editor/page-wireless-security.c:230
-msgid "Wireless Security"
-msgstr "Biazdrotavaja biaśpieka"
+#: ../src/connection-editor/connection-helpers.c:517
+#, 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/page-wireless-security.c:278
-#: ../src/wireless-dialog.c:789
-msgid "WEP 40/128-bit Key"
-msgstr "WEP 40/128-bitavy kluč"
+#: ../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
+msgid "Address"
+msgstr "Adras"
 
-#: ../src/connection-editor/page-wireless-security.c:287
-#: ../src/wireless-dialog.c:798
-msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-bit Parolnaja fraza"
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Sietkavaja maska"
 
-#: ../src/connection-editor/page-wireless-security.c:313
-#: ../src/wireless-dialog.c:828
-msgid "Dynamic WEP (802.1x)"
-msgstr "Dynamičny WEP (802.1x)"
+#: ../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
+msgid "Gateway"
+msgstr "Sietkavaja brama"
 
-#: ../src/connection-editor/page-wireless-security.c:327
-#: ../src/wireless-dialog.c:842
-msgid "WPA & WPA2 Personal"
-msgstr "WPA & WPA2 Personal"
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Metryka"
 
-#: ../src/connection-editor/page-wireless-security.c:341
-#: ../src/wireless-dialog.c:856
-msgid "WPA & WPA2 Enterprise"
-msgstr "WPA i WPA2 Enterprise"
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Prefiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Redahavańnie %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:105
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Redahavańnie spałučeńnia biaz nazvy"
 
-#: ../src/connection-editor/nm-connection-editor.c:289
-msgid ""
-"The connection editor could not find some required resources (the "
-"NetworkManager applet glade file was not found)."
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Nazva spałučeńnia:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+msgid "Editor initializing..."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Spałučeńnie ŭstalavanaje"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
 msgstr ""
-"Redaktar spałučeńnia nia zmoh znajści niekatorych vymahanych resursaŭ (fajł "
-"glade apletu NetworkManager nia znojdzieny)."
 
-#: ../src/connection-editor/nm-connection-editor.c:302
+#: ../src/connection-editor/nm-connection-editor.c:283
+#, fuzzy
 msgid ""
-"The connection editor could not find some required resources (the glade file "
+"The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 "Redaktar spałučeńnia nia zmoh znajści niekatorych vymahanych resursaŭ (fajł "
 "glade nia znojdzieny)."
 
-#: ../src/connection-editor/nm-connection-editor.c:318
-msgid "Apply..."
-msgstr "Užyj..."
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "_Save"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:319
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:320
-msgid "Apply"
-msgstr "Užyj"
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "Stvary spałučeńnie GSM"
 
-#: ../src/connection-editor/nm-connection-editor.c:321
-msgid "Save this connection for all users of this machine."
-msgstr "Zrabi hetaje spałučeńnie dastupnym dla ŭsich karystalnikaŭ kamputara."
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not edit connection"
+msgstr "Niama sietkavaha spałučeńnia"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:1
-msgid "A_vailable to all users"
-msgstr "Dastupnaje dla ŭsich karystalnikaŭ"
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:2
-msgid "Connect _automatically"
-msgstr "_Spałučajsia aŭtamatyčna"
+#: ../src/connection-editor/nm-connection-editor.c:581
+#, fuzzy
+msgid "Error initializing editor"
+msgstr "Pamyłka inicyjalizacyi źviestak sertyfikatu: %s"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:3
+#: ../src/connection-editor/nm-connection-editor.c:921
+#, 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
 msgid "Connection _name:"
 msgstr "_Nazva spałučeńnia:"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:5
-msgid "E_xport"
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
 msgstr "_Ekspartuj"
 
-#: ../src/connection-editor/nm-connection-editor.glade.h:11
-msgid "_Import"
-msgstr "_Impartuj"
-
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nikoli"
 
-#: ../src/connection-editor/nm-connection-list.c:205
-#: ../src/connection-editor/nm-connection-list.c:216
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "ciapier"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:223
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -1471,7 +2390,7 @@ msgstr[0] "%d chvilina tamu"
 msgstr[1] "%d chviliny tamu"
 msgstr[2] "%d chvilinaŭ tamu"
 
-#: ../src/connection-editor/nm-connection-list.c:227
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -1479,7 +2398,7 @@ msgstr[0] "%d hadzina tamu"
 msgstr[1] "%d hadziny tamu"
 msgstr[2] "%d hadzinaŭ tamu"
 
-#: ../src/connection-editor/nm-connection-list.c:239
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -1487,7 +2406,7 @@ msgstr[0] "%d dzień tamu"
 msgstr[1] "%d dni tamu"
 msgstr[2] "%d dzion tamu"
 
-#: ../src/connection-editor/nm-connection-list.c:245
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -1495,7 +2414,7 @@ msgstr[0] "%d miesiac tamu"
 msgstr[1] "%d miesiacy tamu"
 msgstr[2] "%d miesiacaŭ tamu"
 
-#: ../src/connection-editor/nm-connection-list.c:249
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -1503,93 +2422,549 @@ msgstr[0] "%d hod tamu"
 msgstr[1] "%d hady tamu"
 msgstr[2] "%d hadoŭ tamu"
 
-#: ../src/connection-editor/nm-connection-list.c:306
-msgid "PolicyKit authorization was malformed."
-msgstr "Kiepskaja aŭtaryzacyja praz PolicyKit."
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "Nazva"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:684
+#, fuzzy
+msgid "Edit the selected connection"
+msgstr "Redahuj zaznačanaje spałučeńnie VPN"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+#, fuzzy
+msgid "Authenticate to edit the selected connection"
+msgstr "Vydal zaznačanaje spałučeńnie VPN"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+#, fuzzy
+msgid "Delete the selected connection"
+msgstr "Vydal zaznačanaje spałučeńnie VPN"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+#, fuzzy
+msgid "Authenticate to delete the selected connection"
+msgstr "Vydal zaznačanaje spałučeńnie VPN"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, 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:933
+#, fuzzy
+msgid "Error creating connection"
+msgstr "Niama sietkavaha spałučeńnia"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "Redahavańnie spałučeńnia biaz nazvy"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "Biaśpieka 802.1x"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+msgid "Could not load 802.1x Security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:125
+#, 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
+msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:125
+msgid "Could not load Bluetooth user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Dracianoje spałučeńnie %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "_Uvajdzi ŭ sietku"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "_Dracianaja sietka"
 
-#: ../src/connection-editor/nm-connection-list.c:312
-msgid "PolicyKit authorization could not be created."
-msgstr "Nie ŭdałosia stvaryć aŭtaryzacyju PolicyKit."
+#: ../src/connection-editor/page-bond.c:447
+#, fuzzy
+msgid "Could not load bond user interface."
+msgstr "Niemahčyma dekadavać pryvatny kluč."
 
-#: ../src/connection-editor/nm-connection-list.c:358
-#: ../src/connection-editor/nm-connection-list.c:479
-#: ../src/connection-editor/nm-connection-list.c:650
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "Pieršy DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "Dracianoje spałučeńnie %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "Niemahčyma dekadavać pryvatny kluč."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+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
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+msgid "Could not load bridge port user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "Niemahčyma dekadavać pryvatny kluč."
+
+#: ../src/connection-editor/page-dsl.c:129
+#, fuzzy
+msgid "Could not load DSL user interface."
+msgstr "Niemahčyma dekadavać pryvatny kluč."
+
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
-msgid "Could not obtain required privileges: %s."
-msgstr "Nie ŭdałosia atrymać patrebnyja dazvoły: %s."
+msgid "DSL connection %d"
+msgstr "Spałučeńnie DSL %d"
+
+#: ../src/connection-editor/page-ethernet.c:74
+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:328
+msgid "Could not load ethernet user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, 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
+msgid "cloned MAC"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:465
+#, fuzzy
+msgid "Wake-on-LAN password"
+msgstr "Pakažy parol"
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, fuzzy, c-format
+msgid "Ethernet connection %d"
+msgstr "Dracianoje spałučeńnie %d"
 
-#: ../src/connection-editor/nm-connection-list.c:361
-msgid "Could not remove system connection: permission denied."
-msgstr "Nie ŭdałosia vydalić systemnaje spałučeńnie: dostup zabaronieny."
+#. 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
+#, fuzzy
+msgid "Default"
+msgstr "zmoŭčana"
+
+#: ../src/connection-editor/page-general.c:52
+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 nie ŭruchomleny..."
+
+#: ../src/connection-editor/page-general.c:350
+msgid "Could not load General user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../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-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
+msgid "Automatic (VPN)"
+msgstr "Aŭtamatyčna (VPN)"
+
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
+msgid "Automatic (VPN) addresses only"
+msgstr "Tolki aŭtamatyčnyja adrasy (VPN)"
+
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+#, fuzzy
+msgid "Automatic, addresses only"
+msgstr "Tolki aŭtamatyčnyja adrasy (VPN)"
+
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
+msgid "Automatic (PPPoE)"
+msgstr "Aŭtamatyčna (PPPoE)"
 
-#: ../src/connection-editor/nm-connection-list.c:396
-#: ../src/connection-editor/nm-connection-list.c:406
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
+msgid "Automatic (PPPoE) addresses only"
+msgstr "Tolki aŭtamatyčnyja adrasy (PPPoE)"
+
+#: ../src/connection-editor/page-ip4.c:135
+msgid "Automatic (DHCP)"
+msgstr "Aŭtamatyčna (DHCP)"
+
+#: ../src/connection-editor/page-ip4.c:136
+msgid "Automatic (DHCP) addresses only"
+msgstr "Tolki aŭtamatyčnyja adrasy (DHCP)"
+
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
+msgid "Link-Local Only"
+msgstr "Tolki miascovaje spałučeńnie"
+
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "Servery DNS:"
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "Dameny pošuku:"
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
-msgid "Removing connection failed: %s."
-msgstr "Nie ŭdałosia vydalić spałučeńnie: %s."
+msgid "Editing IPv4 routes for %s"
+msgstr "Redahavańnie maršrutaŭ IPv4 dla %s"
 
-#: ../src/connection-editor/nm-connection-list.c:482
-msgid "Could not add system connection: permission denied."
-msgstr "Nie ŭdałosia dadać systemnaje spałučeńnie: dostup zabaronieny."
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr "Nałady IPv4"
+
+#: ../src/connection-editor/page-ip4.c:1160
+msgid "Could not load IPv4 user interface."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:529
-#: ../src/connection-editor/nm-connection-list.c:539
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
-msgid "Adding connection failed: %s."
-msgstr "Nie ŭdałosia dadać spałučeńnie: %s."
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:653
-msgid "Could not update system connection: permission denied."
-msgstr "Nie ŭdałosia aktualizavać systemnaje spałučeńnie: dostup zabaronieny."
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:711
-#: ../src/connection-editor/nm-connection-list.c:716
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
-msgid "Updating connection failed: %s."
-msgstr "Nie ŭdałosia aktualizavać spałučeńnie: %s."
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:840
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
-msgid "Wired connection %d"
-msgstr "Dracianoje spałučeńnie %d"
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
+msgid "Ignore"
+msgstr "Ihnaruj"
+
+#: ../src/connection-editor/page-ip6.c:172
+#, fuzzy
+msgid "Automatic, DHCP only"
+msgstr "Aŭtamatyčna (DHCP)"
+
+#: ../src/connection-editor/page-ip6.c:964
+#, fuzzy, c-format
+msgid "Editing IPv6 routes for %s"
+msgstr "Redahavańnie maršrutaŭ IPv4 dla %s"
+
+#: ../src/connection-editor/page-ip6.c:1155
+#, fuzzy
+msgid "IPv6 Settings"
+msgstr "Nałady IPv4"
 
-#: ../src/connection-editor/nm-connection-list.c:852
+#: ../src/connection-editor/page-ip6.c:1157
+msgid "Could not load IPv6 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
-msgid "Wireless connection %d"
-msgstr "Biazdrotavaje spałučeńnie %d"
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:871
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
-msgid "GSM connection %d"
-msgstr "Spałučeńnie GSM %d"
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:890
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
-msgid "CDMA connection %d"
-msgstr "Spałučeńnie CDMA %d"
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:917
-#: ../src/connection-editor/nm-connection-list.c:1233
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
-msgid "VPN connection %d"
-msgstr "Spałučeńnie VPN %d"
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
 #, c-format
-msgid "DSL connection %d"
-msgstr "Spałučeńnie DSL %d"
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1145
+#: ../src/connection-editor/page-master.c:260
 #, 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?"
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1259
-#: ../src/connection-editor/vpn-helpers.c:229
-msgid "Cannot import VPN connection"
-msgstr "Niemahčyma zimpartavać spałučeńnie VPN"
+#: ../src/connection-editor/page-master.c:385
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
+msgid "Could not load mobile broadband user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:327
+#, 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:529
+#, fuzzy
+msgid "Select Mobile Broadband Provider Type"
+msgstr "Mabilny Broadband"
+
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:561
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:568
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+#, fuzzy
+msgid "CDMA"
+msgstr "CDMA (%s)"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+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:258
+msgid "PAP"
+msgstr "PAP"
+
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
+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
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
+
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:136
+msgid "none"
+msgstr "niama"
+
+#: ../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
+msgid "PPP Settings"
+msgstr "Nałady PPP"
+
+#: ../src/connection-editor/page-ppp.c:281
+#, fuzzy
+msgid "Could not load PPP user interface."
+msgstr "Niemahčyma dekadavać pryvatny kluč."
+
+#: ../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 "Vybiery fajł, kab zimpartavać"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "Niemahčyma dekadavać pryvatny kluč."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+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:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+msgid "Could not load team port user interface."
+msgstr "Niemahčyma dekadavać pryvatny kluč."
 
-#: ../src/connection-editor/nm-connection-list.c:1261
+#. 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
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Niama sietkavaha spałučeńnia"
+
+#: ../src/connection-editor/page-vlan.c:596
+msgid "Could not load vlan user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "Spałučeńnie VPN %d"
+
+#: ../src/connection-editor/page-vpn.c:103
+#, fuzzy
+msgid "Could not load VPN user interface."
+msgstr "Niemahčyma dekadavać pryvatny kluč."
+
+#: ../src/connection-editor/page-vpn.c:118
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
+#, c-format
+msgid "VPN connection %d"
+msgstr "Spałučeńnie VPN %d"
+
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -1599,7 +2974,112 @@ msgstr ""
 "\n"
 "Pamyłka: nie staje typu słužby VPN."
 
-#: ../src/connection-editor/vpn-helpers.c:231
+#: ../src/connection-editor/page-vpn.c:254
+#, fuzzy
+msgid "Choose a VPN Connection Type"
+msgstr "Stvary spałučeńnie VPN"
+
+#: ../src/connection-editor/page-vpn.c:255
+#, fuzzy
+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 ""
+"<span weight=\"bold\" size=\"larger\">Vybiery typ spałučeńnia VPN</span>\n"
+"\n"
+"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
+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
+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
+#, c-format
+msgid "%u (%u MHz)"
+msgstr "%u (%u MHz)"
+
+#: ../src/connection-editor/page-wifi.c:450
+msgid "Could not load Wi-Fi user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+msgid "Wi-Fi device"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Dracianoje spałučeńnie %d"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:345
+#: ../src/libnma/nma-wifi-dialog.c:945 ../src/libnm-gtk/nm-wifi-dialog.c:961
+msgid "Dynamic WEP (802.1x)"
+msgstr "Dynamičny WEP (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
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & 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
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA i WPA2 Enterprise"
+
+#: ../src/connection-editor/page-wifi-security.c:413
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
+msgstr "Biazdrotavaja biaśpieka"
+
+#: ../src/connection-editor/page-wifi-security.c:426
+msgid "Could not load Wi-Fi security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:512
+#, c-format
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:138
+msgid "Cannot import VPN connection"
+msgstr "Niemahčyma zimpartavać spałučeńnie VPN"
+
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -1612,29 +3092,30 @@ msgstr ""
 "\n"
 "Pamyłka: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:262
-msgid "Select file to import"
-msgstr "Vybiery fajł, kab zimpartavać"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Nieviadoma"
 
-#: ../src/connection-editor/vpn-helpers.c:310
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Fajł „%s” užo isnuje."
 
-#: ../src/connection-editor/vpn-helpers.c:312
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Zamiani"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:350
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Nie ŭdałosia zekspartavać spałučeńnie VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:352
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -1645,155 +3126,1145 @@ msgstr ""
 "\n"
 "Pamyłka: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:386
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Ekspartuj spałučeńnie VPN..."
 
-#: ../src/vpn-password-dialog.c:137 ../src/vpn-password-dialog.c:253
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "Niemahčyma ŭruchomić spałučeńnie VPN \"%s\""
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
+#, fuzzy
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"Aplet NetworkManager nia zmoh znajści niekatorych vymahanych resursaŭ (fajł "
+"glade nia znojdzieny)."
 
-#: ../src/vpn-password-dialog.c:140
-#, c-format
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr ""
+
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr ""
+
+#: ../src/info.ui.h:1
+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/libnma/nma-mobile-wizard.c:198
+#: ../src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
+"Your mobile broadband connection is configured with the following settings:"
 msgstr ""
-"Niemahčyma znajści dyjaloh aŭtaryzacyi dla spałučeńniaŭ VPN typu \"%s\". "
-"Skantaktujsia z systemnym administrataram."
 
-#: ../src/vpn-password-dialog.c:256
-#, c-format
+#. Device
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#, fuzzy
+msgid "Your Device:"
+msgstr "Słužba:"
+
+#. 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 ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
+"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 ""
-"Pry ŭruchamleńni dyjalohu aŭtaryzacyi dla spałučeńnia VPN typu \"%s\" "
-"uźnikła prablema. Skantaktujsia z systemnym administrataram."
 
-#: ../src/wired-dialog.c:99
-msgid "Wired 802.1X authentication"
-msgstr "Aŭtaryzacyja dla dracianoj sietki 802.1X"
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#, fuzzy
+msgid "Confirm Mobile Broadband Settings"
+msgstr "Aŭtamatyčnaje spałučeńnie „Mobile Broadband” (GSM)"
+
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../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 ""
+
+#: ../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
+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
+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 ""
+
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../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"
+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
+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
+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:"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../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
+msgid "Your broadband billing plan name"
+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 ""
+
+#: ../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"
+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.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#, fuzzy
+msgid "New Mobile Broadband Connection"
+msgstr "Spałučeńnie „Mobile Broadband”"
+
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Parol:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Parol:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "Pakažy paroli"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Aŭtamatyčna spałučaj"
 
-#: ../src/wireless-dialog.c:414
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Novaja..."
 
-#: ../src/wireless-dialog.c:916
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Niama"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Stvary"
 
-#: ../src/wireless-dialog.c:987
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Kab atrymać dostup da biazdrotavaj sietki \"%s\", vymahajucca paroli ci "
 "klučy šyfravańnia."
 
-#: ../src/wireless-dialog.c:989
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "Vymahajecca aŭtaryzacyja dla biazdrotavaj sietki"
 
-#: ../src/wireless-dialog.c:991
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "Vymahajecca aŭtaryzacyja dla biazdrotavaj sietki"
 
-#: ../src/wireless-dialog.c:996
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "Stvary novuju biazdrotavuju sietku"
 
-#: ../src/wireless-dialog.c:998
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "Novaja biazdrotavaja sietka"
 
-#: ../src/wireless-dialog.c:999
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, 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/wireless-dialog.c:1001
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Spałučy sa schavanaj biazdrotavaj sietkaju"
 
-#: ../src/wireless-dialog.c:1003
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "Schavanaja biazdrotavaja sietka"
 
-#: ../src/wireless-dialog.c:1004
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "Akreśli nazvu j nałady biaśpieki dla schavanaj biazdrotavaj sietki, ź jakoj "
 "chočaš spałučycca."
 
-#: ../src/wireless-security/eap-method.c:340
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "Biazdrotavaja biaśpieka"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Spałučeńnie:"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Biazdrotavy _adapter:"
+
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr ""
+
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+
+#: ../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
+msgid "EVDO"
+msgstr ""
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:68
+msgid "HSPA+"
+msgstr ""
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr ""
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr ""
+
+#: ../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
+msgid "Home network"
+msgstr "Dracianaja sietka"
+
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr ""
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr ""
+
+#: ../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
+msgid "Roaming network"
+msgstr "_Uvajdzi ŭ sietku"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "Vymahaje kodu PIN"
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "Dla pryłady „Mobile Broadband” patrebny kod PIN."
+
+#: ../src/mobile-helpers.c:619
+#, 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:622
+msgid "roaming"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Spałučeńnie:"
+
+#: ../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/wireless-security/eap-method.c:452
+#, 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:343
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Sertyfikaty DER ci PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:229
-#: ../src/wireless-security/eap-method-tls.c:294
-#: ../src/wireless-security/eap-method-ttls.c:216
-msgid "No Certificate Authority certificate chosen"
-msgstr "Sertyfikat daviernaha orhanu nie abrany"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:230
-#: ../src/wireless-security/eap-method-tls.c:295
-#: ../src/wireless-security/eap-method-ttls.c:217
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
+msgid "GTC"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:235
-#: ../src/wireless-security/eap-method-tls.c:300
-#: ../src/wireless-security/eap-method-ttls.c:222
-msgid "Ignore"
-msgstr "Ihnaruj"
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:239
-#: ../src/wireless-security/eap-method-tls.c:304
-#: ../src/wireless-security/eap-method-ttls.c:226
-msgid "Choose CA Certificate"
-msgstr "Abiary sertyfikat CA"
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:315
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "Ananimnaja tojesnaść:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "Aŭtaryzacyja:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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
+#, fuzzy
+msgid "Anony_mous identity:"
+msgstr "Ananimnaja tojesnaść:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+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
+#, fuzzy
+msgid "_Inner authentication:"
+msgstr "Unutranaja aŭtaryzacyja:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:394
-#: ../src/wireless-security/eap-method-tls.c:511
-#: ../src/wireless-security/eap-method-ttls.c:431
+#: ../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 "Abiary sertyfikat ad daviernych orhanaŭ..."
 
-#: ../src/wireless-security/eap-method-tls.c:507
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+#, fuzzy
+msgid "Version 0"
+msgstr ""
+"Versija 0\n"
+"Versija 1"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+#, fuzzy
+msgid "Version 1"
+msgstr ""
+"Versija 0\n"
+"Versija 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
+#, fuzzy
+msgid "C_A certificate:"
+msgstr "Sertyfikat CA:"
+
+#: ../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
+msgid "No CA certificate is _required"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#, fuzzy
+msgid "PEAP _version:"
+msgstr "Versija PEAP:"
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
+msgid "Unencrypted private keys are insecure"
+msgstr ""
+
+#: ../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)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Abiary svoj persanalny sertyfikat..."
 
-#: ../src/wireless-security/eap-method-tls.c:516
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Abiary svoj pryvatny kluč..."
 
-#: ../src/wireless-security/wireless-security.c:305
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+#, fuzzy
+msgid "I_dentity:"
+msgstr "Tojesnaść:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+#, fuzzy
+msgid "_User certificate:"
+msgstr "Sertyfikat karystalnika:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+#, fuzzy
+msgid "Private _key:"
+msgstr "Pryvatny kluč:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+#, fuzzy
+msgid "_Private key password:"
+msgstr "Parol pryvatnaha kluča:"
+
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:329
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunelavany TLS"
 
-#: ../src/wireless-security/wireless-security.c:340
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Abaronieny EAP (PEAP)"
 
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../src/wireless-security/ws-wep-key.ui.h:9
+#: ../src/wireless-security/ws-wpa-eap.ui.h:2
+#, fuzzy
+msgid "Au_thentication:"
+msgstr "Aŭtaryzacyja:"
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (zmoŭčana)\n"
+"2\n"
+"3\n"
+"4"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:5
+msgid "Open System"
+msgstr "Adkrytaja systema"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+#, fuzzy
+msgid "Shared Key"
+msgstr "Papiarednie supolny kluč WPA"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+#, fuzzy
+msgid "_Key:"
+msgstr "Kluč:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+#, fuzzy
+msgid "Sho_w key"
+msgstr "Pakažy kluč"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+#, fuzzy
+msgid "WEP inde_x:"
+msgstr "Indeks WEP:"
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#, fuzzy
+msgid "_Type:"
+msgstr "Typ:"
+
+#~ msgid "Auto Mobile Broadband (CDMA) connection"
+#~ msgstr "Aŭtamatyčnaje spałučeńnie Mobile Broadband (CDMA)"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Ciapier ty spałučyŭsia ź sietkaj CDMA."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Ciapier ty spałučyŭsia ź sietkaj GSM."
+
+#~ msgid "PUK code is needed for the mobile broadband device"
+#~ msgstr "Dla pryłady „Mobile Broadband” patrebny kod PUK."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Biazdrotavyja sietki (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Biazdrotavaja sietka (%s)"
+
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "Biazdrotavaja sietka"
+#~ msgstr[1] "Biazdrotavyja sietki"
+#~ msgstr[2] "Biazdrotavyja sietki"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Padrychtoŭka biazdrotavaha sietkavaha spałučeńnia \"%s\"..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "Kanfihuravańnie biazdrotavaha sietkavaha spałučeńnia \"%s\"..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Zapyt sietkavaha adrasu dla biazdrotavaj sietki \"%s\"..."
+
+#~ 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"
+
+#~ msgid ""
+#~ "The NetworkManager applet could not find some required resources.  It "
+#~ "cannot continue.\n"
+#~ msgstr ""
+#~ "Aplet NetworkManager nia zmoh znajści niekatorych vymahanych resursaŭ. "
+#~ "Niemahčyma praciahvać.\n"
+
+#~ msgid ""
+#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+#~ msgstr ""
+#~ "<span size=\"larger\" weight=\"bold\">Aktyŭnyja sietkavyja spałučeńni</"
+#~ "span>"
+
+#~ msgid "Don't warn me again"
+#~ msgstr "Bolš nie nahadvaj"
+
+#~ msgid "No"
+#~ msgstr "Nie"
+
+#~ msgid ""
+#~ "Open System\n"
+#~ "Shared Key"
+#~ msgstr ""
+#~ "Adkrytaja systema\n"
+#~ "Supolny kluč"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "Inšaja biazdrotavaja sietka..."
+
+#~ msgid "Select A File"
+#~ msgstr "Abiary fajł"
+
+#~ msgid "User Name:"
+#~ msgstr "Nazva karystalnika:"
+
+#~ msgid "Yes"
+#~ msgstr "Tak"
+
+#~ msgid "_Wireless Security:"
+#~ msgstr "_Biazdrotavaja biaśpieka:"
+
+#~ msgid "alert text"
+#~ msgstr "tekst tryvohi"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Choose a Mobile Broadband "
+#~ "Connection</span>\n"
+#~ "\n"
+#~ "Select or connect the mobile broadband device you wish to use for the new "
+#~ "connection.  If the device is not available, you may select a generic "
+#~ "connection type."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Vybiery spałučeńnie \"Mobile "
+#~ "Broadband\"</span>\n"
+#~ "\n"
+#~ "Vybiery albo padłučy pryładu mabilnaha internetu, jakuju chočaš "
+#~ "zadziejničać dla hetaha kamputara. Kali pryłady niama, možaš pasprabavać "
+#~ "vybrać standartny typ spałučeńnia."
+
+#~ msgid "<b>Addresses</b>"
+#~ msgstr "<b>Adrasy</b>"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Automatic with manual DNS settings\n"
+#~ "Manual\n"
+#~ "Link-Local\n"
+#~ "Shared to other computers"
+#~ msgstr ""
+#~ "Aŭtamatyčna\n"
+#~ "Aŭtamatyčna z ułasnymi naładami DNS\n"
+#~ "Uručnuju\n"
+#~ "Miascovaje spałučeńnie\n"
+#~ "Supolny ź inšymi kamputarami"
+
+#~ msgid "<b>Basic</b>"
+#~ msgstr "<b>Prostaje</b>"
+
+#~ msgid ""
+#~ "Any\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "Prefer 3G (UMTS/HSPA)\n"
+#~ "Prefer 2G (GPRS/EDGE)"
+#~ msgstr ""
+#~ "Luboje\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "Lepš 3G (UMTS/HSPA)\n"
+#~ "Lepš 2G (GPRS/EDGE)"
+
+#~ msgid "Band:"
+#~ msgstr "Pałasa:"
+
+#~ msgid "PIN:"
+#~ msgstr "PIN:"
+
+#~ msgid "PUK:"
+#~ msgstr "PUK:"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>Aŭtaryzacyja</b>"
+
+#~ msgid "<b>Echo</b>"
+#~ msgstr "<b>Recha</b>"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "gtk-ok"
+#~ msgstr "gtk-ok"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
+#~ msgstr ""
+#~ "Aŭtamatyčna\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Twisted Pair (TP)\n"
+#~ "Attachment Unit Interface (AUI)\n"
+#~ "BNC\n"
+#~ "Media Independent Interface (MII)"
+#~ msgstr ""
+#~ "Aŭtamatyčna\n"
+#~ "Źvitaja para (TP)\n"
+#~ "Attachment Unit Interface (AUI)\n"
+#~ "BNC\n"
+#~ "Media Independent Interface (MII)"
+
+#~ msgid "MT_U:"
+#~ msgstr "MT_U:"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+#~ msgstr ""
+#~ "Aŭtamatyčna\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+
+#~ msgid ""
+#~ "Infrastructure\n"
+#~ "Ad-hoc"
+#~ msgstr ""
+#~ "Infrastruktura\n"
+#~ "Ad-hoc"
+
+#~ msgid "_SSID:"
+#~ msgstr "_SSID:"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Aŭtamatyčna (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Tolki aŭtamatyčnyja adrasy (PPP)"
+
+#~ msgid "Wireless"
+#~ msgstr "_Biazdrotavaje"
+
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the "
+#~ "NetworkManager applet glade file was not found)."
+#~ msgstr ""
+#~ "Redaktar spałučeńnia nia zmoh znajści niekatorych vymahanych resursaŭ "
+#~ "(fajł glade apletu NetworkManager nia znojdzieny)."
+
+#~ msgid "Apply..."
+#~ msgstr "Užyj..."
+
+#~ msgid "Apply"
+#~ msgstr "Užyj"
+
+#~ msgid "Save this connection for all users of this machine."
+#~ msgstr ""
+#~ "Zrabi hetaje spałučeńnie dastupnym dla ŭsich karystalnikaŭ kamputara."
+
+#~ 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."
+
+#~ msgid "Could not obtain required privileges: %s."
+#~ msgstr "Nie ŭdałosia atrymać patrebnyja dazvoły: %s."
+
+#~ msgid "Could not remove system connection: permission denied."
+#~ msgstr "Nie ŭdałosia vydalić systemnaje spałučeńnie: dostup zabaronieny."
+
+#~ msgid "Removing connection failed: %s."
+#~ msgstr "Nie ŭdałosia vydalić spałučeńnie: %s."
+
+#~ msgid "Could not add system connection: permission denied."
+#~ msgstr "Nie ŭdałosia dadać systemnaje spałučeńnie: dostup zabaronieny."
+
+#~ msgid "Adding connection failed: %s."
+#~ msgstr "Nie ŭdałosia dadać spałučeńnie: %s."
+
+#~ msgid "Could not update system connection: permission denied."
+#~ msgstr ""
+#~ "Nie ŭdałosia aktualizavać systemnaje spałučeńnie: dostup zabaronieny."
+
+#~ msgid "Updating connection failed: %s."
+#~ msgstr "Nie ŭdałosia aktualizavać spałučeńnie: %s."
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "Biazdrotavaje spałučeńnie %d"
+
+#~ 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\""
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "Niemahčyma znajści dyjaloh aŭtaryzacyi dla spałučeńniaŭ VPN typu \"%s\". "
+#~ "Skantaktujsia z systemnym administrataram."
+
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "Pry ŭruchamleńni dyjalohu aŭtaryzacyi dla spałučeńnia VPN typu \"%s\" "
+#~ "uźnikła prablema. Skantaktujsia z systemnym administrataram."
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Sertyfikat daviernaha orhanu nie abrany"
+
 #~ msgid "Dialing mobile broadband device %s..."
 #~ msgstr "Nabor praz pryładu „Mobile Broadband” %s..."
 
@@ -1803,9 +4274,6 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ msgid "Waiting for user authentication on device '%s'..."
 #~ msgstr "Čakańnie aŭtaryzacyi karystalnika dla pryłady „%s”..."
 
-#~ msgid "Mobile broadband connection"
-#~ msgstr "Spałučeńnie „Mobile Broadband”"
-
 #~ msgid "Preparing device %s for the wired network..."
 #~ msgstr "Padrychtoŭka pryłady %s dla dracianoj sietki..."
 
@@ -1824,9 +4292,6 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ msgid "Waiting for Network Key for the wireless network '%s'..."
 #~ msgstr "Čakańnie sietkavaha kluča dla biazdrotavaj sietki \"%s\"..."
 
-#~ msgid "Prefix"
-#~ msgstr "Prefiks"
-
 #~ msgid "Point-to-Point Protocol (PPP)"
 #~ msgstr "Pratakoł PPP"
 
@@ -1884,9 +4349,6 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ msgid "Not enough memory to store PEM file data."
 #~ msgstr "Nie staje pamiaci, kab zachoŭvać źviestki z fajłu PEM."
 
-#~ msgid "Could not decode private key."
-#~ msgstr "Niemahčyma dekadavać pryvatny kluč."
-
 #~ msgid "PEM certificate '%s' had no end tag '%s'."
 #~ msgstr "Sertyfikat PEM \"%s\" nia maje kancavoha taga \"%s\"."
 
@@ -1933,9 +4395,6 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ msgid "Failed to decrypt the private key: %s / %s."
 #~ msgstr "Niaŭdałaja rasšyfroŭka pryvatnaha kluča: %s / %s."
 
-#~ msgid "Error initializing certificate data: %s"
-#~ msgstr "Pamyłka inicyjalizacyi źviestak sertyfikatu: %s"
-
 #~ msgid "Couldn't decode certificate: %s"
 #~ msgstr "Niemahčyma rasšyfravać sertyfikat: %s"
 
@@ -2012,9 +4471,6 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ "Hety praces vymahaje niekatorych źviestak, jak to adrasy IP i sakretnyja "
 #~ "paroli. Atrymaj ich u svajho systemnaha administratara."
 
-#~ msgid "Create VPN Connection"
-#~ msgstr "Stvary spałučeńnie VPN"
-
 #~ msgid "1 of 2"
 #~ msgstr "1 z 2"
 
@@ -2039,15 +4495,6 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ msgid "- NetworkManager VPN properties"
 #~ msgstr "- Ułaścivaści VPN dla NetworkManager"
 
-#~ msgid "Add a new VPN connection"
-#~ msgstr "Dadaj novaje spałučeńnie VPN"
-
-#~ msgid "Delete the selected VPN connection"
-#~ msgstr "Vydal zaznačanaje spałučeńnie VPN"
-
-#~ msgid "Edit the selected VPN connection"
-#~ msgstr "Redahuj zaznačanaje spałučeńnie VPN"
-
 #~ msgid "Export the VPN settings to a file"
 #~ msgstr "Ekspartuj nałady VPN u fajł"
 
@@ -2084,9 +4531,6 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ msgid "_GSM Modem"
 #~ msgstr "Madem _GSM"
 
-#~ msgid "_Wired Network"
-#~ msgstr "_Dracianaja sietka"
-
 #~ msgid "Wireless Ethernet (%s)"
 #~ msgstr "Biazdrotavy Ethernet (%s)"
 
@@ -2100,9 +4544,6 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ "A\n"
 #~ "BG"
 
-#~ msgid "IP"
-#~ msgstr "IP"
-
 #~ msgid ""
 #~ "tp\n"
 #~ "aui\n"
@@ -2120,21 +4561,9 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ msgid "The orientation of the tray."
 #~ msgstr "Aryjentacyja abšaru nahadvańniaŭ."
 
-#~ msgid "Autoconnect"
-#~ msgstr "Aŭtamatyčna spałučaj"
-
-#~ msgid "Name"
-#~ msgstr "Nazva"
-
 #~ msgid "Speed"
 #~ msgstr "Chutkaść"
 
-#~ msgid "Wireless security"
-#~ msgstr "Biazdrotavaja biaśpieka"
-
-#~ msgid "WPA Pre-Shared Key"
-#~ msgstr "Papiarednie supolny kluč WPA"
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Password Required by Wireless "
 #~ "Network</span>\n"
@@ -2148,12 +4577,6 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ "Kab atrymać dostup da biazdrotavaj sietki \"%s\", treba akreślić "
 #~ "parolnuju frazu ci kluč šyfravańnia."
 
-#~ msgid "_Password:"
-#~ msgstr "_Parol:"
-
-#~ msgid "_Show password"
-#~ msgstr "_Pakažy parol"
-
 #~ msgid "VPN Login Failure"
 #~ msgstr "Pamyłka aŭtaryzacyi VPN"
 
@@ -2171,10 +4594,6 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ "Niemahčyma ŭruchomić spałučeńnia VPN \"%s\" praz pamyłku ŭruchamleńnia "
 #~ "prahramy VPN."
 
-#~ msgid "Could not start the VPN connection '%s' due to a connection error."
-#~ msgstr ""
-#~ "Niemahčyma ŭruchomić spałučeńnia VPN \"%s\" praz pamyłku spałučeńnia."
-
 #~ msgid "VPN Configuration Error"
 #~ msgstr "Pamyłka kanfihuracyi VPN"
 
@@ -2239,15 +4658,12 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ msgid "_Fallback on this Network"
 #~ msgstr "_Viartajsia da hetaj zapasnoj sietki"
 
-#~ msgid "_Login to Network"
-#~ msgstr "_Uvajdzi ŭ sietku"
-
 #~ msgid " (invalid Unicode)"
 #~ msgstr " (niapravilny Unikod)"
 
 #~ msgid ""
-#~ "By default, the wireless network's name is set to your computer's name, %"
-#~ "s, with no encryption enabled"
+#~ "By default, the wireless network's name is set to your computer's name, "
+#~ "%s, with no encryption enabled"
 #~ msgstr ""
 #~ "Zmoŭčana nazva biazdrotavaj sietki akreślajecca jak nazva kamputara, %s, "
 #~ "z vyklučanym šyfravańniem"
@@ -2262,9 +4678,6 @@ msgstr "Abaronieny EAP (PEAP)"
 #~ "Patrebnaja biazdrotavaja sietka vymahaje mahčymaściaŭ biaśpieki, jakija "
 #~ "nie padtrymvajucca tvajoj aparaturaj."
 
-#~ msgid "Open System"
-#~ msgstr "Adkrytaja systema"
-
 #~ msgid "AES-CCMP"
 #~ msgstr "AES-CCMP"
 
diff --git a/po/bg.po b/po/bg.po
index 47649177..371efcb0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-09 19:48+0300\n"
+"POT-Creation-Date: 2016-04-05 14:02+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,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Мрежа"
 
@@ -132,46 +132,90 @@ msgstr ""
 "сертифициращите органи във втората фаза на идентификацията при ползване на "
 "EAP."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Аплетът NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Аплетът NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Идентификация 802.1Х"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_Свързване"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Име на мрежа:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Инцидентна (ад хок)"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Неуспешно добавяне/задействане на връзка"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Неуспешно установяване на връзка"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Неуспешно прекъсване на връзка"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Неуспешно прекъсване"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Неуспешно задействане на връзка"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Това съобщение да не се показва повече"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -181,7 +225,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна, защото мрежовата връзка беше прекъсната."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -190,7 +234,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна, защото услугата за ВЧМ спря неочаквано."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -201,7 +245,7 @@ msgstr ""
 "Връзката към ВЧМ „%s“ е неуспешна, защото услугата за ВЧМ върна грешни "
 "настройки."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -210,7 +254,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна, защото времето за опити изтече."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -220,7 +264,7 @@ msgstr ""
 "Връзката към ВЧМ „%s“ е неуспешна, защото услугата за ВЧМ не стартира "
 "навреме."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -230,7 +274,7 @@ msgstr ""
 "Връзката към ВЧМ „%s“ е неуспешна, защото услугата за ВЧМ не успя да "
 "стартира."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -239,7 +283,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна, защото нямаше валидни тайни за ВЧМ."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -248,7 +292,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна, поради невалидни тайни за ВЧМ."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -257,7 +301,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ е неуспешна."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -267,7 +311,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ прекъсна, защото мрежовата връзка беше прекъсната."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -276,7 +320,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ прекъсна, защото услугата за ВЧМ спря."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -285,7 +329,7 @@ msgstr ""
 "\n"
 "Връзката към ВЧМ „%s“ прекъсна."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -296,19 +340,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Успешна връзка към ВЧМ.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Съобщение при идентификация пред ВЧМ"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Връзката към ВЧМ е неуспешна"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -322,7 +366,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -335,799 +379,545 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "устройството не е готово (липсва фърмуер)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "устройството не е готово"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "връзката е прекъсната"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr " Прекъсване"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "устройството не се управлява"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Не са налични мрежови устройства"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_Връзки към ВЧМ"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Настройване на ВЧМ…"
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Прекъсване на ВЧМ"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager не е включен…"
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Изключена мрежа"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "_Включване на мрежата"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Включване на _безжичната мрежа"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Включване на _мобилна връзка"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Включване на мобилна в_ръзка по WiMAX"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Включване на _уведомяване"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Информация за връзката"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Настройки на връзките…"
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "Помо_щ"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Относно"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Свързани сте към „%s“."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Без връзка"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Връзката към мрежата е прекъсната."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Подготовка на връзката „%s“…"
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Изисква се идентификация на потребител за връзката „%s“…"
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Заявка за мрежов адрес за „%s“…"
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Жичната връзка „%s“ е активна"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Стартиране на връзката към ВЧМ „%s“…"
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Изисква се идентификация на потребител за връзката към ВЧМ „%s“…"
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Изискване на адрес за ВЧМ за „%s“…"
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Връзката към ВЧМ „%s“ е активна"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Няма връзка към мрежа"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Аплетът NetworkManager"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Налични мрежи"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Връзката е осъществена"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Свързани сте към свързаната мрежа."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Подготовка на свързаната връзка „%s“…"
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Настройване на свързаната връзка „%s“…"
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Изисква се идентификация на потребител за свързаната връзка „%s“…"
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Изискване на адрес за „%s“…"
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Свързаната връзка „%s“ е активна"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Свързани сте към мрежата-мост."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Подготовка на връзката-мост „%s“…"
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Настройване на връзката-мост „%s“…"
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Изисква се идентификация на потребител за връзката-мост „%s“…"
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Връзката-мост „%s“ е активна"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK-ът е грешен. Свържете се с доставчика на услугата."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Изпращане на отключващия код…"
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Мобилна връзка (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Мобилна връзка"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Налични мрежи"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Нова връзка към мобилна мрежа…"
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Връзката е осъществена"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Свързани сте към мобилната мрежа."
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Парола за мобилна мрежа."
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Регистрирани сте в домашната мрежа."
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Регистрирани сте в мрежа с роуминг."
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Свързани сте към мобилна мрежа."
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Подготовка на мобилна връзка „%s“…"
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Настройване на мобилна връзка „%s“…"
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Необходима е идентификация на потребител за мобилна връзка „%s“…"
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Мобилната връзка „%s“ е активна"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Нова връзка към мобилна мрежа (CDMA)…"
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Свързани сте към мобилна мрежа (CDMA)."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "Мрежа по CDMA."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Автоматична мрежа по Ethernet"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Жични мрежи (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Жична мрежа (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Жични мрежи"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Жична мрежа"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Свързани сте към жичната мрежа."
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Подготовка на жична връзка „%s“…"
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Настройване на жична връзка „%s“…"
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Изисква се идентификация на потребител за жична връзка „%s“…"
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Заявка за жичен мрежов адрес за „%s“…"
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Жичната връзка „%s“ е активна"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Идентификация за DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Нова мобилна връзка (GSM)…"
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Свързани сте към мобилна мрежа (GSM)."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "Мрежа по GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "Автоматичен InfiniBand"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "Мрежи по InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Мрежа по InfiniBand мрежа (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "Мрежи по InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "Мрежа по InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Свързани сте към мрежа по InfiniBand."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Подготовка на връзката по InfiniBand „%s“…"
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Настройване на връзка по InfiniBand „%s“…"
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Изисква се идентификация на потребител за връзката по InfiniBand „%s“…"
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "Връзката по InfiniBand „%s“ е активна"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Свързани сте към обединената мрежа."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Подготовка на връзката към обединената мрежа „%s“…"
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Настройване на обединената връзка „%s“…"
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Изисква се идентификация на потребител за обединената връзка „%s“…"
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Обединената връзка „%s“ е активна"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Свързани сте към ВЛМ."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Подготовка на връзката към ВЛМ „%s“…"
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Настройване на връзката към ВЧМ „%s“…"
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Изисква се идентификация на потребител за връзката към ВЛМ „%s“…"
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "Връзката към ВЛМ „%s“ е активна"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Свързване към скрита безжична мрежа…"
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Създаване на _нова безжична мрежа…"
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(нищо)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Безжични мрежи (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Жична мрежа (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Безжична мрежа"
 msgstr[1] "Безжични мрежи"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Изключен Wi-Fi"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi е изключен от хардуерен ключ"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Още мрежи"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Достъпни са безжични мрежи"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Използвайте менюто с наличните мрежи, за да се свържете"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Свързани сте към безжичната мрежа „%s“."
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Подготовка на безжичната връзка „%s“…"
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Настройване на безжична връзка „%s“…"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Изисква се идентификация на потребител за безжична мрежа „%s“…"
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Заявка за мрежов адрес за „%s“…"
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Безжичната връзка „%s“ е активна: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Безжичната връзка „%s“ е активна"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Неуспешно задействане на връзка"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Неуспешно добавяне на нова връзка"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Безжична връзка по WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "Безжична връзка по WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "Изключен WiMAX"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX е изключен от хардуерен ключ"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Свързани сте към мрежа по WiMAX."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Мобилната връзка „%s“ е активна: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "роуминг"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Грешка при показване на информацията за връзката:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Динамичен WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Адреси"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Без"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (стандартно)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Неопределена"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "неизвестно"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "неопределена"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP адрес:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Неопределен"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP адрес:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Адрес за разпръскване:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Маска на подмрежата:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Неопределена"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Маршрут по подразбиране:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Маска на подмрежата:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Общи"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Хардуерен адрес:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Драйвер:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Скорост:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Защита:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Маршрут по подразбиране:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Игнорирана"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Вид ВЧМ:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Шлюз за ВЧМ:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Потребител за ВЧМ:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Известие за ВЧМ:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Основна връзка:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Неопределена"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Не са намерени активни връзки!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1135,44 +925,44 @@ msgstr ""
 "Авторски права © 2005-2008 Novell, Inc.\n"
 "и още много сътрудници и преводачи"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Аплет за областта за уведомяване за управление на мрежовите устройства и "
 "връзки."
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Уеб сайт на NetworkManager"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Липсващи ресурси"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Парола за мобилна връзка"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "За свързване към „%s“ се изисква парола."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Необходим е PIN"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "Необходим е PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1182,25 +972,25 @@ msgstr ""
 "свърже."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Показване на PIN"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Необходим е PUK за SIM"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "Необходим е PUK за отключване на SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1210,27 +1000,34 @@ msgstr ""
 "използва."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Нов PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Повторете PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Показване на PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1240,18 +1037,41 @@ msgstr ""
 "IP адресите идентифицират вашия компютър в мрежата. Натиснете бутона "
 "„Добавяне“, за да добавите IP адрес."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Изтриване"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Иг_нориране на автоматично получени маршрути"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "Използване на тази връзк_а само за ресурси в собствената си мрежа"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1259,9 +1079,8 @@ msgstr ""
 "Ако е включено, тази връзка никога няма да се използва като стандартната "
 "мрежова връзка."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1269,15 +1088,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Създаване…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "Изберете вид връзка"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1330,48 +1149,41 @@ msgid "Bonded _connections:"
 msgstr "_Обединени връзки:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
 msgstr "Р_ежим:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "_Редактиране"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "_Изтриване"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Редактиране"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Честота на о_бновяване:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "мс"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "_Име:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "_Наблюдаване на връзка:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "_Цели на ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1379,19 +1191,19 @@ msgstr ""
 "Адрес или списък от адреси разделени със запетая за проверка състоянието на "
 "връзката."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Време за _осъществяване на връзка:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Време за _прекъсване на връзка:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Основен:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1399,12 +1211,30 @@ msgstr ""
 "Името на интерфейса на основното устройство. Ако е зададено и устройството е "
 "налично, то ще служи като активно подчинено устройство."
 
+#: ../src/connection-editor/ce-page-bond.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:17
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "байта"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "Забав_яне:"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Приоритет:"
 
@@ -1416,44 +1246,89 @@ msgstr "_Връщане по интерфейса:"
 msgid "Bridged _connections:"
 msgstr "Мостови _връзки:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "_Закъснение при пренасочване:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Време на поздрав:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "сек."
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "_Включване на мрежата"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_Включване на STP (протокол на обхващащото дърво)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Максимална възраст:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_Време на подравняване:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "автоматично"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "стандартно"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Адрес"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Адрес"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Което и да е устройство"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Неуспешно обновяване на тайните на мрежовата връзка поради непозната грешка."
@@ -1553,79 +1428,79 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Контрол на потока по приоритет"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Включване или изключване на паузата при предаване за приоритета за всеки "
 "потребителски приоритет."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Приоритет:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Клас на данните:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Точна широчина на лентата:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Широчина на лентата за приоритета:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Група на приоритета:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "Идентификатор на групата:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Въведете идентификатора за групата за приоритет за всеки потребителски "
 "приоритет."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1635,25 +1510,25 @@ msgstr ""
 "всяка група приоритет. Сборът от процентите на всички групи трябва да е 100 "
 "%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Въведете частта от широчината на честотната лента за група в проценти за "
 "всеки потребителски приоритет."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Включване или изключване на точната широчина на честотната лента за всеки "
 "потребителски приоритет."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1666,7 +1541,7 @@ 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:4
+#: ../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
@@ -1674,8 +1549,9 @@ msgid "Sho_w password"
 msgstr "Показ_ване на паролата"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1687,8 +1563,8 @@ msgstr "_Парола:"
 #: ../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:138
-#: ../src/connection-editor/page-ip6.c:146
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Автоматично"
@@ -1743,18 +1619,18 @@ msgstr "Авто_матичен избор на скорост"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "_Постоянен хардуерен адрес:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Услуга:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "_Подменен хардуерен адрес:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1764,19 +1640,54 @@ msgstr ""
 "хардуерен адрес. Номерът е известен като клониране или подмяна на хардуерен "
 "адрес. Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "байта"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Стандартна"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Игнориране"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Разпръскване"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Парола за _частен ключ:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1815,8 +1726,8 @@ msgstr "Автоматично с ръчни настройки за DNS"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:195
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Ръчно"
 
@@ -1827,8 +1738,8 @@ 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:215
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Споделена с други компютри"
 
@@ -1842,7 +1753,7 @@ msgstr "_Метод:"
 msgid "Addresses"
 msgstr "Адреси"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1852,8 +1763,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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1861,25 +1772,25 @@ msgstr ""
 "Домейните за откриването на имената на хостовете. Използвайте запетаи, за да "
 "разделяте домейните."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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/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:317
+#: ../src/connection-editor/page-ip6.c:306
 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/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:308
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_Сървъри за DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1887,11 +1798,11 @@ msgstr ""
 "IP адреси на сървърите за откриването на имената на хостовете (DNS). "
 "Използвайте запетаи, за да разделяте домейните."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1899,14 +1810,14 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Маршрути…"
 
 # Става дума за вида връзка
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Изключена"
 
@@ -1918,7 +1829,7 @@ msgstr "Включена (предпочитане на публичния ад�
 msgid "Enabled (prefer temporary address)"
 msgstr "Включена (предпочитане на временния адрес)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 "
@@ -1929,15 +1840,15 @@ msgstr ""
 "за връзката (link-local), автоматично ще бъдат причислени към съответния "
 "интерфейс."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "Разширения на IPv6 за защита на _личните данни:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1946,71 +1857,38 @@ msgstr ""
 "протокола IPv4, дори и при неуспешно настройване на IPv6."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Всяка"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Предпочитана е 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Предпочитана е 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Предпочитана е 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Използване само на 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Основна"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Но_мер:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Допълнителни"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "М_режа (ид.):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Вид:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Промяна…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "ПИ_Н:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "Позволяване на _роуминг, когато домашната мрежа не е налична"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "Пока_зване на паролите"
 
@@ -2076,32 +1954,55 @@ msgid "_Teamed connections:"
 msgstr "_Обединени връзки:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "_Внасяне на конфигурация за обединени връзки от файл…"
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Внасяне на настройки за обединени връзки от файл…"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Основен интерфейс:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Интерфейс за VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Подменен хардуерен адрес:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "И_дентификатор за VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Име на устройство + номер"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + number"
 
@@ -2118,96 +2019,100 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2,4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Инфраструктура"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Инцидентна (ад хок)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Сила на предава_не:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Скорост:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "К_анал:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Честотна _лента:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "Р_ежим:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Позволени методи за идентификация"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Разширяем протокол (EAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Протокол с парола (PAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Протокол с предизвикателство и ръкостискане (CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Протокол с предизвикателство и ръкостискане на Майкрософт (MS CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 "Протокол с предизвикателство и ръкостискане на Майкрософт, версия 2 (MS CHAP "
 "v2)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2216,78 +2121,78 @@ msgstr ""
 "идентификация. Ако връзките са неуспешни, опитайте с изключване на "
 "поддръжката на някои методи."
 
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Безжична мрежа"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Свързване"
 
-#: ../src/connection-editor/connection-helpers.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Обединяване"
 
-#: ../src/connection-editor/connection-helpers.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Мрежов мост"
 
-#: ../src/connection-editor/connection-helpers.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:169
-#: ../src/connection-editor/connection-helpers.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "ВЧМ"
 
-#: ../src/connection-editor/connection-helpers.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Хардуер"
 
-#: ../src/connection-editor/connection-helpers.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Виртуална"
 
-#: ../src/connection-editor/connection-helpers.c:347
-#: ../src/connection-editor/connection-helpers.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Внасяне на конфигурация към ВЧМ…"
 
-#: ../src/connection-editor/connection-helpers.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2295,58 +2200,79 @@ msgstr ""
 "Прозорецът на редактора на връзки не може да се инициализира поради "
 "неизвестна грешка."
 
-#: ../src/connection-editor/connection-helpers.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Не може да се създаде нова връзка"
 
-#: ../src/connection-editor/connection-helpers.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Неуспешно изтриване на връзка"
 
-#: ../src/connection-editor/connection-helpers.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Сигурни ли сте, че искате да изтриете връзката „%s“?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:920
+#: ../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
 msgid "Address"
 msgstr "Адрес"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Мрежова маска"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:954
+#: ../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
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Метрични"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:937
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Представка"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Настройки на „%s“"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Редактиране на връзка без име"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "И_ме на връзка:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Грешка при инициализиране на редактора"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Неуспешно добавяне на връзка"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2354,175 +2280,215 @@ msgstr ""
 "Редакторът на връзки не може да намери някои задължителни ресурси (файлът с "
 "интерфейса не беше намерен)."
 
-#: ../src/connection-editor/nm-connection-editor.c:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Запазване"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Запазване на промените в настройките на връзката."
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Идентифицирайте се, за да запазите тази връзка за всички потребители на този "
 "компютър."
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Не може да се създаде връзка"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Не може да се редактира връзка"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Грешка при създаване на прозорец за редактиране на връзка."
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Грешка при инициализиране на редактора"
 
-#: ../src/connection-editor/nm-connection-editor.c:898
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Неуспешно добавяне на връзка"
 
-#: ../src/connection-editor/nm-connection-editor.c:938
-msgid "Error saving connection"
-msgstr "Грешка при запазване на връзката"
-
-#: ../src/connection-editor/nm-connection-editor.c:939
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Свойството „%s“ / „%s“ е неправилно: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "И_ме на връзка:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Изнасяне…"
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "никога"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "сега"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "преди %d минута"
 msgstr[1] "преди %d минути"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "преди %d час"
 msgstr[1] "преди %d часа"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "преди %d ден"
 msgstr[1] "преди %d дни"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "преди %d месец"
 msgstr[1] "преди %d месеца"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "преди %d година"
 msgstr[1] "преди %d години"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Име"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Последно използвана"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Редактиране на избраната връзка"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Идентифицирайте се, за да редактирате избраната връзка"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Изтриване на избраната връзка"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Идентифицирайте се, за да изтриете избраната връзка"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Липсват приставки за ВЧМ."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Не може да се създават връзки от вида „%s"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Грешка при създаване на връзката"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Грешка при редактиране на връзката"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Не може да се открие връзка с идентификатор „%s“"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Защита на 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "Потребителският интерфейс за сигурност на 802.1x не може да се зареди."
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Използване на защита на 802.1_X за тази връзка"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr ""
+"Потребителският интерфейс за мост в център за данни (DCB) не може да се "
+"зареди."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Свързана връзка %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Жична мрежа"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Безжична мрежа"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr ""
 "Потребителският интерфейс за свързване на интерфейси не може да се зареди."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Основен:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Свързана връзка %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Потребителският интерфейс за мрежови мост не може да се зареди."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Мрежови мост %d"
@@ -2530,62 +2496,78 @@ msgstr "Мрежови мост %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Порт за мрежови мост"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr ""
 "Потребителският интерфейс за порта за мрежови мост не може да се зареди."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "Мост в център за данни (DCB)"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr ""
 "Потребителският интерфейс за мост в център за данни (DCB) не може да се "
 "зареди."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Потребителският интерфейс за DSL не може да се зареди."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Връзка по DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "Тази настройка прави възможно използването на връзката само съвместно с "
 "мрежовото устройство с указания тук постоянен хардуерен адрес. Пример: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Потребителският интерфейс за жична мрежа не може да се зареди."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Подменен хардуерен адрес:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Стандартна"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2596,116 +2578,168 @@ msgstr ""
 "защитната стена. Естествено тази схема може да се ползва, само ако защитната "
 "стена (firewalld) е включена."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD не е стартиран."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Началният потребителският интерфейс не може да се зареди."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Потребителският интерфейс за InfiniBand не може да се зареди."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Връзка по InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Автоматично (ВЧМ)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Автоматично (ВЧМ), само адреси"
 
-#: ../src/connection-editor/page-ip4.c:139
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Автоматично, само адреси"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:143
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Автоматично (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:142
-#: ../src/connection-editor/page-ip6.c:144
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Автоматично (PPPoE), само адреси"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Автоматично (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:145
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Автоматично (DHCP), само адреси"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Само локално за връзката (169.254.0.0/16, fe80::/10)"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:306
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "_Допълнителни сървъри за DNS:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:315
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Допълнителни _търсени домейни:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Редактиране на маршрути по IPv4 за %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Настройки на IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Потребителският интерфейс за IPv4 не може да се зареди."
 
-#: ../src/connection-editor/page-ip6.c:159
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Игнориране"
 
-#: ../src/connection-editor/page-ip6.c:183
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Автоматично, само DHCP"
 
-#: ../src/connection-editor/page-ip6.c:852
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Редактиране на маршрути по IPv6 за „%s“"
 
-#: ../src/connection-editor/page-ip6.c:1003
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Настройки на IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1005
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Потребителският интерфейс на IPv6 не може да се зареди."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Подчинени устройства на един интерфейс"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "Устройствата „%s“ и „%s“ са подчинени на устройството „%s“"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2714,25 +2748,25 @@ msgstr ""
 "Устройствата „%s“ и „%s“ са подчинени на два различни виртуални порта („%s“ "
 "и „%s“) на едно физическо устройство."
 
-#: ../src/connection-editor/page-master.c:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s подчинен %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Потребителският интерфейс за мобилна връзка не може да се зареди."
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Неподдържан вид мобилна връзка."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Изберете вида на доставчика на мобилен Интернет"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2740,85 +2774,85 @@ msgstr ""
 "Изберете технологията, която се използва от вашия мобилен доставчик. Ако не "
 "сте сигурни, го попитайте."
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "_Доставчикът използва технология чрез GSM (като GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Доставчикът използва _технология чрез CDMA (като 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "никакъв"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Настройки на PPP"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Потребителският интерфейс за PPP не може да се зареди."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Избор на файл за внасяне"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Грешка: файлът не съдържа настройки в правилен формат JSON"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Потребителският интерфейс за обединена връзка не може да се зареди."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Обединена връзка %d"
@@ -2826,11 +2860,11 @@ msgstr "Обединена връзка %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Порт за обединена връзка"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 msgid "Could not load team port user interface."
 msgstr ""
 "Потребителският интерфейс за порта за обединена връзка не може да се зареди."
@@ -2838,37 +2872,46 @@ 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (през „%s“)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Няма връзка към мрежа"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr ""
 "Потребителският интерфейс за виртуална локална мрежа не може да се зареди."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Връзка към VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Потребителският интерфейс за ВЧМ не може да се зареди."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Не може да се намери приставка за ВЧМ за „%s“."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Връзка към ВЧМ %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2878,11 +2921,11 @@ msgstr ""
 "\n"
 "Грешка: видът услуга на ВЧМ липсва."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Изберете вид ВЧМ"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2892,7 +2935,7 @@ msgstr ""
 "видът, който искате да ползвате го няма в списъка, ще трябва да инсталирате "
 "съответната приставка за ВЧМ."
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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"
@@ -2900,73 +2943,94 @@ msgstr ""
 "Тази опция заделя връзката за ползване само с безжичната точка за достъп с "
 "указания тук хардуерен адрес (BSSID). Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"Тази настройка прави възможно използването на връзката само съвместно с "
+"мрежовото устройство с указания тук постоянен хардуерен адрес. Пример: "
+"00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Потребителският интерфейс за безжична мрежа не може да се зареди."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Което и да е устройство"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Безжична връзка %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "128 битова парола за WEP"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Динамичен WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Частна WPA & WPA2 "
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Корпоративна WPA & WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Потребителският интерфейс за сигурност на WiFi не може да се зареди. Липсват "
 "настройките за WiFi."
 
-#: ../src/connection-editor/page-wifi-security.c:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Защита на безжична мрежа"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Потребителският интерфейс за сигурност на WiFi не може да се зареди."
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "Потребителският интерфейс за WiMAX не може да се зареди."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Връзка по WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Връзка към ВЧМ не може да бъде внесена"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2978,25 +3042,30 @@ msgstr ""
 "\n"
 "Грешка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Непозната грешка"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Вече съществува файл с името „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Замяна"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Искате ли да замените „%s“ с връзката към ВЧМ, която запазвате?"
 
-#: ../src/connection-editor/vpn-helpers.c:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Връзка по ВЧМ не може да бъде изнесена"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3007,11 +3076,11 @@ msgstr ""
 "\n"
 "Грешка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Изнасяне на връзка към ВЧМ…"
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -3019,101 +3088,11 @@ msgstr ""
 "Аплетът NetworkManager не можа да открие някои задължителни ресурси (файлът ."
 "ui не е намерен)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Настройването на Bluetooth не е възможно (грешка при свързване с D-Bus: (%s) "
-"%s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Настройването на Bluetooth не е възможно (грешка при намиране на "
-"NetworkManager: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Използване на телефон като мрежово устройство (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Достъп до Интернет през мобилния ви телефон (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Грешка: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Не може да се създаде комутируема връзка: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "Телефонът ви е готов за работа!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Съветникът беше отказан"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Неизвестен вид устройство (не е GSM или CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "неизвестен вид модем."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "неуспешна връзка с телефона."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "грешка при получаване на връзка с шината"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "връзката с телефона неочаквано прекъсна."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "времето за откриване на телефон изтече."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "Разпознаване на настройките за телефона…"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Подразбиращия се адаптер за Bluetooth трябва да е активиран, преди да "
-"създадете връзка през телефон."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Не може да се създаде връзка по лична мрежа PAN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "Мрежа „%s“"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Отключване"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Автоматично отключване на това устройство"
 
@@ -3121,31 +3100,36 @@ msgstr "Автоматично отключване на това устройс
 msgid "Connection Information"
 msgstr "Информация за връзката"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Активни мрежови връзки"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Устройството ви:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Доставчикът ви:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Планът ви:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3158,23 +3142,28 @@ msgstr ""
 "проверете отново вашите настройки. За да промените вашите настройки, "
 "изберете „Мрежови връзки“ от менюто „Система“ → „Предпочитания“."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Потвърждение на настройки на мобилна връзка"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Не е в списъка"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Изберете вашия план"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3187,68 +3176,84 @@ msgstr ""
 "Ако не сте сигурни за вашия план, попитайте вашия доставчик за името на "
 "точката за достъп (APN)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Избор на вашия план за плащане"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Планът не е в списъка…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Изберете вашия доставчик от _списък:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Доставчик"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Доставчик:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Изберете вашия доставчик"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "Списък с държави или региони:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Държава или регион"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Моята държава не е в списъка"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Инсталирано устройство за GSM"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Инсталирано устройство за CDMA"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3256,88 +3261,107 @@ msgstr ""
 "Този помощник ще ви помогне по-лесно да настроите връзка към мобилна (3G) "
 "мрежа."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Ще ви е нужна следната информация:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Името на вашия доставчик"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Името на вашия план за плащане"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Създаване на връзка за _това устройство:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Което и да е устройство"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Настройване на мобилна връзка"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Нова мобилна връзка"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Жична мрежа"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "Мрежа на OLPC"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Втора парола:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Втора парола:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../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
+#, fuzzy
+msgid "Click to connect"
+msgstr " Прекъсване"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Нова…"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Без"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Създаване"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3345,35 +3369,35 @@ msgstr ""
 "За достъп до безжичната мрежа „%s“ са необходими пароли или криптирани "
 "ключове."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Изисква се идентификация за безжична мрежа"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Изисква се идентификация за безжична мрежа"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Създаване на нова безжична мрежа"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Нова безжична мрежа"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Въведете име на безжичната мрежа, която искате да създадете."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Свързване към скрита безжична мрежа"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Скрита безжична мрежа"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3381,31 +3405,55 @@ msgstr ""
 "Въведете име и данни за сигурност на скритата безжична мрежа, към която "
 "искате да се свържете."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Втора парола:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "Пока_зване на паролите"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_Защита на безжична мрежа:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Вр_ъзка:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Безжична _карта:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "Мрежа на OLPC"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Употреба:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3413,7 +3461,7 @@ msgstr ""
 "Тази програма е компонент на NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3421,139 +3469,152 @@ msgstr ""
 "Не е предназначена за работа през конзолата, а се изпълнява в графичната "
 "среда GNOME."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "не е включено"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "не е регистрирана"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Домашна мрежа (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Домашна мрежа"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "търсене"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "регистрацията е отхвърлена"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роуминг)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Мрежа с роуминг (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Мрежа с роуминг"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "ПИН за картата „%s“ на „%s“"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Необходим е PIN"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Мобилното устройство изисква PIN"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Мобилната връзка „%s“ е активна: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "роуминг"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Връзка към %s"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "_Само този потребител да ползва паролата"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "_Всички потребители да ползват паролата"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Сертификати, DER или PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Избор на файл за PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Файлове за PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Всички файлове"
 
@@ -3589,15 +3650,32 @@ msgstr "В_ътрешна идентификация"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Автоматично снабдяване с PAC"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Избор на сертификат от сертифициращ орган…"
 
@@ -3625,15 +3703,46 @@ msgstr "_Не е необходим сертификат от сертифици
 msgid "PEAP _version:"
 msgstr "Версия на _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "П_итане всеки път за паролата"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "С_ертификат на CA:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Нешифрираните частни ключове са несигурни"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3647,11 +3756,11 @@ msgstr ""
 "\n"
 "(Можете да защитите частния си ключ с openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Избор на ваш, личен сертификат…"
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Избор на ваш частен ключ…"
 
@@ -3671,23 +3780,36 @@ msgstr "Частен _ключ:"
 msgid "_Private key password:"
 msgstr "Парола за _частен ключ:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Тунелен TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Защитен EAP (PEAP)"
 
@@ -3697,6 +3819,44 @@ msgstr "Защитен EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Идентификация:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (стандартно)"
@@ -3721,6 +3881,288 @@ msgstr "Пок_азване на ключа"
 msgid "WEP inde_x:"
 msgstr "Индек_с в WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Вид:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Включване на мобилна в_ръзка по WiMAX"
+
+#~ msgid "_Help"
+#~ msgstr "Помо_щ"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Свързани сте към свързаната мрежа."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Подготовка на свързаната връзка „%s“…"
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Настройване на свързаната връзка „%s“…"
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Изисква се идентификация на потребител за свързаната връзка „%s“…"
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Изискване на адрес за „%s“…"
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Свързаната връзка „%s“ е активна"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Свързани сте към мрежата-мост."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Подготовка на връзката-мост „%s“…"
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Настройване на връзката-мост „%s“…"
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Изисква се идентификация на потребител за връзката-мост „%s“…"
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Връзката-мост „%s“ е активна"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Нова връзка към мобилна мрежа (CDMA)…"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Свързани сте към мобилна мрежа (CDMA)."
+
+#~ msgid "CDMA network."
+#~ msgstr "Мрежа по CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Нова мобилна връзка (GSM)…"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Свързани сте към мобилна мрежа (GSM)."
+
+#~ msgid "GSM network."
+#~ msgstr "Мрежа по GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "Автоматичен InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Мрежи по InfiniBand (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Мрежа по InfiniBand мрежа (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Мрежи по InfiniBand"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "Мрежа по InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Свързани сте към мрежа по InfiniBand."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Подготовка на връзката по InfiniBand „%s“…"
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Настройване на връзка по InfiniBand „%s“…"
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr ""
+#~ "Изисква се идентификация на потребител за връзката по InfiniBand „%s“…"
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "Връзката по InfiniBand „%s“ е активна"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Свързани сте към обединената мрежа."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Подготовка на връзката към обединената мрежа „%s“…"
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Настройване на обединената връзка „%s“…"
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Изисква се идентификация на потребител за обединената връзка „%s“…"
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Обединената връзка „%s“ е активна"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Свързани сте към ВЛМ."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Подготовка на връзката към ВЛМ „%s“…"
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Настройване на връзката към ВЧМ „%s“…"
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Изисква се идентификация на потребител за връзката към ВЛМ „%s“…"
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "Връзката към ВЛМ „%s“ е активна"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Безжична връзка по WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Безжична връзка по WiMAX"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "Изключен WiMAX"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX е изключен от хардуерен ключ"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Свързани сте към мрежа по WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "неизвестно"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "неопределена"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "Р_ежим:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_Постоянен хардуерен адрес:"
+
+#~ msgid "Any"
+#~ msgstr "Всяка"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Предпочитана е 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Предпочитана е 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Предпочитана е 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Използване само на 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "_Внасяне на конфигурация за обединени връзки от файл…"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Инфраструктура"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ 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)."
+#~ msgstr ""
+#~ "Настройването на Bluetooth не е възможно (грешка при свързване с D-Bus: "
+#~ "(%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Настройването на Bluetooth не е възможно (грешка при намиране на "
+#~ "NetworkManager: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Използване на телефон като мрежово устройство (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Достъп до Интернет през мобилния ви телефон (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Грешка: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Не може да се създаде комутируема връзка: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Телефонът ви е готов за работа!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Съветникът беше отказан"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Неизвестен вид устройство (не е GSM или CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "неизвестен вид модем."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "неуспешна връзка с телефона."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "грешка при получаване на връзка с шината"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "връзката с телефона неочаквано прекъсна."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "времето за откриване на телефон изтече."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Разпознаване на настройките за телефона…"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Подразбиращия се адаптер за Bluetooth трябва да е активиран, преди да "
+#~ "създадете връзка през телефон."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Не може да се създаде връзка по лична мрежа PAN: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Мрежа „%s“"
+
 #~ msgid "Automatic (PPP)"
 #~ msgstr "Автоматично (PPP)"
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 5e7380d1..9d7c4dfe 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -2,7 +2,7 @@
 # Bengali (India) translation of network-manager-applet.
 # Copyright (C) 2009 network-manager-applet's COPYRIGHT HOLDER
 # This file is distributed under the same license as the network-manager-applet package.
-# 
+#
 # sankarshan mukhopadhyay <sankarshan@randomink.org>, 2009.
 # sankarshan mukhopadhyay <sankarshan@fedoraproject.org>, 2009.
 # Runa Bhattacharjee <runab@redhat.com>, 2010, 2011.
@@ -11,1339 +11,1740 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-21 08:48-0400\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
 "Language: bn-IN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../nm-applet.desktop.in.h:1
-msgid "Network Manager"
-msgstr "নেটওয়ার্ক ম্যানেজার"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#, fuzzy
+msgid "Network"
+msgstr "%s নেটওয়ার্ক"
 
 #: ../nm-applet.desktop.in.h:2
-msgid "Control your network connections"
+#, fuzzy
+msgid "Manage your network connections"
 msgstr "নেটওয়ার্ক সংযোগ নিয়ন্ত্রণ করুন"
 
-#: ../nm-applet.schemas.in.h:1
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "নেটওয়ার্ক সংযোগ"
+
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "আপনার নেটওয়ার্ক সংযোগ বৈশিষ্ট্য সম্পাদন ও পরিবর্তন করুন"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "সংযুক্ত হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
 
-#: ../nm-applet.schemas.in.h:2
-msgid ""
-"Set this to TRUE to disable notifications when connecting to a network."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
-"নেটওয়ার্কের সাথে সংযুক্ত করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার "
-"জন্য এই মান TRUE হিসাবে নির্ধারণ করুন।"
+"নেটওয়ার্কের সাথে সংযুক্ত করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই "
+"মান TRUE হিসাবে নির্ধারণ করুন।"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "বিচ্ছিন্ন হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
 
-#: ../nm-applet.schemas.in.h:4
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
-"নেটওয়ার্কের সাথে সংযোগ বিচ্ছিন্ন করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা "
-"নিষ্ক্রিয় করার জন্য এই মান TRUE হিসাবে নির্ধারণ করুন।"
+"নেটওয়ার্কের সাথে সংযোগ বিচ্ছিন্ন করার সময় বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার "
+"জন্য এই মান TRUE হিসাবে নির্ধারণ করুন।"
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "সংযুক্ত হওয়ার বিজ্ঞপ্তি নিষ্ক্রিয় করা হবে"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, 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
 msgid "Suppress networks available notifications"
 msgstr "উপলব্ধ নেটওয়ার্কের বিজ্ঞপ্তি প্রদর্শন আড়াল করা হবে"
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
-"বেতার নেটওয়ার্ক উপলব্ধ থাকলে বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার জন্য "
-"এই মান TRUE হিসাবে নির্ধারণ করুন।"
+"বেতার নেটওয়ার্ক উপলব্ধ থাকলে বিজ্ঞপ্তি প্রদানের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই মান "
+"TRUE হিসাবে নির্ধারণ করুন।"
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "স্ট্যাম্প"
 
-#: ../nm-applet.schemas.in.h:8
-msgid ""
-"Used to determine whether settings should be migrated to a new version."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
-"নতুন সংস্করণের মধ্যে বৈশিষ্ট্য মাইগ্রেট করা হবে কি না নির্ধারণ করতে এটি "
-"ব্যবহার করা হয়।"
+"নতুন সংস্করণের মধ্যে বৈশিষ্ট্য মাইগ্রেট করা হবে কি না নির্ধারণ করতে এটি ব্যবহার করা "
+"হয়।"
 
-#: ../nm-applet.schemas.in.h:9
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
 msgstr "ওয়াই-ফাই নির্মাণ নিষ্ক্রিয় করুন"
 
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
-"এই অ্যাপ্লেট সহযোগে অ্যাড-হক নেটওয়ার্ক নির্মাণের ব্যবস্থা নিষ্ক্রিয় করার "
-"জন্য এই মান TRUE হিসাবে নির্ধারণ করুন।"
+"এই অ্যাপ্লেট সহযোগে অ্যাড-হক নেটওয়ার্ক নির্মাণের ব্যবস্থা নিষ্ক্রিয় করার জন্য এই মান "
+"TRUE হিসাবে নির্ধারণ করুন।"
 
-#: ../nm-applet.schemas.in.h:11
-msgid "Show WPA protocol chooser widget"
-msgstr "WPA প্রোটোকল চয়নকারী উইজেট দেখান"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:12
-msgid "Set to TRUE to show the WPA protocol chooser when editing connections."
-msgstr "সংযোগ সম্পাদনার সময়ে WPA প্রোটোকল চয়নকারী দেখাতে সত্যতে সেট করুন।"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "নেটওয়ার্ক সংযোগ"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "CA সার্টিফিকেট: (_A)"
 
-#: ../nm-connection-editor.desktop.in.h:2
-msgid "Manage and change your network connection settings"
-msgstr "আপনার নেটওয়ার্ক সংযোগ বৈশিষ্ট্য সম্পাদন ও পরিবর্তন করুন"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
 
-#: ../src/applet-dbus-manager.c:165
-#, c-format
-msgid "An instance of nm-applet is already running.\n"
-msgstr "nm-applet-র একটি ইনস্ট্যান্স বর্তমানে চলছে।\n"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
 
-#: ../src/applet-dbus-manager.c:167
-#, c-format
-msgid "Could not acquire the %s service. (%d)\n"
-msgstr "%s পরিসেবা গ্রহণ করতে ব্যর্থ। (%d)\n"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "নেটওয়ার্ক ম্যানেজার"
 
-#: ../src/applet-device-bond.c:74 ../src/applet-device-bridge.c:74
-#: ../src/applet-device-bt.c:95 ../src/applet-device-cdma.c:329
-#: ../src/applet-device-gsm.c:372 ../src/applet-device-infiniband.c:131
-#: ../src/applet-device-vlan.c:189 ../src/applet-device-wifi.c:782
-#: ../src/applet-device-wired.c:135
-msgid "Available"
-msgstr "উপলব্ধ"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "নেটওয়ার্ক ম্যানেজার"
 
-#: ../src/applet-device-bond.c:87 ../src/applet-device-bridge.c:87
-#: ../src/applet-device-bt.c:107 ../src/applet-device-cdma.c:368
-#: ../src/applet-device-gsm.c:411 ../src/applet-device-infiniband.c:146
-#: ../src/applet-device-vlan.c:202 ../src/applet-device-wifi.c:1231
-#: ../src/applet-device-wired.c:150
-msgid "Connection Established"
-msgstr "সংযোগ স্থাপন করা হয়েছে"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
 
-#: ../src/applet-device-bond.c:88
-msgid "You are now connected to the bonded network."
-msgstr "অাপনি এখন বন্ডেড নেটওয়ার্কের সাথে সংযুক্ত।"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
 
-#: ../src/applet-device-bond.c:112
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "'%s' বন্ড সংযোগ প্রস্তুত করা হচ্ছে..."
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#, fuzzy
+msgid "802.1X authentication"
+msgstr "তারযুক্ত 802.1X অনুমোদন ব্যবস্থা"
 
-#: ../src/applet-device-bond.c:115
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "'%s' বন্ড সংযোগ কনফিগার করা হচ্ছে..."
+#: ../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
+msgid "_Cancel"
+msgstr ""
 
-#: ../src/applet-device-bond.c:118
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "'%s' বন্ড সংযোগের জন্য ব্যবহারকারীর প্রমাণীকরণ থাকা আবশ্যক..."
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "সংযোগ করুন (_o)"
 
-#: ../src/applet-device-bond.c:121 ../src/applet-device-bridge.c:121
-#: ../src/applet-device-infiniband.c:180 ../src/applet-device-vlan.c:236
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "'%s'-র জন্য ঠিকানার অনুরোধ করা হচ্ছে..."
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "নেটওয়ার্কের নাম: (_N)"
 
-#: ../src/applet-device-bond.c:125 ../src/applet-device-bridge.c:125
-#: ../src/applet-device-vlan.c:240
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "'%s' VLAN সংযোগ সক্রিয়"
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "অ্যাড-হক"
 
-#: ../src/applet-device-bridge.c:88
-msgid "You are now connected to the bridged network."
-msgstr "অাপনি এখন ব্রিজড নেটওয়ার্কের সাথে সংযুক্ত"
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
 
-#: ../src/applet-device-bridge.c:112
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "'%s' ব্রিজ সংযোগ প্রস্তুত করা হচ্ছে..."
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "সংযোগ তৈরি করা সম্ভব হয়নি"
 
-#: ../src/applet-device-bridge.c:115
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "'%s' ব্রিজ সংযোগ  কনফিগার করা হচ্ছে..."
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "অজানা"
 
-#: ../src/applet-device-bridge.c:118
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "'%s' ব্রিজ সংযোগের জন্য ব্যবহারকারীর প্রমাণীকরণ থাকা আবশ্যক..."
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "সংযোগ যোগ করতে ব্যর্থ"
 
-#: ../src/applet-device-bt.c:108
-msgid "You are now connected to the mobile broadband network."
-msgstr "আপনি এখন মোবাইল ব্রড-ব্যান্ড নেটওয়ার্কের সাথে সংযুক্ত।"
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "সংযোগ বিচ্ছিন্ন"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "সংযোগ বিচ্ছিন্ন"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "সংযোগ যোগ করতে ব্যর্থ"
 
-#: ../src/applet-device-bt.c:132 ../src/applet-device-cdma.c:397
-#: ../src/applet-device-gsm.c:440
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "এই বার্তা পুনরায় প্রদর্শন করা হবে না"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "মোবাইল ব্রড-ব্যান্ড সংযোগ '%s' কে প্রস্তুত করা হচ্ছে..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"নেটওয়ার্ক সংযোগ বিঘ্নিত হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet-device-bt.c:135 ../src/applet-device-cdma.c:400
-#: ../src/applet-device-gsm.c:443
+#: ../src/applet.c:847
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "'%s' ব্রড-ব্যান্ড সংযোগ কনফিগার করা হচ্ছে..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"VPN পরিসেবা অপ্রত্যাশিতভাবে বন্ধ হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet-device-bt.c:138 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:446
+#: ../src/applet.c:850
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
 msgstr ""
-"'%s' মোবাইল ব্রড-ব্যান্ড সংযোগের ক্ষেত্রে ব্যবহারকারীর অনুমোদন প্রয়োজন..."
+"\n"
+"VPN পরিসেবা থেকে অবৈধ কনফিগারেশন প্রাপ্ত হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet-device-bt.c:141 ../src/applet-device-cdma.c:406
-#: ../src/applet-device-gsm.c:449 ../src/applet.c:2568
+#: ../src/applet.c:853
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "'%s'-র জন্য নেটওয়ার্ক ঠিকানা অনুরোধ করা হচ্ছে..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"সংযোগের সময়সীমা উত্তীর্ণ হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet-device-bt.c:145 ../src/applet-device-cdma.c:423
-#: ../src/applet-device-gsm.c:461
+#: ../src/applet.c:856
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "'%s' মোবাইল ব্রড-ব্যান্ড সংযোগ বর্তমানে সক্রিয়"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"যথাযত সময়ে VPN পরিসেবা আরম্ভ না হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:638
-#: ../src/mb-menu-item.c:55
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:859
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"VPN পরিসেবা আরম্ভ না হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet-device-cdma.c:278 ../src/applet-device-gsm.c:322
+#: ../src/applet.c:862
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "মোবাইল ব্রড-ব্যান্ড (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"VPN-র বৈধ গোপনীয় তথ্য উপস্থিত না থাকার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
 
-#: ../src/applet-device-cdma.c:280 ../src/applet-device-gsm.c:324
-#: ../src/connection-editor/new-connection.c:118
-#: ../src/connection-editor/page-mobile.c:326
-msgid "Mobile Broadband"
-msgstr "মোবাইল ব্রড-ব্যান্ড"
+#: ../src/applet.c:865
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"VPN-র অবৈধ গোপন তথ্যের ফলে '%s' VPN সংযোগ বিফল হয়েছে।"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:342
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "নতুন মোবাইল ব্রড-ব্যান্ড (CDMA) সংযোগ..."
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"'%s' VPN সংযোগ বিফল।"
 
-#: ../src/applet-device-cdma.c:369
-msgid "You are now connected to the CDMA network."
-msgstr "আপনি এখন CDMA নেটওয়ার্কের সাথে সংযুক্ত।"
+#: ../src/applet.c:888
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"নেটওয়ার্ক সংযোগ বিঘ্নিত হওয়ার ফলে VPN সংযোগ '%s'-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে।"
 
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-gsm.c:456
+#: ../src/applet.c:891
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "'%s' মোবাইল ব্রড-ব্যান্ড সংযোগ বর্তমানে সক্রিয়: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"VPN পরিসেবা অপ্রত্যাশিতভাবে বন্ধ হওয়ার ফলে VPN সংযোগ '%s'-র সাথে সংযোগ বিচ্ছিন্ন "
+"হয়েছে।"
 
-#: ../src/applet-device-cdma.c:421 ../src/applet-device-gsm.c:459
-msgid "roaming"
-msgstr "রোমিং"
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"VPN সংযোগ '%s'-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে"
 
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:641
-#: ../src/mb-menu-item.c:60
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:385
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "নতুন মোবাইল ব্রড-ব্যান্ড (GSM) সংযোগ..."
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
 
-#: ../src/applet-device-gsm.c:412
-msgid "You are now connected to the GSM network."
-msgstr "আপনি এখন GSM নেটওয়ার্কের সাথে সংযুক্ত।"
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "VPN লগ-ইনের বার্তা"
 
-#: ../src/applet-device-gsm.c:688
-msgid "PIN code required"
-msgstr "PIN কোড প্রয়োজন"
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "VPN সংযোগ বিফল"
 
-#: ../src/applet-device-gsm.c:690
-msgid "PUK code required"
-msgstr "PUK কোড প্রয়োজন"
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN পরিসেবা আরম্ভ না হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:701
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "মোবাইল ব্রড-ব্যান্ড ডিভাইসের ক্ষেত্রে PIN কোড উল্লেখ করা আবশ্যক"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN সংযোগ '%s' আরম্ভ করতে ব্যর্থ।\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:703
-msgid "PUK code is needed for the mobile broadband device"
-msgstr "মোবাইল ব্রড-ব্যান্ড ডিভাইসের ক্ষেত্রে PUK কোড উল্লেখ করা আবশ্যক"
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "ডিভাইস প্রস্তুত নয় (ফার্মওয়্যার অনুপস্থিত)"
 
-#: ../src/applet-device-gsm.c:836
-msgid "Wrong PIN code; please contact your provider."
-msgstr "ভুল PIN কোড; অনুগ্রহ করে পরিসেবা উপলব্ধকারীর সাথে যোগাযোগ করুন।"
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "ডিভাইস প্রস্তুত নয়"
 
-#: ../src/applet-device-gsm.c:859
-msgid "Wrong PUK code; please contact your provider."
-msgstr "ভুল PUK কোড; অনুগ্রহ করে পরিসেবা উপলব্ধকারীর সাথে যোগাযোগ করুন।"
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "সংযোগ বিচ্ছিন্ন"
 
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:886
-msgid "Sending unlock code..."
-msgstr "আন-লক করার কোড পাঠানো হচ্ছে..."
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "সংযোগ বিচ্ছিন্ন করুন"
 
-#: ../src/applet-device-gsm.c:946
-msgid "SIM PIN unlock required"
-msgstr "SIM PIN আন-লক করা প্রয়োজন"
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "ডিভাইস পরিচালিত নয়"
 
-#: ../src/applet-device-gsm.c:947
-msgid "SIM PIN Unlock Required"
-msgstr "SIM PIN আন-লক করা প্রয়োজন"
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "কোনো নেটওয়ার্ক ডিভাইস উপলব্ধ নয়"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:949
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"'%s' মোবাইল ব্রড-ব্যান্ড ডিভাইসটি ব্যবহার করার পূর্বে একটি SIM PIN কোড "
-"উপলব্ধ থাকা আবশ্যক।"
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "VPN সংযোগ (_V)"
 
-#: ../src/applet-device-gsm.c:950
-msgctxt "PIN code entry label"
-msgid "PIN code:"
-msgstr "PIN কোড:"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "VPN কনফিগার করুন...(_C)"
 
-#: ../src/applet-device-gsm.c:953
-msgctxt "Show/obscure PIN checkbox label"
-msgid "Show PIN code"
-msgstr "PIN কোড প্রদর্শন:"
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "VPN-র সাথে সংযোগ বিচ্ছিন্ন করুন (_D)"
 
-#: ../src/applet-device-gsm.c:956
-msgid "SIM PUK unlock required"
-msgstr "SIM PUK আন-লক করা প্রয়োজন"
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager বর্তমানে চলছে না..."
 
-#: ../src/applet-device-gsm.c:957
-msgid "SIM PUK Unlock Required"
-msgstr "SIM PUK আন-লক করা প্রয়োজন"
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "নেটওয়ার্ক ব্যবস্থা নিষ্ক্রিয় অবস্থায় রয়েছে"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:959
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"'%s' মোবাইল ব্রড-ব্যান্ড ডিভাইসটি ব্যবহার করার পূর্বে একটি SIM PUK কোড "
-"উপলব্ধ থাকা আবশ্যক।"
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "নেটওয়ার্ক সক্রিয় করুন (_N)"
 
-#: ../src/applet-device-gsm.c:960
-msgctxt "PUK code entry label"
-msgid "PUK code:"
-msgstr "PUK কোড:"
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "বেতার সক্রিয় করুন (_W)"
 
-#: ../src/applet-device-gsm.c:962
-msgctxt "New PIN entry label"
-msgid "New PIN code:"
-msgstr "নতুন PIN কোড:"
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "মোবাইল ব্রড-ব্যান্ড সক্রিয় করুন (_M)"
 
-#: ../src/applet-device-gsm.c:963
-msgctxt "New PIN verification entry label"
-msgid "Re-enter new PIN code:"
-msgstr "নতুন PIN কোড পুনরায় লিখুন:"
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "বিজ্ঞপ্তি প্রদানের ব্যবস্থা সক্রিয় করুন (_o)"
 
-#: ../src/applet-device-gsm.c:967
-msgctxt "Show/obscure PIN/PUK checkbox label"
-msgid "Show PIN/PUK codes"
-msgstr "PIN/PUK কোড প্রদর্শন:"
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "সংযোগ সংক্রান্ত তথ্য (_I)"
 
-#: ../src/applet-device-infiniband.c:41
-msgid "Auto InfiniBand"
-msgstr "স্বয়ংক্রিয় InfiniBand"
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "সংযোগ সম্পাদনা..."
 
-#: ../src/applet-device-infiniband.c:96
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand নেটওয়ার্ক (%s)"
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "পরিচিতি (_A)"
 
-#: ../src/applet-device-infiniband.c:98
+#: ../src/applet.c:2179
 #, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand নেটওয়ার্ক (%s)"
-
-#: ../src/applet-device-infiniband.c:101
-msgid "InfiniBand Networks"
-msgstr "InfiniBand নেটওয়ার্ক"
-
-#: ../src/applet-device-infiniband.c:103
-msgid "InfiniBand Network"
-msgstr "InfiniBand নেটওয়ার্ক"
+msgid "You are now connected to '%s'."
+msgstr "আপনি এখন '%s'-র সাথে সংযুক্ত।"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-infiniband.c:123 ../src/applet-device-vlan.c:180
-#: ../src/applet-device-wired.c:127 ../src/applet.c:1358
-msgid "disconnected"
+#: ../src/applet.c:2222
+msgid "Disconnected"
 msgstr "সংযোগ বিচ্ছিন্ন"
 
-#: ../src/applet-device-infiniband.c:147
-msgid "You are now connected to the InfiniBand network."
-msgstr "অাপনি এখন InfiniBand নেটওয়ার্কের সাথে সংযুক্ত।"
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "নেটওয়ার্কের সংযোগ বিচ্ছিন্ন করা হয়েছে।"
 
-#: ../src/applet-device-infiniband.c:171
+#: ../src/applet.c:2474
 #, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "'%s' InfiniBand সংযোগ প্রস্তুত করা হচ্ছে..."
+msgid "Preparing network connection '%s'..."
+msgstr "'%s' নেটওয়ার্ক সংযোগ প্রস্তুত করা হচ্ছে..."
 
-#: ../src/applet-device-infiniband.c:174
+#: ../src/applet.c:2477
 #, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "'%s' InfiniBand সংযোগ কনফিগার করা হচ্ছে..."
+msgid "User authentication required for network connection '%s'..."
+msgstr "'%s' নেটওয়ার্ক সংযোগের জন্য ব্যবহারকারীর অনুমোদন প্রয়োজন..."
 
-#: ../src/applet-device-infiniband.c:177
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "'%s' InfiniBand সংযোগের জন্য ব্যবহারকারীর প্রমাণীকরণ থাকা আবশ্যক..."
+msgid "Requesting a network address for '%s'..."
+msgstr "'%s'-র জন্য নেটওয়ার্ক ঠিকানা অনুরোধ করা হচ্ছে..."
 
-#: ../src/applet-device-infiniband.c:184
+#: ../src/applet.c:2483
 #, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "'%s' InfiniBand সংযোগ সক্রিয়"
+msgid "Network connection '%s' active"
+msgstr "'%s' নেটওয়ার্ক সংযোগ বর্তমানে সক্রিয়"
 
-#: ../src/applet-device-vlan.c:203
-msgid "You are now connected to the VLAN."
-msgstr "আপনি এখন VLAN'র সাথে সংযুক্ত।"
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "'%s' VPN সংযোগ আরম্ভ করা হচ্ছে..."
 
-#: ../src/applet-device-vlan.c:227
+#: ../src/applet.c:2560
 #, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "'%s' VLAN সংযোগ প্রস্তুত করা হচ্ছে..."
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "'%s' VPN সংযোগের জন্য ব্যবহারকারী অনুমোদিত হওয় আবশ্যক..."
 
-#: ../src/applet-device-vlan.c:230
+#: ../src/applet.c:2563
 #, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "'%s' VLAN সংযোগ কনফিগার করা হচ্ছে..."
+msgid "Requesting a VPN address for '%s'..."
+msgstr "'%s'-র জন্য VPN ঠিকানার অনুরোধ করা হচ্ছে..."
 
-#: ../src/applet-device-vlan.c:233
+#: ../src/applet.c:2566
 #, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "'%s' VLAN সংযোগের জন্য ব্যবহারকারীর প্রমাণীকরণ থাকা আবশ্যক..."
+msgid "VPN connection '%s' active"
+msgstr "'%s' VPN সংযোগ বর্তমানে সক্রিয়"
 
-#: ../src/applet-device-wifi.c:88
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "গোপন বেতার নেটওয়ার্কের সাথে সংযোগ স্থাপন করুন...(_C)"
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "কোনো নেটওয়ার্ক সংযোগ উপস্থিত নেই"
 
-#: ../src/applet-device-wifi.c:121
-msgid "Create _New Ad-Hoc Wireless Network..."
-msgstr "নতুন বেতার নেটওয়ার্ক নির্মাণ করুন...(_N)"
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "NetworkManager অ্যাপ্লেট"
 
-#: ../src/applet-device-wifi.c:718
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "বেতার নেটওয়ার্ক (%s)"
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr "ভুল PUK কোড; অনুগ্রহ করে পরিসেবা উপলব্ধকারীর সাথে যোগাযোগ করুন।"
 
-#: ../src/applet-device-wifi.c:720
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "বেতার নেটওয়ার্ক (%s)"
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "ভুল PIN কোড; অনুগ্রহ করে পরিসেবা উপলব্ধকারীর সাথে যোগাযোগ করুন।"
 
-#: ../src/applet-device-wifi.c:722
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "বেতার নেটওয়ার্ক"
-msgstr[1] "বেতার নেটওয়ার্ক"
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr "আন-লক করার কোড পাঠানো হচ্ছে..."
 
-#: ../src/applet-device-wifi.c:748
-msgid "wireless is disabled"
-msgstr "বেতার নিষ্ক্রিয় করা হয়েছে"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "মোবাইল ব্রড-ব্যান্ড (%s)"
 
-#: ../src/applet-device-wifi.c:809
-msgid "More networks"
-msgstr "অতিরিক্ত নেটওয়ার্ক"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "মোবাইল ব্রড-ব্যান্ড"
 
-#: ../src/applet-device-wifi.c:1012
-msgid "Wireless Networks Available"
-msgstr "বেতার নেটওয়ার্ক উপলব্ধ রয়েছে"
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "উপলব্ধ"
 
-#: ../src/applet-device-wifi.c:1013
-msgid "Click on this icon to connect to a wireless network"
-msgstr "বেতার নেটওয়ার্কের সাথে সংযোগ স্থাপনের জন্য এই আইকনের উপর ক্লিক করুন"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "নতুন মোবাইল ব্রড-ব্যান্ড সংযোগ"
 
-#: ../src/applet-device-wifi.c:1016 ../src/applet.c:723
-msgid "Don't show this message again"
-msgstr "এই বার্তা পুনরায় প্রদর্শন করা হবে না"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "সংযোগ স্থাপন করা হয়েছে"
 
-#: ../src/applet-device-wifi.c:1229
-#, c-format
-msgid "You are now connected to the Wi-Fi network '%s'."
-msgstr "অাপনি এখন '%s' Wi-Fi নেটওয়ার্কের সাথে সংযুক্ত।"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "আপনি এখন মোবাইল ব্রড-ব্যান্ড নেটওয়ার্কের সাথে সংযুক্ত।"
 
-#: ../src/applet-device-wifi.c:1230 ../src/applet-device-wifi.c:1260
-msgid "(none)"
-msgstr "(শূণ্য)"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "মোবাইল ব্রডব্যান্ড নেটওয়ার্ক পাসওয়ার্ড"
 
-#: ../src/applet-device-wifi.c:1270
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "বেতার নেটওয়ার্ক সংযোগ '%s' প্রস্তুত করা হচ্ছে..."
+#: ../src/applet-device-broadband.c:957
+#, fuzzy
+msgid "You are now registered on the home network."
+msgstr "অাপনি এখন বন্ডেড নেটওয়ার্কের সাথে সংযুক্ত।"
 
-#: ../src/applet-device-wifi.c:1273
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "'%s' বেতার নেটওয়ার্ক সংযোগ কনফিগার করা হচ্ছে..."
+#: ../src/applet-device-broadband.c:963
+#, fuzzy
+msgid "You are now registered on a roaming network."
+msgstr "অাপনি এখন ব্রিজড নেটওয়ার্কের সাথে সংযুক্ত"
 
-#: ../src/applet-device-wifi.c:1276
+#: ../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
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr "'%s' বেতার নেটওয়ার্কের জন্য ব্যবহারকারীর অনুমোদন প্রয়োজন..."
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "মোবাইল ব্রড-ব্যান্ড সংযোগ '%s' কে প্রস্তুত করা হচ্ছে..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "'%s'-র জন্য বেতার নেটওয়ার্কের ঠিকানার অনুরোধ করা হচ্ছে..."
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "'%s' ব্রড-ব্যান্ড সংযোগ কনফিগার করা হচ্ছে..."
 
-#: ../src/applet-device-wifi.c:1299
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "'%s' বেতার নেটওয়ার্ক সংযোগ বর্তমানে সক্রিয়: %s (%d%%)"
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "'%s' মোবাইল ব্রড-ব্যান্ড সংযোগের ক্ষেত্রে ব্যবহারকারীর অনুমোদন প্রয়োজন..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "'%s' বেতার নেটওয়ার্ক সংযোগ বর্তমানে সক্রিয়"
+msgid "Mobile broadband connection '%s' active"
+msgstr "'%s' মোবাইল ব্রড-ব্যান্ড সংযোগ বর্তমানে সক্রিয়"
 
-#: ../src/applet-device-wired.c:45
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "স্বয়ংক্রিয় ইথারনেট"
 
-#: ../src/applet-device-wired.c:100
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "তারযুক্ত নেটওয়ার্ক (%s)"
 
-#: ../src/applet-device-wired.c:102
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "তারযুক্ত নেটওয়ার্ক (%s)"
 
-#: ../src/applet-device-wired.c:105
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "তারযুক্ত নেটওয়ার্ক"
 
-#: ../src/applet-device-wired.c:107
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "তারযুক্ত নেটওয়ার্ক"
 
-#: ../src/applet-device-wired.c:151
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "বর্তমানে তারযুক্ত নেটওয়ার্কের সাথে সংযোগ স্থাপন করা হয়েছে"
 
-#: ../src/applet-device-wired.c:175
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s', প্রস্তুত করা হচ্ছে..."
 
-#: ../src/applet-device-wired.c:178
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s' কনফিগার করা হচ্ছে..."
 
-#: ../src/applet-device-wired.c:181
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s'-র ক্ষেত্রে অনুমোদিত হওয়া আবশ্যক..."
 
-#: ../src/applet-device-wired.c:184
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s'-র জন্য তারযুক্ত নেটওয়ার্কের ঠিকানা প্রাপ্তির অনুরোধ করা হচ্ছে..."
 
-#: ../src/applet-device-wired.c:188
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s' বর্তমানে সক্রিয়"
 
-#: ../src/applet-device-wired.c:439
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL অনুমোদন"
 
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "গোপন বেতার নেটওয়ার্কের সাথে সংযোগ স্থাপন করুন...(_C)"
+
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
+msgstr "নতুন বেতার নেটওয়ার্ক নির্মাণ করুন...(_N)"
+
+#: ../src/applet-device-wifi.c:431
+msgid "(none)"
+msgstr "(শূণ্য)"
+
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "তারযুক্ত নেটওয়ার্ক (%s)"
+
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "তারযুক্ত নেটওয়ার্ক (%s)"
+
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "তারযুক্ত নেটওয়ার্ক"
+msgstr[1] "তারযুক্ত নেটওয়ার্ক"
+
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "বেতার নিষ্ক্রিয় করা হয়েছে"
+
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:996
+msgid "More networks"
+msgstr "অতিরিক্ত নেটওয়ার্ক"
+
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
+msgstr "বেতার নেটওয়ার্ক উপলব্ধ রয়েছে"
+
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr "বেতার নেটওয়ার্কের সাথে সংযোগ স্থাপনের জন্য এই আইকনের উপর ক্লিক করুন"
+
+#: ../src/applet-device-wifi.c:1364
+#, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "অাপনি এখন '%s' Wi-Fi নেটওয়ার্কের সাথে সংযুক্ত।"
+
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "'%s' নেটওয়ার্ক সংযোগ প্রস্তুত করা হচ্ছে..."
+
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s' কনফিগার করা হচ্ছে..."
+
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr "'%s' বেতার নেটওয়ার্কের জন্য ব্যবহারকারীর অনুমোদন প্রয়োজন..."
+
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "'%s'-র জন্য নেটওয়ার্ক ঠিকানা অনুরোধ করা হচ্ছে..."
+
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr "'%s' বেতার নেটওয়ার্ক সংযোগ বর্তমানে সক্রিয়: %s (%d%%)"
+
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "তারযুক্ত নেটওয়ার্ক সংযোগ '%s' বর্তমানে সক্রিয়"
+
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "সংযোগ তৈরি করা সম্ভব হয়নি"
+
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "নতুন সংযোগ নির্মাণ করা সম্ভব হয়নি"
+
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "সংযোগ সংক্রান্ত তথ্য প্রদর্শন করতে সমস্যা:"
 
-#: ../src/applet-dialogs.c:110
-#: ../src/connection-editor/page-wireless-security.c:287
-#: ../src/wireless-dialog.c:957
-#: ../src/wireless-security/wireless-security.c:418
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:112
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "ডাইনামিক WEP"
 
-#: ../src/applet-dialogs.c:114 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:227
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+msgid "More addresses"
+msgstr ""
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235
-#: ../src/connection-editor/page-wireless-security.c:241
-#: ../src/wireless-dialog.c:914
-msgctxt "No wifi security used"
-msgid "None"
-msgstr "শূণ্য"
-
-#: ../src/applet-dialogs.c:244
-msgctxt "No wired security used"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "শূণ্য"
 
-#: ../src/applet-dialogs.c:247
-msgctxt "Unknown/unrecognized wired or wifi security"
-msgid "Unknown"
-msgstr "অজানা"
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "ডিফল্ট"
 
-#: ../src/applet-dialogs.c:317 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u মেগাবাইট/সেকেন্ড"
 
-#: ../src/applet-dialogs.c:319 ../src/applet-dialogs.c:425
-#: ../src/applet-dialogs.c:459 ../src/applet-dialogs.c:475
-#: ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#, fuzzy
+msgctxt "Speed"
+msgid "Unknown"
+msgstr "অজানা"
+
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#, fuzzy
+msgctxt "Address"
+msgid "Unknown"
+msgstr "অজানা"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP ঠিকানা:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "ব্রডকাস্টের ঠিকানা:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+#, fuzzy
+msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "অজানা"
 
-#: ../src/applet-dialogs.c:354
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "সাবনেট মাস্ক:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ইথারনেট (%s)"
 
-#: ../src/applet-dialogs.c:356
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 ওয়াই-ফাই (%s)"
 
-#: ../src/applet-dialogs.c:358
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:360
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:366
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "সাধারণ"
 
-#: ../src/applet-dialogs.c:370
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "ইন্টারফেস:"
 
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "হার্ডওয়্যারের ঠিকানা:"
 
 #. Driver
-#: ../src/applet-dialogs.c:392
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ড্রাইভার:"
 
-#: ../src/applet-dialogs.c:428
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "গতি:"
 
-#. Security
-#: ../src/applet-dialogs.c:435
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "নিরাপত্তা:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:446
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:457 ../src/applet-dialogs.c:562
-msgid "IP Address:"
-msgstr "IP ঠিকানা:"
-
-#: ../src/applet-dialogs.c:473
-msgid "Broadcast Address:"
-msgstr "ব্রডকাস্টের ঠিকানা:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:482
-msgid "Subnet Mask:"
-msgstr "সাবনেট মাস্ক:"
-
-#: ../src/applet-dialogs.c:492 ../src/applet-dialogs.c:577
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "ডিফল্ট রুট:"
 
-#: ../src/applet-dialogs.c:504
-msgid "Primary DNS:"
-msgstr "প্রধান DNS:"
-
-#: ../src/applet-dialogs.c:513
-msgid "Secondary DNS:"
-msgstr "দ্বিতীয় DNS:"
-
-#: ../src/applet-dialogs.c:523
-msgid "Ternary DNS:"
-msgstr "তৃতীয় DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:538
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:547
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "উপেক্ষা করা হয়েছে"
 
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "ধরন: (_T)"
+
+#: ../src/applet-dialogs.c:822
+#, fuzzy
+msgid "VPN Gateway:"
+msgstr "গেটওয়ে"
+
+#: ../src/applet-dialogs.c:828
+#, fuzzy
+msgid "VPN Username:"
+msgstr "ব্যবহারকারীর নাম: (_U)"
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "সংযোগ: (_n)"
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr "অজানা"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:653
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "কোনো বৈধ সক্রিয় সংযোগ সনাক্ত করা যায়নি!"
 
-#: ../src/applet-dialogs.c:765
-msgid "Copyright © 2004-2012 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc."
-msgstr "কপিরাইট © 2004-2012 Red Hat, Inc.\n"
+#: ../src/applet-dialogs.c:985
+#, fuzzy
+msgid ""
+"Copyright © 2004-2014 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:767
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr ""
-"নেটওয়ার্ক ডিভাইস ও সংযোগ পরিচালনার জন্য ব্যবহারযোগ্য বিজ্ঞপ্তিস্থলের "
-"অ্যাপ্লেট।"
+msgstr "নেটওয়ার্ক ডিভাইস ও সংযোগ পরিচালনার জন্য ব্যবহারযোগ্য বিজ্ঞপ্তিস্থলের অ্যাপ্লেট।"
 
-#: ../src/applet-dialogs.c:769
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager ওয়েব-সাইট"
 
-#: ../src/applet-dialogs.c:772
-msgid "translator-credits"
-msgstr "সঙ্কর্ষণ মুখোপাধ্যায়\n"
-"রুণা ভট্টাচার্য্য"
-
-#: ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "অনুপস্থিত রিসোর্স"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "মোবাইল ব্রডব্যান্ড নেটওয়ার্ক পাসওয়ার্ড"
 
-#: ../src/applet-dialogs.c:824
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s'-র সাথে সংযোগ স্থাপন করার জন্য পাসওয়ার্ড লেখা আবশ্যক।"
 
-#: ../src/applet-dialogs.c:845
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../src/applet.c:836
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
-msgstr "\n"
-"নেটওয়ার্ক সংযোগ বিঘ্নিত হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "SIM PIN আন-লক করা প্রয়োজন"
+
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "SIM PIN আন-লক করা প্রয়োজন"
 
-#: ../src/applet.c:839
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN পরিসেবা অপ্রত্যাশিতভাবে বন্ধ হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
+"'%s' মোবাইল ব্রড-ব্যান্ড ডিভাইসটি ব্যবহার করার পূর্বে একটি SIM PIN কোড উপলব্ধ থাকা "
+"আবশ্যক।"
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+#, fuzzy
+msgid "PIN code:"
+msgstr "PIN কোড:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+#, fuzzy
+msgid "Show PIN code"
+msgstr "PIN কোড প্রদর্শন:"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "SIM PUK আন-লক করা প্রয়োজন"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "SIM PUK আন-লক করা প্রয়োজন"
 
-#: ../src/applet.c:842
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN পরিসেবা থেকে অবৈধ কনফিগারেশন প্রাপ্ত হওয়ার ফলে VPN সংযোগ '%s' বিফল "
-"হয়েছে।"
+"'%s' মোবাইল ব্রড-ব্যান্ড ডিভাইসটি ব্যবহার করার পূর্বে একটি SIM PUK কোড উপলব্ধ থাকা "
+"আবশ্যক।"
 
-#: ../src/applet.c:845
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
-msgstr "\n"
-"সংযোগের সময়সীমা উত্তীর্ণ হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+#, fuzzy
+msgid "PUK code:"
+msgstr "PUK কোড:"
 
-#: ../src/applet.c:848
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
-""
-msgstr "\n"
-"যথাযত সময়ে VPN পরিসেবা আরম্ভ না হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+#, fuzzy
+msgid "New PIN code:"
+msgstr "নতুন PIN কোড:"
 
-#: ../src/applet.c:851
-#, c-format
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+#, fuzzy
+msgid "Re-enter new PIN code:"
+msgstr "নতুন PIN কোড পুনরায় লিখুন:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+#, 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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
+
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
-msgstr "\n"
-"VPN পরিসেবা আরম্ভ না হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
+msgstr ""
+"নেটওয়ার্কের মধ্যে উপস্থিত বিভিন্ন কম্পিউটার সনাক্ত করার জন্য IP ঠিকানা প্রয়োগ করা "
+"হয়। IP ঠিকানা যোগ করার জন্য \"যোগ করুন\" শীর্ষক বাটনটি ক্লিক করুন।"
 
-#: ../src/applet.c:854
-#, c-format
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "মুছে ফেলুন (_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+#, 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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"VPN-র বৈধ গোপনীয় তথ্য উপস্থিত না থাকার ফলে VPN সংযোগ '%s' বিফল হয়েছে।"
+"সক্রিয় করা হলে, এই সংযোগটি কখনো ডিফল্ট নেটওয়ার্ক সংযোগ রূপে ব্যবহার করা যাবে না।"
+
+#: ../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/applet.c:857
-#, c-format
-msgid "\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
-msgstr "\n"
-"VPN-র অবৈধ গোপন তথ্যের ফলে '%s' VPN সংযোগ বিফল হয়েছে।"
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+#, fuzzy
+msgid "Create…"
+msgstr "নির্মান করুন (_r)"
 
-#: ../src/applet.c:864
-#, c-format
-msgid "\n"
-"The VPN connection '%s' failed."
-msgstr "\n"
-"'%s' VPN সংযোগ বিফল।"
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "নতুন সংযোগ তৈরি করুন"
 
-#: ../src/applet.c:882
-#, c-format
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+"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."
 msgstr ""
-"\n"
-"নেটওয়ার্ক সংযোগ বিঘ্নিত হওয়ার ফলে VPN সংযোগ '%s'-র সাথে সংযোগ বিচ্ছিন্ন "
-"হয়েছে।"
 
-#: ../src/applet.c:885
-#, c-format
-msgid "\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
-msgstr ""
-"\n"
-"VPN পরিসেবা অপ্রত্যাশিতভাবে বন্ধ হওয়ার ফলে VPN সংযোগ '%s'-র সাথে সংযোগ "
-"বিচ্ছিন্ন হয়েছে।"
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr "রাউন্ড-রবিন"
 
-#: ../src/applet.c:891
-#, c-format
-msgid "\n"
-"The VPN connection '%s' disconnected."
-msgstr "\n"
-"VPN সংযোগ '%s'-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে"
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr "সক্রিয় ব্যাকআপ"
 
-#: ../src/applet.c:922
-msgid "VPN Login Message"
-msgstr "VPN লগ-ইনের বার্তা"
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr "XOR"
 
-#: ../src/applet.c:934 ../src/applet.c:942 ../src/applet.c:989
-msgid "VPN Connection Failed"
-msgstr "VPN সংযোগ বিফল"
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr "ব্রডকাস্ট"
 
-#: ../src/applet.c:996
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
-msgstr "\n"
-"VPN পরিসেবা আরম্ভ না হওয়ার ফলে VPN সংযোগ '%s' বিফল হয়েছে।\n"
-"%s"
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr "802.3ad"
 
-#: ../src/applet.c:999
-#, c-format
-msgid "\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
-msgstr "\n"
-"VPN সংযোগ '%s' আরম্ভ করতে ব্যর্থ।\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr "অ্যাডাপটিভ ট্র্যান্সমিট লোড ব্যালেন্সিং"
 
-#: ../src/applet.c:1346
-msgid "device not ready (firmware missing)"
-msgstr "ডিভাইস প্রস্তুত নয় (ফার্মওয়্যার অনুপস্থিত)"
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr "অ্যাডাপটিভ লোড ব্যালেন্সিং"
 
-#: ../src/applet.c:1348
-msgid "device not ready"
-msgstr "ডিভাইস প্রস্তুত নয়"
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr "MII (প্রস্তাবিত)"
 
-#: ../src/applet.c:1374
-msgid "Disconnect"
-msgstr "সংযোগ বিচ্ছিন্ন করুন"
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr "ARP"
 
-#: ../src/applet.c:1388
-msgid "device not managed"
-msgstr "ডিভাইস পরিচালিত নয়"
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+msgid "Bonded _connections:"
+msgstr "বন্ডেড সংযোগ (_c):"
 
-#: ../src/applet.c:1546
-msgid "No network devices available"
-msgstr "কোনো নেটওয়ার্ক ডিভাইস উপলব্ধ নয়"
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "মোড: (_o)"
 
-#: ../src/applet.c:1599
-msgid "_VPN Connections"
-msgstr "VPN সংযোগ (_V)"
+#. 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
+msgid "_Edit"
+msgstr "সম্পাদনা (_E)"
 
-#: ../src/applet.c:1652
-msgid "_Configure VPN..."
-msgstr "VPN কনফিগার করুন...(_C)"
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr "নিয়ন্ত্রণ প্রাবল্যতা (_f):"
 
-#: ../src/applet.c:1656
-msgid "_Disconnect VPN"
-msgstr "VPN-র সাথে সংযোগ বিচ্ছিন্ন করুন (_D)"
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+msgid "ms"
+msgstr "মিলিসেকেন্ড"
 
-#: ../src/applet.c:1765
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager বর্তমানে চলছে না..."
+#: ../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:"
+msgstr "ইন্টারফেসের নাম (_I):"
 
-#: ../src/applet.c:1770 ../src/applet.c:2696
-msgid "Networking disabled"
-msgstr "নেটওয়ার্ক ব্যবস্থা নিষ্ক্রিয় অবস্থায় রয়েছে"
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr "লিঙ্ক নিয়ন্ত্রণ (_L):"
 
-#. 'Enable Networking' item
-#: ../src/applet.c:1998
-msgid "Enable _Networking"
-msgstr "নেটওয়ার্ক সক্রিয় করুন (_N)"
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr "ARP টার্গেট (_t):"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2007
-msgid "Enable _Wireless"
-msgstr "বেতার সক্রিয় করুন (_W)"
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid ""
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
+msgstr ""
+"একটি IP ঠিকানা, বা IP ঠিকানাগুলির একটি কমা দ্বারা পৃথক করা তালিকা, লিঙ্ক স্ট্যাটাস "
+"যাচাই করার সময়ে খুঁজতে হয়।"
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2016
-msgid "Enable _Mobile Broadband"
-msgstr "মোবাইল ব্রড-ব্যান্ড সক্রিয় করুন (_M)"
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr "লিঙ্ক অাপ বিলম্ব (_u):"
 
-#. Toggle notifications item
-#: ../src/applet.c:2027
-msgid "Enable N_otifications"
-msgstr "বিজ্ঞপ্তি প্রদানের ব্যবস্থা সক্রিয় করুন (_o)"
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr "লিঙ্ক ডাউন বিলম্ব (_d):"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2038
-msgid "Connection _Information"
-msgstr "সংযোগ সংক্রান্ত তথ্য (_I)"
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "প্রধান DNS:"
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2048
-msgid "Edit Connections..."
-msgstr "সংযোগ সম্পাদনা..."
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2062
-msgid "_Help"
-msgstr "সাহায্য (_H)"
+#: ../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:"
+msgstr "_MTU:"
 
-#. About item
-#: ../src/applet.c:2071
-msgid "_About"
-msgstr "পরিচিতি (_A)"
+#: ../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
+msgid "bytes"
+msgstr "বাইট"
 
-#: ../src/applet.c:2340
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "আপনি এখন '%s'-র সাথে সংযুক্ত।"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
 
-#: ../src/applet.c:2380
-msgid "Disconnected"
-msgstr "সংযোগ বিচ্ছিন্ন"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "নিরাপত্তা: (_S)"
 
-#: ../src/applet.c:2381
-msgid "The network connection has been disconnected."
-msgstr "নেটওয়ার্কের সংযোগ বিচ্ছিন্ন করা হয়েছে।"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#, fuzzy
+msgid "_Hairpin mode:"
+msgstr "পরিবহন মোড (_T):"
 
-#: ../src/applet.c:2562
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "'%s' নেটওয়ার্ক সংযোগ প্রস্তুত করা হচ্ছে..."
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "বন্ডেড সংযোগ (_c):"
 
-#: ../src/applet.c:2565
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "'%s' নেটওয়ার্ক সংযোগের জন্য ব্যবহারকারীর অনুমোদন প্রয়োজন..."
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#, fuzzy
+msgid "_Forward delay:"
+msgstr "লিঙ্ক ডাউন বিলম্ব (_d):"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
 
-#: ../src/applet.c:2571
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#, fuzzy
+msgid "s"
+msgstr "মিলিসেকেন্ড"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "নেটওয়ার্ক সক্রিয় করুন (_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "স্বয়ংক্রিয়"
+
+#: ../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
-msgid "Network connection '%s' active"
-msgstr "'%s' নেটওয়ার্ক সংযোগ বর্তমানে সক্রিয়"
+msgid "default"
+msgstr "ডিফল্ট"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "ঠিকানা"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "ঠিকানা"
 
-#: ../src/applet.c:2652
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "'%s' VPN সংযোগ আরম্ভ করা হচ্ছে..."
+msgid "invalid %s for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2655
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "'%s' VPN সংযোগের জন্য ব্যবহারকারী অনুমোদিত হওয় আবশ্যক..."
+msgid "invalid %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2658
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "'%s'-র জন্য VPN ঠিকানার অনুরোধ করা হচ্ছে..."
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2661
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "'%s' VPN সংযোগ বর্তমানে সক্রিয়"
+msgid "invalid interface-name (%s)"
+msgstr ""
 
-#: ../src/applet.c:2700
-msgid "No network connection"
-msgstr "কোনো নেটওয়ার্ক সংযোগ উপস্থিত নেই"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "যে কোনো ডিভাইস"
 
-#: ../src/applet.c:3255
-msgid "NetworkManager Applet"
-msgstr "NetworkManager অ্যাপ্লেট"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "অজানা ত্রুটির কারণে সংযোগ সংক্রান্ত গোপনীয় তথ্য আপডেট করতে ব্যর্থ।"
 
-#: ../src/applet.c:3261 ../src/wired-dialog.c:132
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "এই সংযোগের জন্য 802.1X নিরাপত্তা ব্যবহার করা হবে"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
 msgstr ""
-"NetworkManager অ্যাপ্লেট দ্বারা কয়েকটি আবশ্যক রিসোর্সের উপস্থিতি সন্ধান করা "
-"সম্ভব হয়নি (যেমন glade ফাইল পাওয়া যায়নি)।"
 
-#: ../src/applet.glade.h:1
-msgid "Other Wireless Network..."
-msgstr "অন্যান্য বেতার নেটওয়ার্ক..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/applet.glade.h:2
-msgid "_Wireless security:"
-msgstr "বেতার নিরাপত্তা: (_W)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.glade.h:3
-msgid " "
-msgstr " "
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.glade.h:4
-msgid "_Network name:"
-msgstr "নেটওয়ার্কের নাম: (_N)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.glade.h:5
-msgid "Co_nnection:"
-msgstr "সংযোগ: (_n)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.glade.h:6
-msgid "Wireless _adapter:"
-msgstr "বেতার অ্যাডাপ্টার: (_a)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.glade.h:7
-msgid "C_onnect"
-msgstr "সংযোগ করুন (_o)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.glade.h:8
-msgid "Connection Information"
-msgstr "সংযোগ সংক্রান্ত তথ্য"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.glade.h:9
-msgid "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">সক্রিয় নেটওয়ার্ক সংযোগ</span>"
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.glade.h:10
-msgid "_Key:"
-msgstr "কি: (_K)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#: ../src/applet.glade.h:11
-msgid "Sho_w key"
-msgstr "কি প্রদর্শন করা হবে (_w)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#: ../src/applet.glade.h:12
-msgid "_Authentication:"
-msgstr "অনুমোদন ব্যবস্থা: (_A)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#: ../src/applet.glade.h:13
-msgid "Open System\n"
-"Shared Key"
-msgstr "উন্মুক্ত সিস্টেম\n"
-"যৌথরূপে ব্যবহৃত কি"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
 
-#: ../src/applet.glade.h:15
-msgid "WEP inde_x:"
-msgstr "WEP ইন্ডেক্স: (_x)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
 
-#: ../src/applet.glade.h:16
-msgid "1 (Default)\n"
-"2\n"
-"3\n"
-"4"
-msgstr "১ (ডিফল্ট)\n"
-"২\n"
-"৩\n"
-"৪"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
 
-#: ../src/applet.glade.h:20 ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
-msgid "_Username:"
-msgstr "ব্যবহারকারীর নাম: (_U)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#: ../src/applet.glade.h:21 ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "_Password:"
-msgstr "পাসওয়ার্ড: (_P)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#: ../src/applet.glade.h:22 ../src/connection-editor/ce-page-dsl.ui.h:3
-msgid "Sho_w password"
-msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#: ../src/applet.glade.h:23
-msgid "WPA Protocol:"
-msgstr "WPA প্রোটোকল:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.glade.h:24
-msgid "Anony_mous identity:"
-msgstr "নামবিহীন পরিচয়: (_m)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.glade.h:25
-msgid "_PAC file:"
-msgstr "_PAC ফাইল:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.glade.h:26
-msgid "I_nner authentication:"
-msgstr "অভ্যন্তরীণ অনুমোদন: (_n)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.glade.h:27
-msgid "_Allow automatic PAC provisioning"
-msgstr "স্বয়ংক্রিয় PAC বিশেষাধীকারের অনুমতি দিন (_A)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.glade.h:28
-msgid "Anonymous\n"
-"Authenticated\n"
-"Both"
-msgstr "নামবিহীন\n"
-"প্রমাণীকৃত\n"
-"উভয়ই"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.glade.h:31
-msgid "I_dentity:"
-msgstr "পরিচয়: (_d)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.glade.h:32
-msgid "_User certificate:"
-msgstr "ব্যবহারকারীর সার্টিফিকেট: (_U)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
 
-#: ../src/applet.glade.h:33
-msgid "C_A certificate:"
-msgstr "CA সার্টিফিকেট: (_A)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
 
-#: ../src/applet.glade.h:34
-msgid "No CA certificate is _required"
-msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
 
-#: ../src/applet.glade.h:35
-msgid "Private _key:"
-msgstr "ব্যক্তিগত-কি: (_k)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.glade.h:36
-msgid "_Private key password:"
-msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/applet.glade.h:37
-msgid "As_k for this password every time"
-msgstr "প্রতিবার এই পাসওয়ার্ড লেখার অনুরোধ করা হবে (_k)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/applet.glade.h:38
-msgid "_PEAP version:"
-msgstr "PEAP-র সংস্করণ: (_P)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/applet.glade.h:39
-msgid "Automatic\n"
-"Version 0\n"
-"Version 1"
-msgstr "স্বয়ংক্রিয়\n"
-"সংস্করণ ০\n"
-"সংস্করণ ১"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/applet.glade.h:42
-msgid "label"
-msgstr "লেবেল"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/applet.glade.h:43
-msgid "Show it"
-msgstr "প্রদর্শন করা হবে"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/applet.glade.h:44
-msgid "_Unlock"
-msgstr "আন-লক করুন: (_U)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "স্বয়ংক্রিয়"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:236
-#: ../src/connection-editor/nm-connection-editor.c:822
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "অজানা ত্রুটির কারণে সংযোগ সংক্রান্ত গোপনীয় তথ্য আপডেট করতে ব্যর্থ।"
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:1
-msgid "Round-robin"
-msgstr "রাউন্ড-রবিন"
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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-bond.ui.h:2
-msgid "Active backup"
-msgstr "সক্রিয় ব্যাকআপ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
-msgid "XOR"
-msgstr "XOR"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-msgid "Broadcast"
-msgstr "ব্রডকাস্ট"
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+msgid "Enter the traffic class for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
-msgid "802.3ad"
-msgstr "802.3ad"
+#: ../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:"
+msgstr "ব্যবহারকারীর নাম: (_U)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
-msgid "Adaptive transmit load balancing"
-msgstr "অ্যাডাপটিভ ট্র্যান্সমিট লোড ব্যালেন্সিং"
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "_Service:"
+msgstr "পরিসেবা: (_S)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
-msgid "Adaptive load balancing"
-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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+msgid "Sho_w password"
+msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
-msgid "MII (recommended)"
-msgstr "MII (প্রস্তাবিত)"
+#: ../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:"
+msgstr "পাসওয়ার্ড: (_P)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
-msgid "ARP"
-msgstr "ARP"
+#: ../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
+msgid "Automatic"
+msgstr "স্বয়ংক্রিয়"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
-msgstr "বন্ডেড সংযোগ (_c):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "ট্যুইসটেড পেয়ার (TP)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "মোড (_M):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "অ্যাটাচমেন্ট ইউনিট ইন্টারফেস (AUI)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-msgid "_Edit"
-msgstr "সম্পাদনা (_E)"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:13
-msgid "_Delete"
-msgstr "মুছে ফেলুন (_D)"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "মিডিয়া ইন্ডিপেনডেন্ট ইন্টারফেস (MII)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
-msgid "Monitoring _frequency:"
-msgstr "নিয়ন্ত্রণ প্রাবল্যতা (_f):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 মেগাবাইট/সেকেন্ড"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "ms"
-msgstr "মিলিসেকেন্ড"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 মেগাবাইট/সেকেন্ড"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-msgid "_Interface name:"
-msgstr "ইন্টারফেসের নাম (_I):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 গিগাবাইট/সেকেন্ড"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
-msgid "_Link Monitoring:"
-msgstr "লিঙ্ক নিয়ন্ত্রণ (_L):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 গিগাবাইট/সেকেন্ড"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "ARP _targets:"
-msgstr "ARP টার্গেট (_t):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "পোর্ট: (_P)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "গতি: (_S)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "সম্পূর্ণ ডুপ্লে (_x)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "স্বয়ংক্রিয় মীমাংসা (_o)"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "পরিসেবা: (_S)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#, fuzzy
+msgid "C_loned MAC address:"
+msgstr "ক্লোন করা MAC ঠিকানা: (_C)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid ""
-"An IP address, or a comma-separated list of IP addresses, to look for when "
-"checking the link status."
+"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 ""
-"একটি IP ঠিকানা, বা IP ঠিকানাগুলির একটি কমা দ্বারা পৃথক করা তালিকা, লিঙ্ক "
-"স্ট্যাটাস যাচাই করার সময়ে খুঁজতে হয়।"
+"এই সংযোগটি সক্রিয় করার জন্য চিহ্নিত নেটওয়ার্ক ডিভাইসের জন্য এইখানে লেখা MAC "
+"ঠিকানাটি প্রয়োগ করা হবে। এই বৈশিষ্ট্যটি MAC ক্লোনিং অথবা স্পুফিং নামে পরিচিত।  "
+"উদাহরণ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
-msgid "Link _up delay:"
-msgstr "লিঙ্ক অাপ বিলম্ব (_u):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _down delay:"
-msgstr "লিঙ্ক ডাউন বিলম্ব (_d):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "ডিফল্ট"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
-msgstr "পরিসেবা: (_S)"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "উপেক্ষা করা হবে"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "পরিবহন মোড (_T):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "_Device MAC address:"
-msgstr "ডিভাইসের MAC ঠিকানা: (_D)"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wired.ui.h:19
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "বাইট"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "ব্রডকাস্ট"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
-"এই বিকল্প ব্যবহারের ফলে, এইখানে উল্লিখিত MAC ঠিকানা দ্বারা চিহ্নিত নেটওয়ার্ক "
-"ডিভাইসের সাথে এই সংযোগটি যুক্ত করা হবে।  উদাহরণ: 00:11:22:33:44:55"
+
+#: ../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.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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:7
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 msgid "Datagram"
 msgstr "ডেটাগ্রাম"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:9
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 msgid "Connected"
 msgstr "সংযুক্ত"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:1
-#: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#: ../src/connection-editor/page-ip6.c:135
-msgid "Automatic"
-msgstr "স্বয়ংক্রিয়"
-
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1351,7 +1752,7 @@ msgstr "ম্যানুয়াল DNS সেটিঙের সাথে স�
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:162
+#: ../src/connection-editor/page-ip4.c:166
 #: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "ব্যবহারকারী দ্বারা নির্ধারিত"
@@ -1363,198 +1764,181 @@ 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:180
+#: ../src/connection-editor/page-ip4.c:186
 #: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "অন্যান্য কম্পিউটারের সাথে যৌথরূপে ব্যবহৃত"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "পদ্ধতি: (_M)"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "<b>Addresses</b>"
-msgstr "<b>ঠিকানা</b>"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-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-page-ip6.ui.h:10
+#, fuzzy
+msgid "Addresses"
+msgstr "ঠিকানা"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 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 ক্লায়েন্ট আইডেন্টিফায়ারের সাহায্যে নেটওয়ার্ক অ্যাডমিনিস্ট্রেটর আপনার কম্পিউটারের "
+"কনফিগারেশন নির্ধারণ করতে পারবেন।  DHCP ক্লায়েন্ট আইডেন্টিফায়ার ব্যবহার করতে ইচ্ছুক "
+"হলে তা এইখানের লিখুন।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 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.h:13
 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:10
-msgid "_Search domains:"
+#: ../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
+#, fuzzy
+msgid "S_earch domains:"
 msgstr "অনুসন্ধানের ডোমেইন: (_S)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "_DNS servers:"
+#: ../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:"
 msgstr "DNS সার্ভার: (_D)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 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
-msgid "Require IPv4 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#, 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"IPv6-ক্ষমতাসম্পন্ন নেটওয়ার্কের সাথে সংযোগ করার সময়, IPv4 কনফিগারেশন বিফল "
-"হলেও যদি IPv6 কনফিগারেশন সফল হয় তাহলে সংযোগ সম্পূর্ণ করা হবে।"
+"IPv6-ক্ষমতাসম্পন্ন নেটওয়ার্কের সাথে সংযোগ করার সময়, IPv4 কনফিগারেশন বিফল হলেও "
+"যদি IPv6 কনফিগারেশন সফল হয় তাহলে সংযোগ সম্পূর্ণ করা হবে।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "_Routes&#x2026;"
-msgstr "রুটস (_R)&#x2026;"
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:18
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "Ig_nore automatically obtained routes"
-msgstr "স্বয়ংক্রিয়ভাবে প্রাপ্ত রুট অগ্রাহ্য করা হবে (_n)"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "নিষ্ক্রিয়"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:19
 #: ../src/connection-editor/ce-page-ip6.ui.h:17
-msgid "Use this c_onnection only for resources on its network"
+#, fuzzy
+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 ""
-"শুধুমাত্র এই নেটওয়ার্কের মধ্যে উপস্থিত রিসোর্সের জন্য এই সংযোগ ব্যবহার করা "
-"হবে (_o)"
+"হোস্ট নেম মীমাংসা করার জন্য ব্যবহৃত ডোমেইন নেম সার্ভারের IP ঠিকানা। একাধিক ডোমেইন "
+"নেম সার্ভারের ঠিকানা চিহ্নিত করার সময় কমা চিহ্ন প্রয়োগ করা হবে।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:20
 #: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+msgid "IPv6 _privacy extensions:"
 msgstr ""
-"সক্রিয় করা হলে, এই সংযোগটি কখনো ডিফল্ট নেটওয়ার্ক সংযোগ রূপে ব্যবহার করা যাবে "
-"না।"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#, fuzzy
+msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "এই সংযোগটি সম্পূর্ণ করার জন্য IPv6 ঠিকানা প্রয়োজন"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
-"IPv4-ক্ষমতাসম্পন্ন নেটওয়ার্কের সাথে সংযোগ করার সময়, IPv6 কনফিগারেশন বিফল "
-"হলেও যদি IPv4 কনফিগারেশন সফল হয় তাহলে সংযোগ সম্পূর্ণ করা হবে।"
+"IPv4-ক্ষমতাসম্পন্ন নেটওয়ার্কের সাথে সংযোগ করার সময়, IPv6 কনফিগারেশন বিফল হলেও "
+"যদি IPv4 কনফিগারেশন সফল হয় তাহলে সংযোগ সম্পূর্ণ করা হবে।"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "যে কোনো"
+msgid "Basic"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "পছন্দের 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "পছন্দের 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "<b>Basic</b>"
-msgstr "<b>মৌলিক বৈশিষ্ট্য</b>"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "Nu_mber:"
 msgstr "সংখ্যা: (_m)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "<b>Advanced</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#, fuzzy
+msgid "Advanced"
 msgstr "<b>উন্নত বৈশিষ্ট্য</b>"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "নেটওয়ার্কের ID: (_e)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
-msgid "_Type:"
-msgstr "ধরন: (_T)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "পরিবর্তন করুন..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-msgid "PI_N:"
-msgstr "PI_N:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-msgid "Allow roaming if home network is not available"
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
 msgstr ""
-"প্রধান নেটওয়ার্ক উপলব্ধ না থাকলে রোমিং ব্যবহার করার অনুমতি প্রদান করা হবে"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#, fuzzy
+msgid "Allow _roaming if home network is not available"
+msgstr "প্রধান নেটওয়ার্ক উপলব্ধ না থাকলে রোমিং ব্যবহার করার অনুমতি প্রদান করা হবে"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "<b>Authentication</b>"
-msgstr "<b>অনুমোদন</b>"
+#, fuzzy
+msgid "Authentication"
+msgstr "অনুমোদন ব্যবস্থা: (_A)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
 msgid "Allowed methods:"
 msgstr "অনুমোদিত পদ্ধতি:"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:3
-msgid "Configure _Methods&#x2026;"
+#, fuzzy
+msgid "Configure _Methods…"
 msgstr "পদ্ধতি কনফিগার করুন (_M)&#x2026;"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "<b>Compression</b>"
+#, fuzzy
+msgid "Compression"
 msgstr "<b>কম্প্রেশন</b>"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:5
@@ -1582,424 +1966,760 @@ msgid "Use TCP _header compression"
 msgstr "TCP হেডার কম্প্রেশন ব্যবহার করা হবে (_h)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "<b>Echo</b>"
-msgstr "<b>প্রতিধ্বনি</b>"
+msgid "Echo"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
 msgid "Send PPP _echo packets"
 msgstr "PPP ইকো প্যাকেট প্ররণ করা হবে (_e)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:13
-msgid "<b>Allowed Authentication Methods</b>"
-msgstr "<b>অনুমোদনের বৈধ পদ্ধতি</b>"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:14
-msgid "_EAP"
-msgstr "_EAP"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:15
-msgid "Extensible Authentication Protocol"
-msgstr "এক্সটেনসিবল অথেনটিকেশন প্রোটোকল"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:16
-msgid "_PAP"
-msgstr "_PAP"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:17
-msgid "Password Authentication Protocol"
-msgstr "পাসওয়ার্ড অথেন্টিকেশন প্রোটোকল"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:18
-msgid "C_HAP"
-msgstr "C_HAP"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:19
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "চ্যালেঞ্জ হ্যান্ড-শেক অথেন্টিকেশন প্রোটোকল"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:20
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:21
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Microsoft চ্যালেঞ্জ হ্যান্ড-শেক অথেন্টিকেশন প্রোটোকল"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:22
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+msgid "_Import team configuration from a file..."
+msgstr "একটি সংরক্ষিত VPN কনফিগারেশন অামদানি করুন..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:23
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft চ্যালেঞ্জ হ্যান্ড-শেক অথেন্টিকেশন প্রোটোকল সংস্করণ ২"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "বন্ডেড সংযোগ (_c):"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:24
-msgid ""
-"<i>In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods.</i>"
-msgstr ""
-"<i>অধিকাংশ ক্ষেত্রে পরিসেবা উপলব্ধকারীর PPP সার্ভারে সর্বধরনের অনুমোদন "
-"পদ্ধতি সমর্থিত হবে। সংযোগ স্থাপনে সমস্যা হলে, কয়েকটি অনুমোদন পদ্ধতির সমর্থন "
-"ব্যবস্থা নিষ্ক্রিয় করুন।</i>"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "একটি সংরক্ষিত VPN কনফিগারেশন অামদানি করুন..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "প্রধান ইন্টারফেস (_P):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN ইন্টারফেসের নাম (_n):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "ক্লোন করা MAC ঠিকানা: (_C)"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN অাইডি (_i):"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
-msgid "Device name + number"
-msgstr "ডিভাইস নাম + সংখ্যা"
-
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
-msgid "\"vlan\" + number"
-msgstr "\"vlan\" + সংখ্যা"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "ট্যুইসটেড পেয়ার (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "অ্যাটাচমেন্ট ইউনিট ইন্টারফেস (AUI)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "মিডিয়া ইন্ডিপেনডেন্ট ইন্টারফেস (MII)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 মেগাবাইট/সেকেন্ড"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 মেগাবাইট/সেকেন্ড"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 গিগাবাইট/সেকেন্ড"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 গিগাবাইট/সেকেন্ড"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "পোর্ট: (_P)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "গতি: (_S)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "সম্পূর্ণ ডুপ্লে (_x)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "স্বয়ংক্রিয় মীমাংসা (_o)"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
+msgstr "ডিভাইস নাম + সংখ্যা"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.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 ""
-"এই সংযোগটি সক্রিয় করার জন্য চিহ্নিত নেটওয়ার্ক ডিভাইসের জন্য এইখানে লেখা MAC "
-"ঠিকানাটি প্রয়োগ করা হবে। এই বৈশিষ্ট্যটি MAC ক্লোনিং অথবা স্পুফিং নামে "
-"পরিচিত।  উদাহরণ: 00:11:22:33:44:55"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr "\"vlan\" + সংখ্যা"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "নিরাপত্তা:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "Infrastructure"
-msgstr "পরিকাঠামো"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "অ্যাড-হক"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "পরিবহণের ক্ষমতা: (_w)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "মেগাবাইট/সেকেন্ড"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "গতি: (_R)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"এই বিকল্প ব্যবহারের ফলে, এইখানে উল্লিখিত BSSID দ্বারা চিহ্নিত বেতার অ্যাকসেস "
-"পয়েন্টের সাথে এই সংযোগটি যুক্ত করা হবে।  উদাহরণ: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "চ্যানেল: (_h)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "ব্যান্ড: (_d)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "M_ode:"
-msgstr "মোড: (_o)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:21
-msgid "_SSID:"
-msgstr "_SSID:"
+#: ../src/connection-editor/ce-polkit-button.c:74
+msgid "No polkit authorization to perform the action"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
-msgstr "নিরাপত্তা: (_S)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#, fuzzy
+msgid "Allowed Authentication Methods"
+msgstr "<b>অনুমোদনের বৈধ পদ্ধতি</b>"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:504
-#: ../src/connection-editor/ip6-routes-dialog.c:462
-#: ../src/connection-editor/page-ip4.c:738
-#: ../src/connection-editor/page-ip6.c:723
-msgid "Address"
-msgstr "ঠিকানা"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr "_EAP"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:520
-#: ../src/connection-editor/page-ip4.c:755
-msgid "Netmask"
-msgstr "নেটমাস্ক"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr "এক্সটেনসিবল অথেনটিকেশন প্রোটোকল"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:536
-#: ../src/connection-editor/ip6-routes-dialog.c:494
-#: ../src/connection-editor/page-ip4.c:772
-#: ../src/connection-editor/page-ip6.c:757
-msgid "Gateway"
-msgstr "গেটওয়ে"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr "_PAP"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:552
-#: ../src/connection-editor/ip6-routes-dialog.c:510
-msgid "Metric"
-msgstr "মেট্রিক"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr "পাসওয়ার্ড অথেন্টিকেশন প্রোটোকল"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:478
-#: ../src/connection-editor/page-ip6.c:740
-msgid "Prefix"
-msgstr "প্রেফিক্স"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr "C_HAP"
 
-#: ../src/connection-editor/new-connection.c:106
-#: ../src/connection-editor/page-wired.c:236
-msgid "Wired"
-msgstr "তারযুক্ত"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "চ্যালেঞ্জ হ্যান্ড-শেক অথেন্টিকেশন প্রোটোকল"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft চ্যালেঞ্জ হ্যান্ড-শেক অথেন্টিকেশন প্রোটোকল"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/new-connection.c:112
-#: ../src/connection-editor/page-wireless.c:435
-msgid "Wireless"
-msgstr "বেতার"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft চ্যালেঞ্জ হ্যান্ড-শেক অথেন্টিকেশন প্রোটোকল সংস্করণ ২"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#, 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 ""
+"<i>অধিকাংশ ক্ষেত্রে পরিসেবা উপলব্ধকারীর PPP সার্ভারে সর্বধরনের অনুমোদন পদ্ধতি "
+"সমর্থিত হবে। সংযোগ স্থাপনে সমস্যা হলে, কয়েকটি অনুমোদন পদ্ধতির সমর্থন ব্যবস্থা "
+"নিষ্ক্রিয় করুন।</i>"
+
+#: ../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 "স্বয়ংক্রিয় ইথারনেট"
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
 
-#: ../src/connection-editor/new-connection.c:124
-#: ../src/connection-editor/page-dsl.c:161
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:130
-#: ../src/connection-editor/page-infiniband.c:157
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:136
-#: ../src/connection-editor/page-bond.c:798 ../src/utils/utils.c:216
+#: ../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
 msgid "Bond"
 msgstr "বন্ড"
 
-#: ../src/connection-editor/new-connection.c:142
-#: ../src/connection-editor/page-vlan.c:606 ../src/utils/utils.c:220
+#: ../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
+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
+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"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:155
-#: ../src/connection-editor/new-connection.c:295
-#: ../src/connection-editor/page-vpn.c:116
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:245
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "হার্ডওয়্যার"
 
-#: ../src/connection-editor/new-connection.c:265
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "ভার্চুয়াল"
 
-#: ../src/connection-editor/new-connection.c:333
-#: ../src/connection-editor/new-connection.c:335
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "একটি সংরক্ষিত VPN কনফিগারেশন অামদানি করুন..."
 
-#: ../src/connection-editor/new-connection.c:363
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "অজানা কারণে সংযোগ সম্পাদনা ব্যবস্থার ডায়লগ আরম্ভ করা যায়নি।"
 
-#: ../src/connection-editor/new-connection.c:372
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "নতুন সংযোগ নির্মাণ করা সম্ভব হয়নি"
 
-#: ../src/connection-editor/new-connection.c:516
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "সংযোগ মুছে ফেলতে ব্যর্থ"
 
-#: ../src/connection-editor/new-connection.c:596
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "আপনি কি নিশ্চিতরূপে %s সংযোগটি মুছে ফেলতে ইচ্ছুক?"
 
-#: ../src/connection-editor/page-bond.c:579
+#: ../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
+msgid "Address"
+msgstr "ঠিকানা"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "নেটমাস্ক"
+
+#: ../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
+msgid "Gateway"
+msgstr "গেটওয়ে"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "মেট্রিক"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "প্রেফিক্স"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
-msgid "%s slave %d"
-msgstr "%s স্লেভ %d"
+msgid "Editing %s"
+msgstr "%s সম্পাদনা"
 
-#: ../src/connection-editor/page-bond.c:616
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "নামবিহীন সংযোগ সম্পাদনা"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "সংযোগের নাম (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "সম্পাদন ব্যবস্থা আরম্ভ করতে ত্রুটি"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "সংযোগ অাপডেট ব্যর্থ হয়েছে"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
-"Select the type of connection that will be used for the slaves of this bond."
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr "সংযোগ সম্পাদন কয়েকটি আবশ্যক রিসোর্স খুঁজে পায়নি (.ui ফাইল পাওয়া যায়নি)।"
+
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "_Save"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "এই সংযোগের ক্ষেত্রে করা পরিবর্তনগুলি সংরক্ষণ করুন।"
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "এই মেশিনের সকল ব্যবহারকারীর জন্য এই সংযোগ সংরক্ষণ করার জন্য অনুমোদন করুন।"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not create connection"
+msgstr "সংযোগ তৈরি করা সম্ভব হয়নি"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "সংযোগ সম্পাদনা করা সম্ভব হয়নি"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr "সংযোগ সম্পাদক ডায়লগ প্রস্তুত করতে অজানা সমস্যা দেখা দিয়েছে।"
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "সম্পাদন ব্যবস্থা আরম্ভ করতে ত্রুটি"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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/page-bond.c:785
-#: ../src/connection-editor/page-bond.c:792
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+msgid "Connection _name:"
+msgstr "সংযোগের নাম (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
+msgstr "রপ্তানি করুন (_E)..."
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "কখনো নয়"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "এখন"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d বৎসর পূর্বে"
+msgstr[1] "%d বৎসর পূর্বে"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "নাম"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "সর্বশেষ ব্যবহার"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "নির্বাচিত সংযোগটি সম্পাদনা করুন"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "নির্বাচিত সংযোগ সম্পাদনা করার পূর্বে অনুমোদিত হওয়া প্রয়োজন"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "নির্বাচিত সংযোগটি মুছে ফেলুন"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "নির্বাচিত সংযোগটি মুছে ফেলার পূর্বে অনুমোদিত হওয়া প্রয়োজন"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, fuzzy, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "সংযোগ তৈরি করা সম্ভব হয়নি"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+#, fuzzy
+msgid "Error creating connection"
+msgstr "সংযোগ সংরক্ষণ করতে সমস্যা"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "সংযোগ সংরক্ষণ করতে সমস্যা"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "802.1x নিরাপত্তা"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "ওয়াই-ফাই নিরাপত্তার ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
+
+#: ../src/connection-editor/page-8021x-security.c:125
+#, fuzzy
+msgid "Use 802.1_X security for this connection"
+msgstr "এই সংযোগের জন্য 802.1X নিরাপত্তা ব্যবহার করা হবে"
+
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "ব্লু-টুথ ডিভাইস পাওয়া যায়নি।"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "বন্ড সংযোগ %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+#, fuzzy
+msgid "Select the type of the Bluetooth connection profile."
+msgstr "অাপনি যে ধরনের সংযোগ তৈরি করতে চান তা নির্বাচন করুন:"
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "নেটওয়ার্ক সক্রিয় করুন (_N)"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "বেতার নেটওয়ার্ক"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
 
-#: ../src/connection-editor/page-bond.c:960
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "প্রধান DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "বন্ড সংযোগ %d"
 
-#: ../src/connection-editor/page-dsl.c:148
-#: ../src/connection-editor/page-dsl.c:155
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "বন্ড সংযোগ %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+#, fuzzy
+msgid "Bridge Port"
+msgstr "ব্রিজ"
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "DSL-র ইউজার ইন্টারফেস লোড করা যায়নি।"
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL-র ইউজার ইন্টারফেস লোড করা যায়নি।"
 
-#: ../src/connection-editor/page-dsl.c:252
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL সংযোগ %d"
 
-#: ../src/connection-editor/page-infiniband.c:144
-#: ../src/connection-editor/page-infiniband.c:151
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"এই বিকল্প ব্যবহারের ফলে, এইখানে উল্লিখিত MAC ঠিকানা দ্বারা চিহ্নিত নেটওয়ার্ক "
+"ডিভাইসের সাথে এই সংযোগটি যুক্ত করা হবে।  উদাহরণ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "তারযুক্ত নেটওয়ার্কের ইউকার ইন্টারফেস লোড করতে ব্যর্থ।"
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "ইথারনেট (%s)"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "ক্লোন করা MAC ঠিকানা: (_C)"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "ডিফল্ট"
+
+#: ../src/connection-editor/page-general.c:52
+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 বর্তমানে চলছে না..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand ইউজার ইন্টারফেস লোড করা যায়নি।"
 
-#: ../src/connection-editor/page-infiniband.c:243
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand সংযোগ %d"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:125
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "স্বয়ংক্রিয় (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:126
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "শুধুমাত্র স্বয়ংক্রিয় (VPN) ঠিকানা"
 
 #: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:129
-msgid "Automatic (PPP)"
-msgstr "স্বয়ংক্রিয় (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:130
-msgid "Automatic (PPP) addresses only"
-msgstr "শুধুমাত্র স্বয়ংক্রিয় (PPP) ঠিকানা"
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "স্বয়ংক্রিয়, শুধুমাত্র ঠিকানা"
 
-#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip4.c:132
 #: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "স্বয়ংক্রিয় (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip4.c:133
 #: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "শুধুমাত্র স্বয়ংক্রিয় (PPPoE) ঠিকানা"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "স্বয়ংক্রিয় (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "শুধুমাত্র স্বয়ংক্রিয় (DHCP) ঠিকানা"
 
-#: ../src/connection-editor/page-ip4.c:174
+#: ../src/connection-editor/page-ip4.c:179
 #: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "শুধুমাত্র স্থানীয় সংযোগ"
 
-#: ../src/connection-editor/page-ip4.c:190
-msgid "Disabled"
-msgstr "নিষ্ক্রিয়"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "DNS সার্ভার: (_D)"
 
-#: ../src/connection-editor/page-ip4.c:700
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "অনুসন্ধানের ডোমেইন: (_S)"
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s-র জন্য IPv4 রুট সম্পাদনা"
 
-#: ../src/connection-editor/page-ip4.c:827
-#: ../src/connection-editor/page-ip4.c:834
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr "IPv4-র বৈশিষ্ট্য"
+
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-ip4.c:840
-msgid "IPv4 Settings"
-msgstr "IPv4-র বৈশিষ্ট্য"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic, addresses only"
-msgstr "স্বয়ংক্রিয়, শুধুমাত্র ঠিকানা"
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
 #: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
@@ -2009,121 +2729,226 @@ msgstr "উপেক্ষা করা হবে"
 msgid "Automatic, DHCP only"
 msgstr "স্বয়ংক্রিয়, শুধুমাত্র DHCP"
 
-#: ../src/connection-editor/page-ip6.c:685
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s-র জন্য IPv6 রুট সম্পাদনা"
 
-#: ../src/connection-editor/page-ip6.c:810
-#: ../src/connection-editor/page-ip6.c:817
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr "IPv6-র বৈশিষ্ট্য"
+
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-ip6.c:823
-msgid "IPv6 Settings"
-msgstr "IPv6-র বৈশিষ্ট্য"
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:313
-#: ../src/connection-editor/page-mobile.c:320
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr "%s স্লেভ %d"
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "মোবাইল ব্রড-ব্যান্ড ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-mobile.c:341
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "মোবাইল ব্রড-ব্যান্ড সংযোগের ধরন সমর্থিত নয়।"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:591
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "মোবাইল ব্রড-ব্যান্ড উপলব্ধকারীর ধরন নির্বাচন করুন"
 
-#: ../src/connection-editor/page-mobile.c:618
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr ""
-"মোবাইল ব্রড-ব্যান্ড পরিসেবা উপলব্ধকারী দ্বারা ব্যবহৃত পরিসেবা নির্বাচন করুন। "
-" এই তথ্য অজানা থাকলে, পরিসেবাকারীর সাথে যোগাযোগ করুন।"
+"মোবাইল ব্রড-ব্যান্ড পরিসেবা উপলব্ধকারী দ্বারা ব্যবহৃত পরিসেবা নির্বাচন করুন।  এই তথ্য "
+"অজানা থাকলে, পরিসেবাকারীর সাথে যোগাযোগ করুন।"
 
-#: ../src/connection-editor/page-mobile.c:623
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
-"আপনার পরিসেবা উপলব্ধকারী দ্বারা GSM-ভিত্তিক প্রযুক্তি ব্যবহার করা হয় (অর্থাৎ "
-"GPRS, EDGE, UMTS, HSDPA) (_G)"
+"আপনার পরিসেবা উপলব্ধকারী দ্বারা GSM-ভিত্তিক প্রযুক্তি ব্যবহার করা হয় (অর্থাৎ GPRS, "
+"EDGE, UMTS, HSDPA) (_G)"
 
-#: ../src/connection-editor/page-mobile.c:628
-msgid "My provider uses _CDMA-based technology (i.e. 1xRTT, EVDO)"
+#: ../src/connection-editor/page-mobile.c:568
+#, fuzzy
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
-"আপনার পরিসেবা উপলব্ধকারী দ্বারা CDMA-ভিত্তিক প্রযুক্তি ব্যবহার করা হয় "
-"(অর্থাৎ 1xRTT, EVDO) (_C)"
+"আপনার পরিসেবা উপলব্ধকারী দ্বারা CDMA-ভিত্তিক প্রযুক্তি ব্যবহার করা হয় (অর্থাৎ 1xRTT, "
+"EVDO) (_C)"
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:135
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:241
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-fast.c:276
-#: ../src/wireless-security/eap-method-peap.c:258
-#: ../src/wireless-security/eap-method-ttls.c:273
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:257
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:142
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "শূণ্য"
 
-#: ../src/connection-editor/page-ppp.c:202
+#: ../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:294
-#: ../src/connection-editor/page-ppp.c:301
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr "PPP-র বৈশিষ্ট্য"
+
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-ppp.c:307
-msgid "PPP Settings"
-msgstr "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 "ইম্পোর্ট করার উদ্দেশ্যে ফাইল নির্বাচন করুন"
 
-#: ../src/connection-editor/page-vlan.c:593
-#: ../src/connection-editor/page-vlan.c:600
-msgid "Could not load VLAN user interface."
-msgstr "VLAN ইউজার ইন্টারফেস লোড করা যায়নি।"
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "তারযুক্ত নেটওয়ার্কের ইউকার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/page-vlan.c:801
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "তার সংযোগ %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "কোনো নেটওয়ার্ক সংযোগ উপস্থিত নেই"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "বন্ড ব্যবহারকারীর ইন্টারফেস লোড করা গেল না।"
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN সংযোগ %d"
 
-#: ../src/connection-editor/page-vpn.c:127
+#: ../src/connection-editor/page-vpn.c:103
+#, fuzzy
+msgid "Could not load VPN user interface."
+msgstr "VLAN ইউজার ইন্টারফেস লোড করা যায়নি।"
+
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s'-র জন্য VPN প্লাগ-ইন পরিসেবা পাওয়া যায়নি।"
 
-#: ../src/connection-editor/page-vpn.c:242
-#: ../src/connection-editor/page-vpn.c:309
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN সংযোগ %d"
 
-#: ../src/connection-editor/page-vpn.c:268
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2133,302 +2958,117 @@ msgstr ""
 "\n"
 "ত্রুটি: কোনো VPN পরিসেবার ধরন উপলব্ধ নয়।"
 
-#: ../src/connection-editor/page-wired.c:223
-#: ../src/connection-editor/page-wired.c:230
-msgid "Could not load wired user interface."
-msgstr "তারযুক্ত নেটওয়ার্কের ইউকার ইন্টারফেস লোড করতে ব্যর্থ।"
-
-#: ../src/connection-editor/page-wired.c:371
-#, c-format
-msgid "Wired connection %d"
-msgstr "তার সংযোগ %d"
+#: ../src/connection-editor/page-vpn.c:254
+#, fuzzy
+msgid "Choose a VPN Connection Type"
+msgstr "VPN সংযোগ বিফল"
 
-#: ../src/connection-editor/page-wired-security.c:125
-msgid "802.1x Security"
-msgstr "802.1x নিরাপত্তা"
+#: ../src/connection-editor/page-vpn.c:255
+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-wired-security.c:133
-msgid "Use 802.1X security for this connection"
-msgstr "এই সংযোগের জন্য 802.1X নিরাপত্তা ব্যবহার করা হবে"
+#: ../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"
 
-#: ../src/connection-editor/page-wireless.c:146
-#: ../src/connection-editor/page-wireless.c:150
-#: ../src/connection-editor/page-wireless.c:171
-#, c-format
-msgid "default"
-msgstr "ডিফল্ট"
+#: ../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)\""
+msgstr ""
+"এই বিকল্প ব্যবহারের ফলে, এইখানে উল্লিখিত MAC ঠিকানা দ্বারা চিহ্নিত নেটওয়ার্ক "
+"ডিভাইসের সাথে এই সংযোগটি যুক্ত করা হবে।  উদাহরণ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:175
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:422
-#: ../src/connection-editor/page-wireless.c:429
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "WiFi ইউজার ইন্টারফেস লোড করা যায়নি।"
 
-#: ../src/connection-editor/page-wireless.c:601
-#, c-format
-msgid "Wireless connection %d"
-msgstr "বেতার সংযোগ %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/wireless-dialog.c:931
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "যে কোনো ডিভাইস"
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "তার সংযোগ %d"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:274
-#: ../src/wireless-dialog.c:940
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP ১২৮-বিট পরিচয়পংক্তি"
 
-#: ../src/connection-editor/page-wireless-security.c:300
-#: ../src/wireless-dialog.c:970
+#: ../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)"
 msgstr "ডাইনামিক WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:314
-#: ../src/wireless-dialog.c:984
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ও WPA2 ব্যক্তিগত"
 
-#: ../src/connection-editor/page-wireless-security.c:328
-#: ../src/wireless-dialog.c:998
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ও WPA2 এন্টারপ্রাইজ"
 
-#: ../src/connection-editor/page-wireless-security.c:374
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
-"ওয়াই-ফাই নিরাপত্তার ইউজার ইন্টারফেস লোড করতে ব্যর্থ; ওয়াই-ফাইল বৈশিষ্ট্য "
-"অনুপস্থিত।"
-
-#: ../src/connection-editor/page-wireless-security.c:383
-#: ../src/connection-editor/page-wireless-security.c:390
-msgid "Could not load WiFi security user interface."
-msgstr "ওয়াই-ফাই নিরাপত্তার ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
+"ওয়াই-ফাই নিরাপত্তার ইউজার ইন্টারফেস লোড করতে ব্যর্থ; ওয়াই-ফাইল বৈশিষ্ট্য অনুপস্থিত।"
 
-#: ../src/connection-editor/page-wireless-security.c:396
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "বেতার নিরাপত্তা"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
-#, c-format
-msgid "Editing %s"
-msgstr "%s সম্পাদনা"
-
-#: ../src/connection-editor/nm-connection-editor.c:114
-msgid "Editing un-named connection"
-msgstr "নামবিহীন সংযোগ সম্পাদনা"
-
-#: ../src/connection-editor/nm-connection-editor.c:308
-msgid ""
-"The connection editor could not find some required resources (the "
-"NetworkManager applet .glade file was not found)."
-msgstr ""
-"সংযোগ সম্পাদন কয়েকটি আবশ্যক রিসোর্স খুঁজে পায়নি (NetworkManager অ্যাপ্লেট ."
-"glade ফাইল পাওয়া যায়নি)।"
-
-#: ../src/connection-editor/nm-connection-editor.c:326
-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:482
-msgid ""
-"Support for bond, bridge, and VLAN interfaces must be enabled by setting the "
-"NM_BOND_BRIDGE_VLAN_ENABLED key to 'yes' in <tt>/etc/sysconfig/network</tt>:\n"
-"\n"
-"	<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
-"\n"
-"After making this modification, NetworkManager must be restarted to ensure "
-"the new functionality is enabled."
-msgstr ""
-"NM_BOND_BRIDGE_VLAN_ENABLED কী <tt>/etc/sysconfig/network</tt> -এ 'হ্যাঁ' তে "
-"সেট করে বন্ড, ব্রিজ, এবং VLAN ইন্টারফেস অবশ্যই সক্রিয় করতে হবে:\n"
-"\n"
-"	<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
-"\n"
-"এই সংশোধন করার পরে, নতুন বৈশিষ্ট্য সক্রিয় করার পরে NetworkManager অবশ্যই "
-"পুনঃসূচনা করতে হবে।"
-
-#: ../src/connection-editor/nm-connection-editor.c:494
-msgid "Bridging, bonding, and VLAN functionality not enabled"
-msgstr "ব্রিজিং, বন্ডিং, এবং VLAN বৈশিষ্ট্য সক্রিয় করা নেই"
-
-#: ../src/connection-editor/nm-connection-editor.c:541
-msgid "Apply"
-msgstr "প্রয়োগ করুন"
-
-#: ../src/connection-editor/nm-connection-editor.c:542
-msgid "Save any changes made to this connection."
-msgstr "এই সংযোগের ক্ষেত্রে করা পরিবর্তনগুলি সংরক্ষণ করুন।"
-
-#: ../src/connection-editor/nm-connection-editor.c:543
-msgid "Apply..."
-msgstr "প্রয়োগ করুন..."
-
-#: ../src/connection-editor/nm-connection-editor.c:544
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr ""
-"এই মেশিনের সকল ব্যবহারকারীর জন্য এই সংযোগ সংরক্ষণ করার জন্য অনুমোদন করুন।"
-
-#: ../src/connection-editor/nm-connection-editor.c:560
-msgid "Could not create connection"
-msgstr "সংযোগ তৈরি করা সম্ভব হয়নি"
-
-#: ../src/connection-editor/nm-connection-editor.c:560
-msgid "Could not edit connection"
-msgstr "সংযোগ সম্পাদনা করা সম্ভব হয়নি"
-
-#: ../src/connection-editor/nm-connection-editor.c:562
-msgid "Unknown error creating connection editor dialog."
-msgstr "সংযোগ সম্পাদক ডায়লগ প্রস্তুত করতে অজানা সমস্যা দেখা দিয়েছে।"
-
-#: ../src/connection-editor/nm-connection-editor.c:577
-msgid "Bonding, bridging, and VLANs are disabled in NetworkManager."
-msgstr "NetworkManager -এ বন্ডিং, ব্রিজিং, এবং VLAN নিষ্ক্রিয় করা অাছে।"
-
-#: ../src/connection-editor/nm-connection-editor.c:650
-msgid "Error saving connection"
-msgstr "সংযোগ সংরক্ষণ করতে সমস্যা"
-
-#: ../src/connection-editor/nm-connection-editor.c:651
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "'%s' / '%s' বিশিষ্টতা অবৈধ: %d"
-
-#: ../src/connection-editor/nm-connection-editor.c:743
-msgid "Error initializing editor"
-msgstr "সম্পাদন ব্যবস্থা আরম্ভ করতে ত্রুটি"
-
-#: ../src/connection-editor/nm-connection-editor.c:1037
-msgid "Connection update failed"
-msgstr "সংযোগ অাপডেট ব্যর্থ হয়েছে"
-
-#: ../src/connection-editor/nm-connection-editor.c:1097
-msgid "Connection add failed"
-msgstr "সংযোগ যোগ করতে ব্যর্থ"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Create New Connection"
-msgstr "নতুন সংযোগ তৈরি করুন"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Select the type of connection to create:"
-msgstr "অাপনি যে ধরনের সংযোগ তৈরি করতে চান তা নির্বাচন করুন:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-msgid "Connection _name:"
-msgstr "সংযোগের নাম (_n):"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "Connect _automatically"
-msgstr "সয়ংক্রিয়ভাবে সংযোগ করা হবে (_a)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Available to all users"
-msgstr "সকল ব্যবহারকারীর জন্য উপস্থিত"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "_Export..."
-msgstr "রপ্তানি করুন (_E)..."
-
-#: ../src/connection-editor/nm-connection-list.c:143
-msgid "never"
-msgstr "কখনো নয়"
-
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
-msgid "now"
-msgstr "এখন"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d মিনিট পূর্বে"
-msgstr[1] "%d মিনিট পূর্বে"
-
-#: ../src/connection-editor/nm-connection-list.c:176
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d ঘন্টা পূর্বে"
-msgstr[1] "%d ঘন্টা পূর্বে"
-
-#: ../src/connection-editor/nm-connection-list.c:188
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d দিন পূর্বে"
-msgstr[1] "%d দিন পূর্বে"
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
+msgstr "ওয়াই-ফাই নিরাপত্তার ইউজার ইন্টারফেস লোড করতে ব্যর্থ।"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d মাস পূর্বে"
-msgstr[1] "%d মাস পূর্বে"
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d বৎসর পূর্বে"
-msgstr[1] "%d বৎসর পূর্বে"
-
-#: ../src/connection-editor/nm-connection-list.c:629
-msgid "Name"
-msgstr "নাম"
-
-#: ../src/connection-editor/nm-connection-list.c:640
-msgid "Last Used"
-msgstr "সর্বশেষ ব্যবহার"
-
-#. Edit
-#: ../src/connection-editor/nm-connection-list.c:679
-msgid "Edit"
-msgstr "সম্পাদনা"
-
-#: ../src/connection-editor/nm-connection-list.c:680
-msgid "Edit the selected connection"
-msgstr "নির্বাচিত সংযোগটি সম্পাদনা করুন"
-
-#: ../src/connection-editor/nm-connection-list.c:681
-msgid "Edit..."
-msgstr "সম্পাদনা করুন..."
-
-#: ../src/connection-editor/nm-connection-list.c:682
-msgid "Authenticate to edit the selected connection"
-msgstr "নির্বাচিত সংযোগ সম্পাদনা করার পূর্বে অনুমোদিত হওয়া প্রয়োজন"
-
-#. Delete
-#: ../src/connection-editor/nm-connection-list.c:695
-msgid "Delete"
-msgstr "মুছে ফেলুন"
-
-#: ../src/connection-editor/nm-connection-list.c:696
-msgid "Delete the selected connection"
-msgstr "নির্বাচিত সংযোগটি মুছে ফেলুন"
-
-#: ../src/connection-editor/nm-connection-list.c:697
-msgid "Delete..."
-msgstr "মুছে ফেলুন..."
-
-#: ../src/connection-editor/nm-connection-list.c:698
-msgid "Authenticate to delete the selected connection"
-msgstr "নির্বাচিত সংযোগটি মুছে ফেলার পূর্বে অনুমোদিত হওয়া প্রয়োজন"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN সংযোগ ইম্পোর্ট করতে ব্যর্থ"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2441,236 +3081,96 @@ msgstr ""
 "\n"
 "ত্রুটি: %s।"
 
-#: ../src/connection-editor/vpn-helpers.c:240
-msgid "Select file to import"
-msgstr "ইম্পোর্ট করার উদ্দেশ্যে ফাইল নির্বাচন করুন"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "অজানা"
 
-#: ../src/connection-editor/vpn-helpers.c:288
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" নামক একটি ফাইল উপস্থিত।"
 
-#: ../src/connection-editor/vpn-helpers.c:290
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "প্রতিস্থাপন (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:328
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN সংযোগ এক্সপোর্ট করা যায়নি"
 
-#: ../src/connection-editor/vpn-helpers.c:330
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
-msgid "The VPN connection '%s' could not be exported to %s.\n"
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
 "\n"
 "Error: %s."
-msgstr "'%s' VPN সংযোগটি %s-র মধ্যে এক্সপোর্ট করা যায়নি।\n"
+msgstr ""
+"'%s' VPN সংযোগটি %s-র মধ্যে এক্সপোর্ট করা যায়নি।\n"
 "\n"
 "ত্রুটি: %s।"
 
-#: ../src/connection-editor/vpn-helpers.c:364
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN সংযোগ এক্সপোর্ট করুন..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:213
-#, c-format
-msgid "%s Network"
-msgstr "%s নেটওয়ার্ক"
-
-#: ../src/gnome-bluetooth/bt-widget.c:322
-#, c-format
-msgid "Error: %s"
-msgstr "ত্রুটি: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Mobile wizard was canceled"
-msgstr "মোবাইল উইজার্ড বাতিল করা হয়েছে"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "অজানা ধরনের ফোন ডিভাইস (GSM অথবা CDMA নয়)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:478
-msgid "Your phone is now ready to use!"
-msgstr "ব্যবহারের উদ্দেশ্যে আপনার ফোন এখন প্রস্তুত!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:648
-#: ../src/gnome-bluetooth/bt-widget.c:654
-msgid "failed to connect to the phone."
-msgstr "ফোনের সাথে সংযোগ স্থাপন করতে ব্যর্থ।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:687
-msgid "unexpectedly disconnected from the phone."
-msgstr "ফোনের সাথে অপ্রত্যাশিতরূপে সংযোগ বিচ্ছিন্ন হয়েছে।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:696
-msgid "timed out detecting phone details."
-msgstr "ফোনের বিবরণ নির্ধারণকালে সময়সীমা উত্তীর্ণ হয়েছে।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:711
-msgid "could not connect to the system bus."
-msgstr "সিস্টেম বাসের সাথে সংযোগ স্থাপন করতে ব্যর্থ।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:716
-msgid "Detecting phone configuration..."
-msgstr "ফোন কনফিগারেশন সনাক্ত করা হচ্ছে..."
-
-#: ../src/gnome-bluetooth/bt-widget.c:782
-msgid "could not find the Bluetooth device."
-msgstr "ব্লু-টুথ ডিভাইস পাওয়া যায়নি।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:912
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"ডায়াল-আপ নেটওয়ার্ক সংযোগ প্রস্তুত করার পূর্বে ডিফল্ট ব্লু-টুথ অ্যাডাপ্টার "
-"সক্রিয় করা আবশ্যক।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:944
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr ""
-"ব্লু-টুথ কনফিগার করা সম্ভব নয় (D-Bus-র সাথে সংযোগ স্থাপন করতে ব্যর্থ: %s)।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:954
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "ব্লু-টুথ কনফিগার করা সম্ভব নয় (D-Bus প্রক্সি নির্মাণ করতে ব্যর্থ)।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:963
-#, c-format
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
+#, fuzzy
 msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"ব্লু-টুথ কনফিগার করা সম্ভব নয় (NetworkManager সন্ধান করতে ব্যর্থ: %s)।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1014
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "নেটওয়ার্ক ডিভাইস রূপে মোবাইল ফোন ব্যবহার করা হবে (PAN/NAP)"
+"NetworkManager অ্যাপ্লেট দ্বারা কয়েকটি আবশ্যক রিসোর্সের উপস্থিতি সন্ধান করা সম্ভব "
+"হয়নি (যেমন glade ফাইল পাওয়া যায়নি)।"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1023
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "মোবাইল ফোনের মাধ্যমে ইন্টারনেট ব্যবহার করুন (DUN)"
-
-#: ../src/main.c:70
-msgid "Usage:"
-msgstr "ব্যবহার:"
-
-#: ../src/main.c:72
-msgid ""
-"This program is a component of NetworkManager (http://projects.gnome.org/"
-"NetworkManager)."
-msgstr ""
-"এই প্রোগ্রামটি NetworkManager-র অংশ (http://projects.gnome.org/"
-"NetworkManager)."
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "আন-লক করুন: (_U)"
 
-#: ../src/main.c:73
-msgid ""
-"It is not intended for command-line interaction but instead runs in the "
-"GNOME desktop environment."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
 msgstr ""
-"এটি কমান্ড-লাইনের মাধ্যমে ব্যবহারের উদ্দেশ্যে নির্মিত হয়নি এবং GNOME ডেস্কটপ "
-"পরিবেশের মধ্যে সঞ্চালিত হয়।"
-
-#: ../src/mb-menu-item.c:58
-msgid "EVDO"
-msgstr "EVDO"
-
-#: ../src/mb-menu-item.c:62
-msgid "GPRS"
-msgstr "GPRS"
-
-#: ../src/mb-menu-item.c:64
-msgid "EDGE"
-msgstr "EDGE"
-
-#: ../src/mb-menu-item.c:66
-msgid "UMTS"
-msgstr "UMTS"
-
-#: ../src/mb-menu-item.c:68
-msgid "HSDPA"
-msgstr "HSDPA"
-
-#: ../src/mb-menu-item.c:70
-msgid "HSUPA"
-msgstr "HSUPA"
-
-#: ../src/mb-menu-item.c:72
-msgid "HSPA"
-msgstr "HSPA"
-
-#: ../src/mb-menu-item.c:104
-msgid "not enabled"
-msgstr "সক্রিয় নয়"
-
-#: ../src/mb-menu-item.c:110
-msgid "not registered"
-msgstr "নিবন্ধিত নয়"
-
-#: ../src/mb-menu-item.c:128
-#, c-format
-msgid "Home network (%s)"
-msgstr "প্রধান নেটওয়ার্ক (%s)"
-
-#: ../src/mb-menu-item.c:130
-#, c-format
-msgid "Home network"
-msgstr "প্রধান নেটওয়ার্ক"
-
-#: ../src/mb-menu-item.c:138
-msgid "searching"
-msgstr "অনুসন্ধান করা হচ্ছে"
-
-#: ../src/mb-menu-item.c:141
-msgid "registration denied"
-msgstr "নিবন্ধন প্রত্যাখ্যান করা হয়েছে"
-
-#: ../src/mb-menu-item.c:146 ../src/mb-menu-item.c:152
-#, c-format
-msgid "%s (%s roaming)"
-msgstr "%s (%s রোমিং)"
-
-#: ../src/mb-menu-item.c:148 ../src/mb-menu-item.c:154
-#, c-format
-msgid "%s (roaming)"
-msgstr "%s (রোমিং)"
 
-#: ../src/mb-menu-item.c:157
-#, c-format
-msgid "Roaming network (%s)"
-msgstr "রোমিং নেটওয়ার্ক (%s)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "সংযোগ সংক্রান্ত তথ্য"
 
-#: ../src/mb-menu-item.c:159
-#, c-format
-msgid "Roaming network"
-msgstr "রোমিং নেটওয়ার্ক"
+#: ../src/info.ui.h:3
+#, fuzzy
+msgid "Active Network Connections"
+msgstr "নেটওয়ার্ক সংযোগ"
 
-#: ../src/utils/mobile-wizard.c:196
+#: ../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/utils/mobile-wizard.c:203
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "আপনার ব্যবহৃত ডিভাইস:"
 
 #. Provider
-#: ../src/utils/mobile-wizard.c:214
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "পরিসেবা উপলব্ধকারী:"
 
 #. Plan and APN
-#: ../src/utils/mobile-wizard.c:225
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "আপনার ব্যবহৃত প্ল্যান:"
 
-#: ../src/utils/mobile-wizard.c:246
+#: ../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 "
@@ -2678,276 +3178,633 @@ msgid ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 msgstr ""
-"আপনার নির্বাচিত বৈশিষ্ট্যগুলি প্রয়োগ করে এখন আপনার মোবাইল ব্রড-ব্যান্ড "
-"পরিসেবা উপলব্ধকারীর সাথে সংযোগ স্থাপন করা হবে।  সংযোগ বিফল হলে অথবা "
-"নেটওয়ার্ক রিসোর্স ব্যবহার করা সম্ভব না হলে, নির্ধারিত বৈশিষ্ট্যগুলি পরীক্ষা "
-"করুন।  মোবাইল ব্রড-ব্যান্ড সংযোগের বৈশিষ্ট্য পরিবর্তন করার জন্য সিস্টেম >> "
-"পছন্দ মেনু থেকে \"নেটওয়ার্ক সংযোগ\" নির্বাচন করুন।"
-
-#: ../src/utils/mobile-wizard.c:258
+"আপনার নির্বাচিত বৈশিষ্ট্যগুলি প্রয়োগ করে এখন আপনার মোবাইল ব্রড-ব্যান্ড পরিসেবা "
+"উপলব্ধকারীর সাথে সংযোগ স্থাপন করা হবে।  সংযোগ বিফল হলে অথবা নেটওয়ার্ক রিসোর্স "
+"ব্যবহার করা সম্ভব না হলে, নির্ধারিত বৈশিষ্ট্যগুলি পরীক্ষা করুন।  মোবাইল ব্রড-ব্যান্ড "
+"সংযোগের বৈশিষ্ট্য পরিবর্তন করার জন্য সিস্টেম >> পছন্দ মেনু থেকে \"নেটওয়ার্ক সংযোগ\" "
+"নির্বাচন করুন।"
+
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "মোবাইল ব্রড-ব্যান্ডের বৈশিষ্ট্য নিশ্চিত করুন"
 
-#: ../src/utils/mobile-wizard.c:319
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "তালিকা বহির্ভূত"
 
-#: ../src/utils/mobile-wizard.c:437
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "ব্যবহৃত প্ল্যান নির্বাচন করুন: (_S)"
 
-#: ../src/utils/mobile-wizard.c:461
+#: ../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/utils/mobile-wizard.c:480
+#: ../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"
 "\n"
-"প্ল্যান সম্পর্কে নিশ্চিত না হলে অনুগ্রহ করে পরিসেবা উপলব্ধকারী সাথে যোগাযোগ "
-"করে আপনার ব্যবহৃত প্ল্যানের APN জেনে নিন।"
+"প্ল্যান সম্পর্কে নিশ্চিত না হলে অনুগ্রহ করে পরিসেবা উপলব্ধকারী সাথে যোগাযোগ করে "
+"আপনার ব্যবহৃত প্ল্যানের APN জেনে নিন।"
 
-#: ../src/utils/mobile-wizard.c:487
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "ব্যবহৃত বিল প্ল্যান নির্বাচন করুন"
 
-#: ../src/utils/mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "ব্যবহৃত প্ল্যান তালিকায় অনুপস্থিত..."
 
-#: ../src/utils/mobile-wizard.c:688
+#: ../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/utils/mobile-wizard.c:701
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "পরিসেবা উপলব্ধকারী"
 
-#: ../src/utils/mobile-wizard.c:726
+#: ../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/utils/mobile-wizard.c:737
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "পরিসেবা উপলব্ধকারী:"
 
-#: ../src/utils/mobile-wizard.c:753
+#: ../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)"
+"পরিসেবা উপলব্ধকারী দ্বারা GSM প্রযুক্তি ব্যবহার করা হয় (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/utils/mobile-wizard.c:755
+#: ../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/utils/mobile-wizard.c:766
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "পরিসেবা উপলব্ধকারী নির্বাচন করুন"
 
-#: ../src/utils/mobile-wizard.c:1012
-msgid "Country List:"
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
+#, fuzzy
+msgid "Country or Region List:"
 msgstr "দেশের তালিকা:"
 
-#: ../src/utils/mobile-wizard.c:1024
-msgid "Country"
-msgstr "দেশ"
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
+#, fuzzy
+msgid "Country or region"
+msgstr "দেশের তালিকা:"
 
-#: ../src/utils/mobile-wizard.c:1031
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "আমার দেশ তালিকার মধ্যে উপস্থিত নেই"
 
-#: ../src/utils/mobile-wizard.c:1077
-msgid "Choose your Provider's Country"
+#: ../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/utils/mobile-wizard.c:1126
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ইনস্টল করা GSM ডিভাইস"
 
-#: ../src/utils/mobile-wizard.c:1129
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ইনস্টল করা CDMA ডিভাইস"
 
-#: ../src/utils/mobile-wizard.c:1297
+#: ../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 ""
-"এই সহায়ক ব্যবস্থার সাহায্যে একটি সেলুলার (৩জি) নেটওয়ার্কের সাথে মোবাইল ব্রড-"
-"ব্যান্ড সংযোগ স্থাপন করা যাবে।"
+"এই সহায়ক ব্যবস্থার সাহায্যে একটি সেলুলার (৩জি) নেটওয়ার্কের সাথে মোবাইল ব্রড-ব্যান্ড "
+"সংযোগ স্থাপন করা যাবে।"
 
-#: ../src/utils/mobile-wizard.c:1302
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "নিম্নলিখিত তথ্য প্রয়োজন:"
 
-#: ../src/utils/mobile-wizard.c:1313
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "ব্রড-ব্যান্ড পরিসেবা উপলব্ধকারীর নাম"
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ব্রড-ব্যান্ড বিলিং প্ল্যানের নাম"
 
-#: ../src/utils/mobile-wizard.c:1325
+#: ../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 (অ্যাকসেস "
-"পয়েন্ট নেম)"
+msgstr "(কিছু ক্ষেত্রে) আপনার ব্যবহৃত ব্রড-ব্যান্ড বিলিং প্ল্যান APN (অ্যাকসেস পয়েন্ট নেম)"
 
-#: ../src/utils/mobile-wizard.c:1352
+#: ../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 "এই মোবাইল ব্রড-ব্যান্ড ডিভাইসের জন্য সংযোগ নির্মাণ করুন (_t)"
 
-#: ../src/utils/mobile-wizard.c:1367
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "যে কোনো ডিভাইস"
 
-#: ../src/utils/mobile-wizard.c:1380
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "মোবাইল ব্রড-ব্যান্ড সংযোগ প্রস্তুত করুন"
 
-#: ../src/utils/mobile-wizard.c:1554
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "নতুন মোবাইল ব্রড-ব্যান্ড সংযোগ"
 
-#: ../src/utils/nmn-mobile-providers.c:76
-msgid "United Kingdom"
-msgstr "যুক্তরাজ্য"
+#: ../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/utils/nmn-mobile-providers.c:508
-msgid "Default"
-msgstr "ডিফল্ট"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/utils/utils.c:218
-msgid "Bridge"
-msgstr "ব্রিজ"
+#: ../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/vpn-password-dialog.c:141 ../src/vpn-password-dialog.c:268
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "VPN সংযোগ '%s' আরম্ভ করতে ব্যর্থ"
+#: ../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/vpn-password-dialog.c:144
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-"'%s' ধরনের VPN সংযোগের ক্ষেত্রে অনুমোদনের ডায়লগ পাওয়া যায়নি। সিস্টেম "
-"অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন।"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "পাসওয়ার্ড: (_P)"
 
-#: ../src/vpn-password-dialog.c:271
-#, c-format
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "পাসওয়ার্ড: (_P)"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "পাসওয়ার্ড প্রদর্শন করা হবে (_w)"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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 ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
+"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 ""
-"'%s' ধরনের VPN সংযোগের অনুমোদনের ডায়লগ আরম্ভ করতে সমস্যা দেখা দিয়েছে। "
-"সিস্টেম অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন।"
-
-#: ../src/wired-dialog.c:100
-msgid "Wired 802.1X authentication"
-msgstr "তারযুক্ত 802.1X অনুমোদন ব্যবস্থা"
 
-#: ../src/wireless-dialog.c:469
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "নতুন..."
 
-#: ../src/wireless-dialog.c:1089
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "শূণ্য"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "নির্মান করুন (_r)"
 
-#: ../src/wireless-dialog.c:1170
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
-msgstr ""
-"'%s' বেতার নেটওয়ার্ক ব্যবহার করার জন্য পাসওয়ার্ড অথবা এনক্রিপশন-কি প্রয়োজন।"
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr "'%s' বেতার নেটওয়ার্ক ব্যবহার করার জন্য পাসওয়ার্ড অথবা এনক্রিপশন-কি প্রয়োজন।"
 
-#: ../src/wireless-dialog.c:1172
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "বেতার নেটওয়ার্ক অনুমোদন প্রয়োজন"
 
-#: ../src/wireless-dialog.c:1174
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "বেতার নেটওয়ার্কের জন্য অনুমোদন প্রয়োজন"
 
-#: ../src/wireless-dialog.c:1179
-msgid "Create New Ad-Hoc Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "নতুন বেতার নেটওয়ার্ক তৈরি করুন"
 
-#: ../src/wireless-dialog.c:1181
-msgid "New ad-hoc wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "নতুন বেতার নেটওয়ার্ক"
 
-#: ../src/wireless-dialog.c:1182
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "নির্মাণ করার উদ্দেশ্যে চিহ্নিত বেতার নেটওয়ার্কের নাম নির্ধারণ করুন।"
 
-#: ../src/wireless-dialog.c:1184
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "গোপন বেতার নেটওয়ার্কের সাথে সংযোগ স্থাপন করুন"
 
-#: ../src/wireless-dialog.c:1186
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "গোপন বেতার নেটওয়ার্ক"
 
-#: ../src/wireless-dialog.c:1187
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, 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:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "নিরাপত্তা: (_S)"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#, fuzzy
+msgid "C_onnection:"
+msgstr "সংযোগ: (_n)"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "বেতার অ্যাডাপ্টার: (_a)"
+
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr "ব্যবহার:"
+
+#: ../src/main.c:44
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+"এই প্রোগ্রামটি NetworkManager-র অংশ (http://projects.gnome.org/NetworkManager)."
+
+#: ../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
+msgid "EVDO"
+msgstr "EVDO"
 
-#: ../src/wireless-security/eap-method.c:440
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr "GPRS"
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr "EDGE"
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr "UMTS"
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr "HSDPA"
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr "HSUPA"
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr "সক্রিয় নয়"
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr "নিবন্ধিত নয়"
+
+#: ../src/mb-menu-item.c:141
+#, c-format
+msgid "Home network (%s)"
+msgstr "প্রধান নেটওয়ার্ক (%s)"
+
+#: ../src/mb-menu-item.c:143
+#, c-format
+msgid "Home network"
+msgstr "প্রধান নেটওয়ার্ক"
+
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr "অনুসন্ধান করা হচ্ছে"
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr "নিবন্ধন প্রত্যাখ্যান করা হয়েছে"
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr "%s (রোমিং)"
+
+#: ../src/mb-menu-item.c:170
+#, c-format
+msgid "Roaming network (%s)"
+msgstr "রোমিং নেটওয়ার্ক (%s)"
+
+#: ../src/mb-menu-item.c:172
+#, c-format
+msgid "Roaming network"
+msgstr "রোমিং নেটওয়ার্ক"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "PIN কোড প্রয়োজন"
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "মোবাইল ব্রড-ব্যান্ড ডিভাইসের ক্ষেত্রে PIN কোড উল্লেখ করা আবশ্যক"
+
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "'%s' মোবাইল ব্রড-ব্যান্ড সংযোগ বর্তমানে সক্রিয়: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "রোমিং"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "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/wireless-security/eap-method.c:452
+#, 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER অথবা PEM সার্টিফিকেট (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:260
-#: ../src/wireless-security/eap-method-peap.c:290
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:398
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "একটি PAC ফাইল বাছুন..."
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC ফাইল (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:409
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "সর্বধরনের ফাইল"
 
-#: ../src/wireless-security/eap-method-peap.c:274
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "নামবিহীন পরিচয়: (_m)"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "অনুমোদন ব্যবস্থা: (_A)"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
+msgstr "নামবিহীন পরিচয়: (_m)"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+#, fuzzy
+msgid "PAC _file:"
+msgstr "_PAC ফাইল:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#, fuzzy
+msgid "_Inner authentication:"
+msgstr "অভ্যন্তরীণ অনুমোদন: (_n)"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+#, fuzzy
+msgid "Allow automatic PAC pro_visioning"
+msgstr "স্বয়ংক্রিয় PAC বিশেষাধীকারের অনুমতি দিন (_A)"
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:369
-#: ../src/wireless-security/eap-method-tls.c:456
-#: ../src/wireless-security/eap-method-ttls.c:368
+#: ../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 "সার্টিফিকেট অথোরিটির (CA) সার্টিফিকেট নির্বাচন করুন..."
 
-#: ../src/wireless-security/eap-method-tls.c:272
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr ""
+
+#: ../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 "CA সার্টিফিকেট: (_A)"
+
+#: ../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
+msgid "No CA certificate is _required"
+msgstr "কোনো CA সার্টিফিকেটের প্রয়োজন নেই (_r)"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#, fuzzy
+msgid "PEAP _version:"
+msgstr "PEAP-র সংস্করণ: (_P)"
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "CA সার্টিফিকেট: (_A)"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "এনক্রিপশন বিহীন ব্যক্তিগত-কি নিরাপদ নয়"
 
-#: ../src/wireless-security/eap-method-tls.c:275
+#: ../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 "
@@ -2955,41 +3812,537 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"নির্বাচিত ব্যক্তিগত-কি সম্ভবত পাসওয়ার্ড সহযোগে সুরক্ষিত নয়। এর ফলে নিরাপত্তা "
-"বিষয়ক পরিচয়ের নিরাপত্তাহানী হওয়ার সম্ভাবনা রয়েছে।  অনুগ্রহ করে, পাসওয়ার্ড "
-"সহযোগে সুরক্ষিত একটি ব্যক্তিগত-কি নির্বাচন করুন।\n"
+"নির্বাচিত ব্যক্তিগত-কি সম্ভবত পাসওয়ার্ড সহযোগে সুরক্ষিত নয়। এর ফলে নিরাপত্তা বিষয়ক "
+"পরিচয়ের নিরাপত্তাহানী হওয়ার সম্ভাবনা রয়েছে।  অনুগ্রহ করে, পাসওয়ার্ড সহযোগে সুরক্ষিত "
+"একটি ব্যক্তিগত-কি নির্বাচন করুন।\n"
 "\n"
 "(openssl-র মাধ্যমে পাসওয়ার্ড সহযোগে ব্যক্তিগত-কি সুরক্ষিত করা যাবে)"
 
-#: ../src/wireless-security/eap-method-tls.c:450
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "ব্যক্তিগত সার্টিফিকেট নির্বাচন করুন..."
 
-#: ../src/wireless-security/eap-method-tls.c:462
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "ব্যক্তিগত-কি নির্বাচন করুন..."
 
-#: ../src/wireless-security/wireless-security.c:406
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity:"
+msgstr "পরিচয়: (_d)"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "ব্যবহারকারীর সার্টিফিকেট: (_U)"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "Private _key:"
+msgstr "ব্যক্তিগত-কি: (_k)"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_Private key password:"
+msgstr "ব্যক্তিগত কি-র পাসওয়ার্ড: (_P)"
+
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:441
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "টানেল করা TLS"
 
-#: ../src/wireless-security/wireless-security.c:452
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "প্রটেক্টেড EAP (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:593
-msgid "WPA Only"
-msgstr "শুধুমাত্র WPA"
+#: ../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
+#, fuzzy
+msgid "Au_thentication:"
+msgstr "অনুমোদন ব্যবস্থা: (_A)"
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
+#, fuzzy
+msgid "Open System"
+msgstr ""
+"উন্মুক্ত সিস্টেম\n"
+"যৌথরূপে ব্যবহৃত কি"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+#, fuzzy
+msgid "Shared Key"
+msgstr ""
+"উন্মুক্ত সিস্টেম\n"
+"যৌথরূপে ব্যবহৃত কি"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "কি: (_K)"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr "কি প্রদর্শন করা হবে (_w)"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x:"
+msgstr "WEP ইন্ডেক্স: (_x)"
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "ধরন: (_T)"
+
+#~ msgid "Show WPA protocol chooser widget"
+#~ msgstr "WPA প্রোটোকল চয়নকারী উইজেট দেখান"
+
+#~ msgid ""
+#~ "Set to TRUE to show the WPA protocol chooser when editing connections."
+#~ msgstr "সংযোগ সম্পাদনার সময়ে WPA প্রোটোকল চয়নকারী দেখাতে সত্যতে সেট করুন।"
+
+#~ msgid "An instance of nm-applet is already running.\n"
+#~ msgstr "nm-applet-র একটি ইনস্ট্যান্স বর্তমানে চলছে।\n"
+
+#~ msgid "Could not acquire the %s service. (%d)\n"
+#~ msgstr "%s পরিসেবা গ্রহণ করতে ব্যর্থ। (%d)\n"
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "'%s' বন্ড সংযোগ প্রস্তুত করা হচ্ছে..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "'%s' বন্ড সংযোগ কনফিগার করা হচ্ছে..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "'%s' বন্ড সংযোগের জন্য ব্যবহারকারীর প্রমাণীকরণ থাকা আবশ্যক..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "'%s'-র জন্য ঠিকানার অনুরোধ করা হচ্ছে..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "'%s' VLAN সংযোগ সক্রিয়"
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "'%s' ব্রিজ সংযোগ প্রস্তুত করা হচ্ছে..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "'%s' ব্রিজ সংযোগ  কনফিগার করা হচ্ছে..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "'%s' ব্রিজ সংযোগের জন্য ব্যবহারকারীর প্রমাণীকরণ থাকা আবশ্যক..."
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "নতুন মোবাইল ব্রড-ব্যান্ড (CDMA) সংযোগ..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "আপনি এখন CDMA নেটওয়ার্কের সাথে সংযুক্ত।"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "নতুন মোবাইল ব্রড-ব্যান্ড (GSM) সংযোগ..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "আপনি এখন GSM নেটওয়ার্কের সাথে সংযুক্ত।"
+
+#~ msgid "PUK code required"
+#~ msgstr "PUK কোড প্রয়োজন"
+
+#~ msgid "PUK code is needed for the mobile broadband device"
+#~ msgstr "মোবাইল ব্রড-ব্যান্ড ডিভাইসের ক্ষেত্রে PUK কোড উল্লেখ করা আবশ্যক"
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "স্বয়ংক্রিয় InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand নেটওয়ার্ক (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand নেটওয়ার্ক (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand নেটওয়ার্ক"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand নেটওয়ার্ক"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "অাপনি এখন InfiniBand নেটওয়ার্কের সাথে সংযুক্ত।"
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "'%s' InfiniBand সংযোগ প্রস্তুত করা হচ্ছে..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "'%s' InfiniBand সংযোগ কনফিগার করা হচ্ছে..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "'%s' InfiniBand সংযোগের জন্য ব্যবহারকারীর প্রমাণীকরণ থাকা আবশ্যক..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "'%s' InfiniBand সংযোগ সক্রিয়"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "আপনি এখন VLAN'র সাথে সংযুক্ত।"
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "'%s' VLAN সংযোগ প্রস্তুত করা হচ্ছে..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "'%s' VLAN সংযোগ কনফিগার করা হচ্ছে..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "'%s' VLAN সংযোগের জন্য ব্যবহারকারীর প্রমাণীকরণ থাকা আবশ্যক..."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "বেতার নেটওয়ার্ক (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "বেতার নেটওয়ার্ক (%s)"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "বেতার নেটওয়ার্ক সংযোগ '%s' প্রস্তুত করা হচ্ছে..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "'%s' বেতার নেটওয়ার্ক সংযোগ কনফিগার করা হচ্ছে..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "'%s'-র জন্য বেতার নেটওয়ার্কের ঠিকানার অনুরোধ করা হচ্ছে..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "'%s' বেতার নেটওয়ার্ক সংযোগ বর্তমানে সক্রিয়"
+
+#~ msgctxt "No wired security used"
+#~ msgid "None"
+#~ msgstr "শূণ্য"
+
+#~ msgctxt "Unknown/unrecognized wired or wifi security"
+#~ msgid "Unknown"
+#~ msgstr "অজানা"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "দ্বিতীয় DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "তৃতীয় DNS:"
+
+#~ msgid "translator-credits"
+#~ msgstr ""
+#~ "সঙ্কর্ষণ মুখোপাধ্যায়\n"
+#~ "রুণা ভট্টাচার্য্য"
+
+#~ msgid "_Help"
+#~ msgstr "সাহায্য (_H)"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "অন্যান্য বেতার নেটওয়ার্ক..."
+
+#~ msgid "_Wireless security:"
+#~ msgstr "বেতার নিরাপত্তা: (_W)"
+
+#~ msgid ""
+#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+#~ msgstr "<span size=\"larger\" weight=\"bold\">সক্রিয় নেটওয়ার্ক সংযোগ</span>"
+
+#~ msgid "WPA Protocol:"
+#~ msgstr "WPA প্রোটোকল:"
+
+#~ msgid ""
+#~ "Anonymous\n"
+#~ "Authenticated\n"
+#~ "Both"
+#~ msgstr ""
+#~ "নামবিহীন\n"
+#~ "প্রমাণীকৃত\n"
+#~ "উভয়ই"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Version 0\n"
+#~ "Version 1"
+#~ msgstr ""
+#~ "স্বয়ংক্রিয়\n"
+#~ "সংস্করণ ০\n"
+#~ "সংস্করণ ১"
+
+#~ msgid "label"
+#~ msgstr "লেবেল"
+
+#~ msgid "Show it"
+#~ msgstr "প্রদর্শন করা হবে"
+
+#~ msgid "_Mode:"
+#~ msgstr "মোড (_M):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "ডিভাইসের MAC ঠিকানা: (_D)"
+
+#~ msgid "<b>Addresses</b>"
+#~ msgstr "<b>ঠিকানা</b>"
+
+#~ msgid "_Routes&#x2026;"
+#~ msgstr "রুটস (_R)&#x2026;"
+
+#~ msgid "Any"
+#~ msgstr "যে কোনো"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "পছন্দের 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "পছন্দের 2G (GPRS/EDGE)"
+
+#~ msgid "<b>Basic</b>"
+#~ msgstr "<b>মৌলিক বৈশিষ্ট্য</b>"
+
+#~ msgid "PI_N:"
+#~ msgstr "PI_N:"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>অনুমোদন</b>"
+
+#~ msgid "<b>Echo</b>"
+#~ msgstr "<b>প্রতিধ্বনি</b>"
+
+#~ msgid "MT_U:"
+#~ msgstr "MT_U:"
+
+#~ msgid "Infrastructure"
+#~ msgstr "পরিকাঠামো"
+
+#~ msgid "_SSID:"
+#~ msgstr "_SSID:"
+
+#~ msgid "Wireless"
+#~ msgstr "বেতার"
+
+#~ msgid ""
+#~ "Select the type of connection that will be used for the slaves of this "
+#~ "bond."
+#~ msgstr "এই বন্ডের স্লেভের জন্য যে ধরনের সংযোগ ব্যবহার করা হবে তা নির্বাচন করুন।"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "স্বয়ংক্রিয় (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "শুধুমাত্র স্বয়ংক্রিয় (PPP) ঠিকানা"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "বেতার সংযোগ %d"
+
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the "
+#~ "NetworkManager applet .glade file was not found)."
+#~ msgstr ""
+#~ "সংযোগ সম্পাদন কয়েকটি আবশ্যক রিসোর্স খুঁজে পায়নি (NetworkManager অ্যাপ্লেট .glade "
+#~ "ফাইল পাওয়া যায়নি)।"
+
+#~ msgid ""
+#~ "Support for bond, bridge, and VLAN interfaces must be enabled by setting "
+#~ "the NM_BOND_BRIDGE_VLAN_ENABLED key to 'yes' in <tt>/etc/sysconfig/"
+#~ "network</tt>:\n"
+#~ "\n"
+#~ "\t<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
+#~ "\n"
+#~ "After making this modification, NetworkManager must be restarted to "
+#~ "ensure the new functionality is enabled."
+#~ msgstr ""
+#~ "NM_BOND_BRIDGE_VLAN_ENABLED কী <tt>/etc/sysconfig/network</tt> -এ 'হ্যাঁ' "
+#~ "তে সেট করে বন্ড, ব্রিজ, এবং VLAN ইন্টারফেস অবশ্যই সক্রিয় করতে হবে:\n"
+#~ "\n"
+#~ "\t<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
+#~ "\n"
+#~ "এই সংশোধন করার পরে, নতুন বৈশিষ্ট্য সক্রিয় করার পরে NetworkManager অবশ্যই "
+#~ "পুনঃসূচনা করতে হবে।"
+
+#~ msgid "Bridging, bonding, and VLAN functionality not enabled"
+#~ msgstr "ব্রিজিং, বন্ডিং, এবং VLAN বৈশিষ্ট্য সক্রিয় করা নেই"
+
+#~ msgid "Apply"
+#~ msgstr "প্রয়োগ করুন"
+
+#~ msgid "Apply..."
+#~ msgstr "প্রয়োগ করুন..."
+
+#~ msgid "Bonding, bridging, and VLANs are disabled in NetworkManager."
+#~ msgstr "NetworkManager -এ বন্ডিং, ব্রিজিং, এবং VLAN নিষ্ক্রিয় করা অাছে।"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "'%s' / '%s' বিশিষ্টতা অবৈধ: %d"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "সয়ংক্রিয়ভাবে সংযোগ করা হবে (_a)"
+
+#~ msgid "Available to all users"
+#~ msgstr "সকল ব্যবহারকারীর জন্য উপস্থিত"
+
+#~ msgid "Edit"
+#~ msgstr "সম্পাদনা"
+
+#~ msgid "Edit..."
+#~ msgstr "সম্পাদনা করুন..."
+
+#~ msgid "Delete"
+#~ msgstr "মুছে ফেলুন"
+
+#~ msgid "Delete..."
+#~ msgstr "মুছে ফেলুন..."
+
+#~ msgid "Error: %s"
+#~ msgstr "ত্রুটি: %s"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "মোবাইল উইজার্ড বাতিল করা হয়েছে"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "অজানা ধরনের ফোন ডিভাইস (GSM অথবা CDMA নয়)"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "ব্যবহারের উদ্দেশ্যে আপনার ফোন এখন প্রস্তুত!"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "ফোনের সাথে সংযোগ স্থাপন করতে ব্যর্থ।"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ফোনের সাথে অপ্রত্যাশিতরূপে সংযোগ বিচ্ছিন্ন হয়েছে।"
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "ফোনের বিবরণ নির্ধারণকালে সময়সীমা উত্তীর্ণ হয়েছে।"
+
+#~ msgid "could not connect to the system bus."
+#~ msgstr "সিস্টেম বাসের সাথে সংযোগ স্থাপন করতে ব্যর্থ।"
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "ফোন কনফিগারেশন সনাক্ত করা হচ্ছে..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "ডায়াল-আপ নেটওয়ার্ক সংযোগ প্রস্তুত করার পূর্বে ডিফল্ট ব্লু-টুথ অ্যাডাপ্টার সক্রিয় করা "
+#~ "আবশ্যক।"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr "ব্লু-টুথ কনফিগার করা সম্ভব নয় (D-Bus-র সাথে সংযোগ স্থাপন করতে ব্যর্থ: %s)।"
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "ব্লু-টুথ কনফিগার করা সম্ভব নয় (D-Bus প্রক্সি নির্মাণ করতে ব্যর্থ)।"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr "ব্লু-টুথ কনফিগার করা সম্ভব নয় (NetworkManager সন্ধান করতে ব্যর্থ: %s)।"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "নেটওয়ার্ক ডিভাইস রূপে মোবাইল ফোন ব্যবহার করা হবে (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "মোবাইল ফোনের মাধ্যমে ইন্টারনেট ব্যবহার করুন (DUN)"
+
+#~ msgid "Country"
+#~ msgstr "দেশ"
+
+#~ msgid "United Kingdom"
+#~ msgstr "যুক্তরাজ্য"
+
+#~ msgid "Cannot start VPN connection '%s'"
+#~ msgstr "VPN সংযোগ '%s' আরম্ভ করতে ব্যর্থ"
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "'%s' ধরনের VPN সংযোগের ক্ষেত্রে অনুমোদনের ডায়লগ পাওয়া যায়নি। সিস্টেম "
+#~ "অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন।"
+
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "'%s' ধরনের VPN সংযোগের অনুমোদনের ডায়লগ আরম্ভ করতে সমস্যা দেখা দিয়েছে। সিস্টেম "
+#~ "অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন।"
 
-#: ../src/wireless-security/wireless-security.c:602
-msgid "WPA2/RSN Only"
-msgstr "শুধুমাত্র WPA2/RSN"
+#~ msgid "WPA Only"
+#~ msgstr "শুধুমাত্র WPA"
 
+#~ msgid "WPA2/RSN Only"
+#~ msgstr "শুধুমাত্র WPA2/RSN"
diff --git a/po/bs.po b/po/bs.po
index 28faf40d..0de03d09 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -1,9 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2015-02-26 23:29+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -11,12 +10,12 @@ 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%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"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"
 "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:3444
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Mreža"
 
@@ -124,54 +123,90 @@ msgstr ""
 "Uključite ovu opciju da isključite upozorenja o CA certifikatima u drugoj "
 "fazi EAP potvrđivanja identiteta."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Programče Upravnik mreže"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Programče Upravnik mreže"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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-page-wimax.ui.h:2
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+#, fuzzy
+msgid "C_onnect"
+msgstr "Povezan"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Ime mreže:"
 
-#: ../src/ap-menu-item.c:86
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:91
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "sigurno"
 
-#: ../src/applet.c:494
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Nisam uspio da dodam/aktiviram vezu"
 
-#: ../src/applet.c:496 ../src/applet.c:550 ../src/applet.c:585
-#: ../src/applet-device-wifi.c:1319 ../src/applet-device-wifi.c:1342
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ../src/applet.c:499 ../src/applet.c:588 ../src/applet-device-wifi.c:1322
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Greška veze"
 
-#: ../src/applet.c:548
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Neuspjelo prekidanje veze uređaja"
 
-#: ../src/applet.c:553
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Neuspjelo prekidanje veze"
 
-#: ../src/applet.c:583
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Neuspjelo aktiviranje veze"
 
-#: ../src/applet.c:907 ../src/applet-device-wifi.c:1035
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Ne prikazuj više ovu poruku"
 
-#: ../src/applet.c:994
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -181,7 +216,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zbog prekida veze u mreži."
 
-#: ../src/applet.c:997
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -191,7 +226,7 @@ msgstr ""
 "Ne mogu da uspostavim VPN vezu „%s“ zbog neočekivanog isključenja VPN "
 "servisa."
 
-#: ../src/applet.c:1000
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -202,7 +237,7 @@ msgstr ""
 "Ne mogu da uspostavim VPN vezu „%s“ jer je VPN servis poslao neodgovarajuća "
 "podešavanja."
 
-#: ../src/applet.c:1003
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -211,7 +246,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer je isteklo vrijeme za povezivanje."
 
-#: ../src/applet.c:1006
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -220,7 +255,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer VPN servis nije pokrenut na vrijeme."
 
-#: ../src/applet.c:1009
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -229,7 +264,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zato što ne mogu da pokrenem VPN servis."
 
-#: ../src/applet.c:1012
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -238,7 +273,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer ne postoje ispravne VPN lozinke."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -247,7 +282,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zbog neispravnih VPN lozinki."
 
-#: ../src/applet.c:1022
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -256,7 +291,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“."
 
-#: ../src/applet.c:1038
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -266,7 +301,7 @@ msgstr ""
 "\n"
 "Prekinuta je VPN veza „%s“ zbog prekida veze u mreži."
 
-#: ../src/applet.c:1041
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -275,7 +310,7 @@ msgstr ""
 "\n"
 "Prekinuta je VPN veza „%s“ zbog isključivanja VPN servisa."
 
-#: ../src/applet.c:1047
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +319,7 @@ msgstr ""
 "\n"
 "VPN veza „%s“ je prekinuta."
 
-#: ../src/applet.c:1077
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -295,19 +330,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1079
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN veza je uspješno uspostavljena.\n"
 
-#: ../src/applet.c:1081
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Poruka za VPN prijavu"
 
-#: ../src/applet.c:1087 ../src/applet.c:1095 ../src/applet.c:1136
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Nije uspjelo povezivanje na VPN"
 
-#: ../src/applet.c:1143
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -321,7 +356,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1146
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -334,771 +369,548 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1469
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "uređaj nije spreman (nedostaje firmver)"
 
-#: ../src/applet.c:1471
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "uređaj nije spreman"
 
-#. Notify user of unmanaged or unavailable djevice
-#: ../src/applet.c:1481 ../src/applet-device-ethernet.c:114
-#: ../src/applet-device-infiniband.c:112 ../src/applet-device-vlan.c:171
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "veza je prekinuta"
 
-#: ../src/applet.c:1497
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Prekini vezu"
 
-#: ../src/applet.c:1511
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "uređaj nije upravljan"
 
-#: ../src/applet.c:1671
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Nema dostupnih mrežnih uređaja"
 
-#: ../src/applet.c:1725
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "V_PN veze"
 
-#: ../src/applet.c:1779
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "Po_desi VPN..."
 
-#: ../src/applet.c:1784
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Prekini VPN vezu"
 
-#: ../src/applet.c:1905
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nije pokrenut..."
 
-#: ../src/applet.c:1910 ../src/applet.c:2937
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Umrežavanje isključeno"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2140
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Uključi _mrežne usluge"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2149
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Uključi _bežičnu WiFi mrežu"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2158
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Omogući _mobilne veze"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2167
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Omogući WiMA_X Mobilnu širokopojasnu mrežu"
-
 #. Toggle notifications item
-#: ../src/applet.c:2179
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "_Prikaži obavještenja"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2191
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Poda_ci o vezi"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2201
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Izmijeni veze..."
 
-#. Help item
-#: ../src/applet.c:2216
-msgid "_Help"
-msgstr "_Pomoć"
-
-#. About item
-#: ../src/applet.c:2225
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/applet.c:2506
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Povezani ste na „%s“."
 
-#: ../src/applet.c:2549
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Prekinuta veza"
 
-#: ../src/applet.c:2550
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Mrežna veza je prekinuta."
 
-#: ../src/applet.c:2805
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Pripremam mrežnu vezu „%s“..."
 
-#: ../src/applet.c:2808
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Potrebna je autentifikacija korisnika za uspostavljanje veze „%s“..."
 
-#: ../src/applet.c:2811 ../src/applet-device-bt.c:127
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:598
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Zahtijevam adresu mreže za „%s“..."
 
-#: ../src/applet.c:2814
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Mrežna veza '%s' je aktivna"
 
-#: ../src/applet.c:2888
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Uspostavljam VPN vezu „%s“..."
 
-#: ../src/applet.c:2891
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr ""
 "Potrebna je autentifikacija korisnika za uspostavljanje VPN veze „%s“..."
 
-#: ../src/applet.c:2894
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Zahtijevam VPN adresu za „%s“..."
 
-#: ../src/applet.c:2897
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN veza '%s' je aktivna"
 
-#: ../src/applet.c:2941
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Nema mrežnih veza"
 
-#: ../src/applet.c:3559
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Programče Upravnik mreže"
 
-#: ../src/applet-device-bond.c:67 ../src/applet-device-bridge.c:67
-#: ../src/applet-device-broadband.c:774 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-infiniband.c:120
-#: ../src/applet-device-team.c:64 ../src/applet-device-vlan.c:180
-#: ../src/applet-device-wifi.c:822 ../src/applet-device-wimax.c:268
-msgid "Available"
-msgstr "Dostupno"
-
-#: ../src/applet-device-bond.c:79 ../src/applet-device-bridge.c:79
-#: ../src/applet-device-broadband.c:801 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-infiniband.c:135
-#: ../src/applet-device-team.c:76 ../src/applet-device-vlan.c:193
-#: ../src/applet-device-wifi.c:1234 ../src/applet-device-wimax.c:400
-msgid "Connection Established"
-msgstr "Veza uspostavljena"
-
-#: ../src/applet-device-bond.c:80
-msgid "You are now connected to the bonded network."
-msgstr "Sada ste konektovani na uvezanu mrežu."
-
-#: ../src/applet-device-bond.c:105
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Pripremanje veze '%s'..."
-
-#: ../src/applet-device-bond.c:108
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Konfigurisanje veze '%s' ..."
-
-#: ../src/applet-device-bond.c:111
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Potrebna ovjera korisnika za povezivanje '%s'..."
-
-#: ../src/applet-device-bond.c:114 ../src/applet-device-bridge.c:114
-#: ../src/applet-device-infiniband.c:170 ../src/applet-device-team.c:111
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Zahtijeva adresu za '%s'..."
-
-#: ../src/applet-device-bond.c:118
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Veza '%s' aktivna"
-
-#: ../src/applet-device-bridge.c:80
-msgid "You are now connected to the bridged network."
-msgstr "Sada ste konektovani na mostnu mrežu."
-
-#: ../src/applet-device-bridge.c:105
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "U toku priprema mostne veze '%s'..."
-
-#: ../src/applet-device-bridge.c:108
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Konfigurisanje mostne veze '%s'..."
-
-#: ../src/applet-device-bridge.c:111
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Potrebna ovjera korisnika za mostnu vezu '%s'..."
-
-#: ../src/applet-device-bridge.c:118
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Mostna veza '%s' aktivna"
-
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Pogrešan PUK kod, kontaktirajte vašeg provajdera."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 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:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Šaljem kod za otključavanje."
 
-#: ../src/applet-device-broadband.c:720 ../src/applet-dialogs.c:470
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilna širokopojasna (%s)"
 
-#: ../src/applet-device-broadband.c:722
-#: ../src/connection-editor/connection-helpers.c:125
-#: ../src/connection-editor/page-mobile.c:309
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobilna širokopojasna"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Dostupno"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:787
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Nova Mobilna Širokopojasna konekcija..."
 
-#: ../src/applet-device-broadband.c:802
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Veza uspostavljena"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Sada ste spojeni na Mobilnu Širokopojasnu mrežu."
 
-#: ../src/applet-device-broadband.c:939 ../src/applet-device-broadband.c:945
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobilna Širokopojasna mreža."
 
-#: ../src/applet-device-broadband.c:940
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Sada ste registrovani na kućnu mrežu."
 
-#: ../src/applet-device-broadband.c:946
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Sada ste registrovani na mrežu prebacivanja."
 
-#: ../src/applet-device-bt.c:93
+#: ../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:118 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:589
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Pripremam mobilnu, širokopojasnu vezu „%s“..."
 
-#: ../src/applet-device-bt.c:121 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:592
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Podešavam mobilnu, širokopojasnu vezu „%s“..."
 
-#: ../src/applet-device-bt.c:124 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:595
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:131 ../src/mobile-helpers.c:614
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobilna širokopojasna veza '%s' je aktivna"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatska žičana veza"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet mreže (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet mreža (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet mreže"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet mreža"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../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:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Pripremam vezu preko Ethernet mreže „%s“..."
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Podešavam vezu preko Ethernet mreže „%s“..."
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, 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:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Zahtijevam adresu za Ethernet mrežu „%s“..."
 
-#: ../src/applet-device-ethernet.c:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Povezani ste preko Ethernet mrežne veze „%s“"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL autentifikacija"
 
-#: ../src/applet-device-infiniband.c:33
-msgid "Auto InfiniBand"
-msgstr "Auto InfiniBand"
-
-#: ../src/applet-device-infiniband.c:85
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand Mreže (%s)"
-
-#: ../src/applet-device-infiniband.c:87
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand Mreža (%s)"
-
-#: ../src/applet-device-infiniband.c:90
-msgid "InfiniBand Networks"
-msgstr "InfiniBand Mreže"
-
-#: ../src/applet-device-infiniband.c:92
-msgid "InfiniBand Network"
-msgstr "InfiniBand Mreža"
-
-#: ../src/applet-device-infiniband.c:136
-msgid "You are now connected to the InfiniBand network."
-msgstr "Konektovani ste na InfiniBand mrežu."
-
-#: ../src/applet-device-infiniband.c:161
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "U toku priprema InfiniBand veze '%s'..."
-
-#: ../src/applet-device-infiniband.c:164
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Konfigurisanje InfiniBand veze '%s'..."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Potrebna ovjera korisnika za InfiniBand vezu '%s'..."
-
-#: ../src/applet-device-infiniband.c:174
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand veza '%s' aktivna"
-
-#: ../src/applet-device-team.c:77
-msgid "You are now connected to the teamed network."
-msgstr "Konektovani ste na udruženu mrežu."
-
-#: ../src/applet-device-team.c:102
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "U toku priprema grupne veze '%s'..."
-
-#: ../src/applet-device-team.c:105
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Konfigurisanje grupne veze '%s'..."
-
-#: ../src/applet-device-team.c:108
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Potrebna ovjera korisnika za grupno povezivanje '%s'..."
-
-#: ../src/applet-device-team.c:115
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Grupna veza '%s' aktivna"
-
-#: ../src/applet-device-vlan.c:194
-msgid "You are now connected to the VLAN."
-msgstr "Konektovani ste na VLAN."
-
-#: ../src/applet-device-vlan.c:219
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "U toku pripreme VLAN veze '%s'..."
-
-#: ../src/applet-device-vlan.c:222
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Konfigurisanje VLAN veze '%s'..."
-
-#: ../src/applet-device-vlan.c:225
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Potrebna ovjera korisnika za VLAN povezivanje '%s'..."
-
-#: ../src/applet-device-vlan.c:232
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VLAN veza '%s' aktivna"
-
-#: ../src/applet-device-wifi.c:86
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Poveži se na _skrivenu bežičnu Wi-Fi mrežu..."
 
-#: ../src/applet-device-wifi.c:137
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Napravi _novu bežičnu Wi-Fi mrežu..."
 
-#: ../src/applet-device-wifi.c:287
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ništa)"
 
-#: ../src/applet-device-wifi.c:754
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Bežične Wi-Fi mreže (%s)"
 
-#: ../src/applet-device-wifi.c:756
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Bežična Wi-Fi mreža (%s)"
 
 #         translations.
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:905
 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:787
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Bežična Wi-Fi mreža je isključena"
 
-#: ../src/applet-device-wifi.c:788
+#: ../src/applet-device-wifi.c:935
 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:849
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Još mreža"
 
-#: ../src/applet-device-wifi.c:1031
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Dostupne su bežičneWi-Fi  mreže"
 
-#: ../src/applet-device-wifi.c:1032
+#: ../src/applet-device-wifi.c:1181
 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:1233
+#: ../src/applet-device-wifi.c:1364
 #, 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:1265
+#: ../src/applet-device-wifi.c:1399
 #, 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:1268
+#: ../src/applet-device-wifi.c:1402
 #, 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:1271
+#: ../src/applet-device-wifi.c:1405
 #, 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:1274
+#: ../src/applet-device-wifi.c:1408
 #, 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:1294
+#: ../src/applet-device-wifi.c:1419
 #, 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:1298
+#: ../src/applet-device-wifi.c:1423
 #, 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:1317
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Nisam uspio da aktiviram vezu"
 
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Nisam uspio da dodam novu vezu"
 
-#: ../src/applet-device-wimax.c:220
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "ViMAH Mobilna širokopojasna (%s)"
-
-#: ../src/applet-device-wimax.c:222
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX Mobilna širokopojasna"
-
-#: ../src/applet-device-wimax.c:248
-msgid "WiMAX is disabled"
-msgstr "WiMAX onemogućen"
-
-#: ../src/applet-device-wimax.c:249
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX onemogućen hardverskim prekidačem"
-
-#: ../src/applet-device-wimax.c:401
-msgid "You are now connected to the WiMAX network."
-msgstr "Sada ste povezani na WiMAX mrežu."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:609
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Povezani ste na mobilnu širokopojasnu vezu „%s“: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:612
-msgid "roaming"
-msgstr "roming"
-
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Greška pri prikazivanju podataka o vezi:"
 
-#: ../src/applet-dialogs.c:75
-#: ../src/connection-editor/page-wifi-security.c:311
-#: ../src/libnma/nma-wifi-dialog.c:910 ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:436
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dinamički WEP"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:184
-#: ../src/applet-dialogs.c:186
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:182
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adrese"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:190 ../src/applet-dialogs.c:199
-#: ../src/connection-editor/page-wifi-security.c:263
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/applet-dialogs.c:216
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (osnovno)"
 
-#: ../src/applet-dialogs.c:285 ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:287 ../src/applet-dialogs.c:550
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nepoznata"
 
-#: ../src/applet-dialogs.c:300
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:302
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "nepoznat"
-
-#: ../src/applet-dialogs.c:314
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "nepoznat"
-
 #. Address
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:351
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nepoznata"
 
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:392
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "IP adresa:"
 
-#: ../src/applet-dialogs.c:352
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Adresa za emitovanje:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:364
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nepoznata"
 
-#: ../src/applet-dialogs.c:365
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Mrežna maska:"
 
-#: ../src/applet-dialogs.c:456
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Eternet (%s)"
 
-#: ../src/applet-dialogs.c:459
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:466
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:468
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:472
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:478 ../src/applet-dialogs.c:800
-#: ../src/connection-editor/page-general.c:349
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Opšte"
 
-#: ../src/applet-dialogs.c:482
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Sprega:"
 
-#: ../src/applet-dialogs.c:504
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Hardverska adresa:"
 
 #. Driver
-#: ../src/applet-dialogs.c:518
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Drajver:"
 
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Brzina:"
 
-#: ../src/applet-dialogs.c:568
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Sigurnost:"
 
-#: ../src/applet-dialogs.c:586
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:604
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:626 ../src/applet-dialogs.c:841
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:639 ../src/applet-dialogs.c:683
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Podrazumijevana ruta:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:659 ../src/applet-dialogs.c:863
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:668 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorisan"
 
-#: ../src/applet-dialogs.c:805
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN Tip:"
 
-#: ../src/applet-dialogs.c:812
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN Izlaz:"
 
-#: ../src/applet-dialogs.c:818
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN Korisnik:"
 
-#: ../src/applet-dialogs.c:824
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN Banner:"
 
-#: ../src/applet-dialogs.c:830
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Bazna konekcija:"
 
-#: ../src/applet-dialogs.c:832 ../src/libnm-gtk/nm-ui-utils.c:348
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nepoznato"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:947
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Nisu pronađene važeće aktivne veze!"
 
-#: ../src/applet-dialogs.c:975
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1108,43 +920,43 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "i mnoge druge saradnici i prevodioci iz zajednice"
 
-#: ../src/applet-dialogs.c:978
+#: ../src/applet-dialogs.c:988
 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:980
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Veb sajt MrežnogMenadžera"
 
-#: ../src/applet-dialogs.c:995
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Nedostajući resursi"
 
-#: ../src/applet-dialogs.c:1020
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Lozinka mobilne, širokopojasne mreže"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Potrebna je lozinka za povezivanje na „%s“."
 
-#: ../src/applet-dialogs.c:1044
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../src/applet-dialogs.c:1325
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Potrebno je otključati SIM PIN"
 
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1337
 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:1328
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1152,25 +964,25 @@ msgid ""
 msgstr "Mobilni širokopojasni uređaj „%s“ zahtijeva SIM PIN kod."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1330
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN kod:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Pokaži PIN kod"
 
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Potrebno je otključati SIM PUK"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1348
 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:1339
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1178,27 +990,34 @@ msgid ""
 msgstr "Mobilni širokopojasni uređaj „%s“ zahtijeva SIM PUK kod."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1341
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK kod:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Novi PIN kod:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Ponovo unesite novi PIN kod:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Prikaži PIN/PUK kodove."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1208,18 +1027,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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Obriši"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Zanemari automatski dobijene puteve"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1228,8 +1070,7 @@ msgstr ""
 "podrazumijevana."
 
 #: ../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/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
@@ -1237,15 +1078,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Napravi…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1298,48 +1139,41 @@ msgid "Bonded _connections:"
 msgstr "Vezane _veze:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
 msgstr "_Režim:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:675
-msgid "_Edit"
-msgstr "_Uredi"
-
-#. Delete
 #: ../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:691
-msgid "_Delete"
-msgstr "_Obriši"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Uredi"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Praćenja _frekvencija:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "_Ime interfejsa:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "_Link Praćenje:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP _ciljevi:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1347,19 +1181,19 @@ msgstr ""
 "IP adresu, ili listu zarezom-odvojenih IP adresa, tražiti kod provjere "
 "statusa veze."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Link _up kašnjenje:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Link _dolje kašnjenje:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Primarno:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1367,19 +1201,21 @@ 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:24
+#: ../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:7
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
 msgid "_MTU:"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:25
+#: ../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:6
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "bytes"
 msgstr "bajtova"
 
@@ -1388,7 +1224,7 @@ 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:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
@@ -1400,44 +1236,89 @@ msgstr "_Ukosnica način:"
 msgid "Bridged _connections:"
 msgstr "Premoštene _konekcije:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "_Naprijed kašnjenje:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Zdravo vrijeme:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Uključi _mrežne usluge"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Omogućiti _STP (Razgranalog Drvo Protokola)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Maksimum starost:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_Vrijeme starenja:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatska"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:166
-#: ../src/connection-editor/page-wifi.c:170
-#: ../src/connection-editor/page-wifi.c:191
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "podrazumijevano"
 
-#: ../src/connection-editor/ce-page.c:337
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adresa"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adresa"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Bilo koji uređaj"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Ažuriranje tajni veze nije uspjelo zbog nepoznate greške."
 
@@ -1536,77 +1417,77 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Prioritetna kontrola protoka"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 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:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Promet Klase:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Stroga Bandwidth:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Bandwidth prioritet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Bandwidth grupa:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "ID grupe:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 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:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1615,18 +1496,18 @@ 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 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:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 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:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 msgid "Enter the traffic class for each user priority."
 msgstr "Unesite klasu prometa za svakog korisnika prioriteta."
 
@@ -1644,7 +1525,7 @@ 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:4
+#: ../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
@@ -1653,8 +1534,8 @@ 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:95
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1667,7 +1548,7 @@ msgstr "_Lozinka:"
 #: ../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:137
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatski"
@@ -1722,18 +1603,18 @@ msgstr "_Samougovaranje"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "_MAC adresa uređaja:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Usluga:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "_Klonirana MAC adresa:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1743,6 +1624,55 @@ 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-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Podrazumijevana"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Zanemari"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Emitovanje"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "L_ozinka privatnog ključa:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
 msgstr "Automatski se povežite sa _VPN kada koristite ovu konekciju"
@@ -1780,8 +1710,8 @@ msgstr "Automatski s ručnim DNS postavkama"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:161
-#: ../src/connection-editor/page-ip6.c:186
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Ručno"
 
@@ -1792,8 +1722,8 @@ 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:179
-#: ../src/connection-editor/page-ip6.c:206
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Podijeljeno sa ostalim računarima"
 
@@ -1807,7 +1737,7 @@ msgstr "_Način:"
 msgid "Addresses"
 msgstr "Adrese"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1817,8 +1747,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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1826,25 +1756,25 @@ 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
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:299
-#: ../src/connection-editor/page-ip6.c:308
+#: ../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
 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:290
-#: ../src/connection-editor/page-ip6.c:299
+#: ../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:"
 msgstr "DNS ser_vers:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1852,11 +1782,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1864,13 +1794,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Rute…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:188
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Onemogućeno"
 
@@ -1882,7 +1812,7 @@ msgstr "Omogućeno (preferiraj javnu adresu)"
 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.h:17
 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 "
@@ -1892,15 +1822,15 @@ 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
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 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.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2006,32 +1936,55 @@ msgid "_Teamed connections:"
 msgstr "_Grupne veze:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "U_baci te Grupnu konfiguraciju iz datoteke..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Ubacite grupnu konfiguraciju iz datoteke..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Roditeljski interfejs:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Ime VLAN interfejsa:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Klonirana MAC adresa:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN _id:"
 
-#. In context, this means "concatenate the djevice nami and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Ime uređaja + broj"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + broj"
 
@@ -2048,94 +2001,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastruktura"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "_Jačina prijenosa:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Protok:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Kanal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_Opseg:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "_Režim:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Dozvoljene metode potvrde identiteta"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Proširljiv Autentifikacioni Protokol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Protokol autentifikacije lozinkom"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Izazovno Rukovanje Autentifikacioni Protokol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Majkrosoftov autentifikacioni protokol izazovnog rukovanja"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2144,135 +2101,156 @@ msgstr ""
 "autentifikacije. Ako veza ne uspije, pokušajte da isključite podršku za neke "
 "metode."
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-ethernet.c:231
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:123
-#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:131
-#: ../src/connection-editor/page-wimax.c:113
-#: ../src/libnm-gtk/nm-ui-utils.c:332 ../src/mb-menu-item.c:75
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:132
-#: ../src/connection-editor/page-dsl.c:128
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:133
-#: ../src/connection-editor/page-infiniband.c:149
-#: ../src/libnm-gtk/nm-ui-utils.c:336
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:134
-#: ../src/connection-editor/page-bond.c:444 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Bond"
 msgstr "Povez"
 
-#: ../src/connection-editor/connection-helpers.c:135
-#: ../src/connection-editor/page-team.c:241 ../src/libnm-gtk/nm-ui-utils.c:340
-#: ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Team"
 msgstr "Tim"
 
-#: ../src/connection-editor/connection-helpers.c:136
-#: ../src/connection-editor/page-bridge.c:202
-#: ../src/libnm-gtk/nm-ui-utils.c:342 ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../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
 msgid "Bridge"
 msgstr "Most"
 
-#: ../src/connection-editor/connection-helpers.c:137
-#: ../src/connection-editor/page-vlan.c:474 ../src/libnm-gtk/nm-ui-utils.c:344
-#: ../src/libnm-gtk/nm-ui-utils.c:588
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:146
-#: ../src/connection-editor/connection-helpers.c:286
-#: ../src/connection-editor/page-vpn.c:103
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:232
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../src/connection-editor/connection-helpers.c:256
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtuelno"
 
-#: ../src/connection-editor/connection-helpers.c:324
-#: ../src/connection-editor/connection-helpers.c:326
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Uvezi spašenu VPN konfiguraciju..."
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: ../src/connection-editor/connection-helpers.c:323
 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:364
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Ne mogu da napravim novu vezu"
 
-#: ../src/connection-editor/connection-helpers.c:501
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Ne mogu da obrišem vezu"
 
-#: ../src/connection-editor/connection-helpers.c:549
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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:719
-#: ../src/connection-editor/ip6-routes-dialog.c:664
-#: ../src/connection-editor/page-ip4.c:905
-#: ../src/connection-editor/page-ip6.c:900
+#: ../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
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:736
-#: ../src/connection-editor/page-ip4.c:922
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Mrežna maska"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:753
-#: ../src/connection-editor/ip6-routes-dialog.c:698
-#: ../src/connection-editor/page-ip4.c:939
-#: ../src/connection-editor/page-ip6.c:934
+#: ../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
 msgid "Gateway"
 msgstr "Mrežni izlaz"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:770
-#: ../src/connection-editor/ip6-routes-dialog.c:715
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrički"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:681
-#: ../src/connection-editor/page-ip6.c:917
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:104
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Uređujem %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Uređujem neimenovanu vezu"
 
-#: ../src/connection-editor/nm-connection-editor.c:268
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Ime _veze:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Greška u pokretanju uređivača"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Nije uspjelo dodavanje veze"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2280,57 +2258,61 @@ msgstr ""
 "Uređivač veza nije mogao da pronađe neke potrebne resurse (.ui datoteka nije "
 "pronađena)."
 
-#: ../src/connection-editor/nm-connection-editor.c:397
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Snimi"
 
-#: ../src/connection-editor/nm-connection-editor.c:398
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Sačuvaj sve promjene u ovoj vezi."
 
-#: ../src/connection-editor/nm-connection-editor.c:399
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:415
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Ne mogu stvoriti konekciju"
 
-#: ../src/connection-editor/nm-connection-editor.c:415
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Ne mogu da uredim vezu"
 
-#: ../src/connection-editor/nm-connection-editor.c:417
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Nepoznata greška kreiranja prozora za uređivanje."
 
-#: ../src/connection-editor/nm-connection-editor.c:551
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Greška u pokretanju uređivača"
 
-#: ../src/connection-editor/nm-connection-editor.c:894
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Nije uspjelo dodavanje veze"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: ../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
 msgid "Connection _name:"
 msgstr "Ime _veze:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Izvoz..."
 
-#: ../src/connection-editor/nm-connection-list.c:130
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nikad"
 
-#: ../src/connection-editor/nm-connection-list.c:141
-#: ../src/connection-editor/nm-connection-list.c:152
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "sad"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:159
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2338,7 +2320,7 @@ msgstr[0] "prije %d minut"
 msgstr[1] "prije %d minuta"
 msgstr[2] "prije %d minuta"
 
-#: ../src/connection-editor/nm-connection-list.c:163
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2346,7 +2328,7 @@ msgstr[0] "prije %d sat"
 msgstr[1] "prije %d sata"
 msgstr[2] "prije %d sati"
 
-#: ../src/connection-editor/nm-connection-list.c:175
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2354,7 +2336,7 @@ msgstr[0] "prije %d dan"
 msgstr[1] "prije %d dana"
 msgstr[2] "prije %d dana"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2362,7 +2344,7 @@ msgstr[0] "prije %d mjesec"
 msgstr[1] "prije %d mjeseca"
 msgstr[2] "prije %d mjeseci"
 
-#: ../src/connection-editor/nm-connection-list.c:185
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2370,147 +2352,196 @@ msgstr[0] "prije %d godine"
 msgstr[1] "prije %d godine"
 msgstr[2] "prije %d godina"
 
-#: ../src/connection-editor/nm-connection-list.c:619
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Naziv"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Posljednje korišteno"
 
-#: ../src/connection-editor/nm-connection-list.c:676
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Uređuje podatke za izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:677
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentifikujte se da biste izmijenili izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:692
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Briše izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:693
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentifikujte se da biste obrisali izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:924
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Nema VPN dodataka instaliranih."
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:928
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Greška pri stvaranju veze"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Greška prilikom uređivanja veze"
 
-#: ../src/connection-editor/nm-connection-list.c:951
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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:110
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x Sigurnost"
 
-#: ../src/connection-editor/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:111
 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:126
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Koristi 802.1_X bezbjednost za ovu vezu"
 
-#: ../src/connection-editor/page-bluetooth.c:107
-#: ../src/libnm-gtk/nm-ui-utils.c:328
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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:109
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Nije moguće učitati Bluetooth korisnički interfejs."
 
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Vezana konekcija %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Ethernet mreža"
+
+#         translations.
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Bežična Wi-Fi mreža"
+
 #: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Ne mogu učitati traku korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-bond.c:612
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Primarno:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Vezana konekcija %d"
 
-#: ../src/connection-editor/page-bridge.c:205
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Ne mogu učitati most korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-bridge.c:299
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Most veza %d"
 
 #. Translators: a "Bridge Port" is a network
-#. * djevice that is part of a bridge.
+#. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:109
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Most Port"
 
-#: ../src/connection-editor/page-bridge-port.c:111
+#: ../src/connection-editor/page-bridge-port.c:110
 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:598
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:600
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Nije moguće učitati DCB korisnički interfejs."
 
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/page-dsl.c:129
 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:215
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL veza „%d“"
 
 #: ../src/connection-editor/page-ethernet.c:74
-#: ../src/connection-editor/page-infiniband.c:60
-#: ../src/connection-editor/page-wifi.c:89
-#: ../src/connection-editor/page-wimax.c:54
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "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:233
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Ne mogu učitati ethernet korisnički ulazni uređaj."
 
-#: ../src/connection-editor/page-ethernet.c:371
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Klonirana MAC adresa:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:55
-#: ../src/libnma/nma-mobile-providers.c:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Podrazumijevana"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2520,45 +2551,57 @@ 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD se ne izvršava."
 
-#: ../src/connection-editor/page-general.c:352
+#: ../src/connection-editor/page-general.c:350
 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:152
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 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:247
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand konekcija %d"
 
 #: ../src/connection-editor/page-ip4.c:125
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatski (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatski (VPN) samo adrese"
 
 #: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:138
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automatski, samo adrese"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatski (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:135
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatski (PPPoE) samo adrese"
 
@@ -2570,66 +2613,106 @@ msgstr "Automatski (DHCP)"
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatski (DHCP) samo adrese"
 
-#: ../src/connection-editor/page-ip4.c:173
-#: ../src/connection-editor/page-ip6.c:199
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Samo veži-lokalno"
 
-#: ../src/connection-editor/page-ip4.c:288
-#: ../src/connection-editor/page-ip6.c:297
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Dodatni DNS ser_vers:"
 
-#: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:306
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Dodatni domeni _pretrage:"
 
-#: ../src/connection-editor/page-ip4.c:837
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Uređujem IPv4 rute za %s"
 
-#: ../src/connection-editor/page-ip4.c:987
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 podešavanja"
 
-#: ../src/connection-editor/page-ip4.c:989
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Ne mogu da učitam IPv4 korisničko sučelje."
 
-#: ../src/connection-editor/page-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Zanemari"
 
-#: ../src/connection-editor/page-ip6.c:174
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatski, samo DHCP"
 
-#: ../src/connection-editor/page-ip6.c:832
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Uređujem IPv6 rute za %s"
 
-#: ../src/connection-editor/page-ip6.c:981
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 podešavanja"
 
-#: ../src/connection-editor/page-ip6.c:983
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Ne mogu da učitam IPv6 korisničko sučelje."
 
-#: ../src/connection-editor/page-master.c:246
-#: ../src/connection-editor/page-master.c:257
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Dupli robovi"
 
-#: ../src/connection-editor/page-master.c:247
+#: ../src/connection-editor/page-master.c:249
 #, 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:258
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2638,25 +2721,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:375
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:311
+#: ../src/connection-editor/page-mobile.c:310
 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:328
+#: ../src/connection-editor/page-mobile.c:327
 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:547
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Izaberite vrstu mobilnog širokopojasnog dobavljača"
 
-#: ../src/connection-editor/page-mobile.c:574
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2664,132 +2747,141 @@ msgstr ""
 "Izaberite tehnologiju koju koristi vaš dobavljač mobilnih širokopojasnih "
 "usluga.  Ukoliko niste sigurni, pitajte vašeg dobavljača."
 
-#: ../src/connection-editor/page-mobile.c:579
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Moj dobavljač koristi _GSM tehnologije (npr. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:586
+#: ../src/connection-editor/page-mobile.c:568
 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:596 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:276
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:599 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:274
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:252
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:297
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:278
-#: ../src/wireless-security/eap-method-peap.c:266
-#: ../src/wireless-security/eap-method-ttls.c:282
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:267
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ništa"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../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:281
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP podešavanja"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Ne mogu da učitam PPP korisničko sučelje."
 
-#: ../src/connection-editor/page-team.c:91
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:232
+#: ../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 "Izaberite datoteku za uvoz"
 
-#: ../src/connection-editor/page-team.c:111
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Greška: datoteka ne sadržava ispravnu JSON konfiguraciju"
 
-#: ../src/connection-editor/page-team.c:244
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Ne mogu učitati grupni korisnički interfejs."
 
-#: ../src/connection-editor/page-team.c:338
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Tim konekcija %d"
 
 #. Translators: a "Team Port" is a network
-#. * djevice that is part of a team.
+#. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:152
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Tim port"
 
-#: ../src/connection-editor/page-team-port.c:154
+#: ../src/connection-editor/page-team-port.c:153
 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 djevice nami (eg, "em1"), the
-#. * second is a connection nami (eg, "Auto Ethernet").
+#. 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:319
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (via \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:476
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Nema mrežnih veza"
+
+#: ../src/connection-editor/page-vlan.c:596
 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:670
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN konekcija %d"
 
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Nije moguće učitati VPN-korisnički interfejs."
 
-#: ../src/connection-editor/page-vpn.c:120
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Ne mogu da nađem uslugu VPN dodatka za „%s“."
 
-#: ../src/connection-editor/page-vpn.c:207
-#: ../src/connection-editor/page-vpn.c:302
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN veza %d"
 
-#: ../src/connection-editor/page-vpn.c:231
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2799,11 +2891,11 @@ msgstr ""
 "\n"
 "Greška: nema vrste VPN servisa."
 
-#: ../src/connection-editor/page-vpn.c:256
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Izaberi vrstu VPN konekcije"
 
-#: ../src/connection-editor/page-vpn.c:257
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2813,7 +2905,7 @@ msgstr ""
 "koju želite da kreirate ne pojavljuje na listi, možda nemate ispravan VPN "
 "dodatak instaliran."
 
-#: ../src/connection-editor/page-wifi.c:79
+#: ../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"
@@ -2821,7 +2913,17 @@ 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:195
+#: ../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)\""
+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
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
@@ -2830,64 +2932,74 @@ msgstr "%u (%u MHz)"
 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:613
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Bilo koji uređaj"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi konekcija %d"
 
-#: ../src/connection-editor/page-wifi-security.c:288
-#: ../src/libnma/nma-wifi-dialog.c:884 ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:298
-#: ../src/libnma/nma-wifi-dialog.c:893 ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:324
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Dinamički WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:338
-#: ../src/libnma/nma-wifi-dialog.c:937 ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Lični WPA & WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:352
-#: ../src/libnma/nma-wifi-dialog.c:951 ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Poslovni WPA & WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:392
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi Sigurnost"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 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-wimax.c:116
-msgid "Could not load WiMAX user interface."
-msgstr "Nije moguće učitati WiMAX korisnički ulazni uređaj."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:210
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX konekcija %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:205
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Ne mogu da uvezem VPN vezu"
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2900,25 +3012,30 @@ msgstr ""
 "\n"
 "Greška: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:282
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Nepoznata greška"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Već postoji datoteka „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:284
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Zameni"
 
-#: ../src/connection-editor/vpn-helpers.c:286
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:322
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Ne mogu da izvezem VPN vezu"
 
-#: ../src/connection-editor/vpn-helpers.c:324
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2929,11 +3046,11 @@ msgstr ""
 "\n"
 "Greška: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:359
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Izvezi VPN vezu..."
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -2941,11 +3058,11 @@ msgstr ""
 "NetvorkManager Aplet ne može da pronađe neke potrebne resurse (.ui datoteka "
 "nije pronađena)."
 
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Otključaj"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Automatski otključaj ovaj uređaj"
 
@@ -2953,36 +3070,36 @@ msgstr "Automatski otključaj ovaj uređaj"
 msgid "Connection Information"
 msgstr "Podaci o vezi"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Aktivne mrežne veze"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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:"
 
-#. Djevice
-#: ../src/libnma/nma-mobile-wizard.c:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#. 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:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../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:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -2996,28 +3113,28 @@ msgstr ""
 "vaša podešavanja mobilne širokopojasne veze, izaberite \"Mrežne veze\" iz "
 "menija Sistem >> Podešavanja."
 
-#: ../src/libnma/nma-mobile-wizard.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nije na listi"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../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:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3031,83 +3148,83 @@ msgstr ""
 "Ako niste sigurni o vašem planu obratite se vašem provajderu za APN vašeg "
 "plana."
 
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../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:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provajder"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 pronađem provajdera i želim da ga unesem _ručno:"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../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:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../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:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../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:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Izaberi zemlju ili regiju pružaoca usluga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Instaliran GSM uređaj"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Instaliran CDMS uređaj"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3115,107 +3232,144 @@ 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:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Ime vašeg provajdera širokopojasnih usluga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(u nekim slučajevima) APN (Ime Tačke Pristupa) vašeg plana obračunavanja "
 "širokopojasnih usluga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Napravi vezu za _ovaj mobilni, širokopojasni uređaj:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nova mobilna, širokopojasna veza"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: ../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
+#, 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
+#, 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
+#, 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.c:236
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary 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-wifi-dialog.c:433 ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nova..."
 
-#: ../src/libnma/nma-wifi-dialog.c:867 ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nikakva"
 
-#: ../src/libnma/nma-wifi-dialog.c:1035 ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1119 ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, 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:1121 ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Potrebna Autentikacija Wi-Fi mreže"
 
-#: ../src/libnma/nma-wifi-dialog.c:1123 ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentifikacija potrebna od Wi-Fi mreže"
 
-#: ../src/libnma/nma-wifi-dialog.c:1128 ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Kreirajte Novu Wi-Fi Mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1130 ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nova Wi-Fi mreža"
 
-#: ../src/libnma/nma-wifi-dialog.c:1131 ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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:1133 ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Konektujte se na Skrivenu Wi-Fi Mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1135 ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Skrivena Wi-Fi mreža"
 
-#: ../src/libnma/nma-wifi-dialog.c:1136 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3234,43 +3388,43 @@ msgstr "K_onekcija:"
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi _punjač:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:374
+#: ../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:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mreža"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:411
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
-#. Translators: the first %s is a bus nami (eg, "USB") or
-#. * product nami, the second is a djevice type (eg,
-#. * "Ethernet"). You can change this to something liki
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:487 ../src/libnm-gtk/nm-ui-utils.c:507
-#, c-format
-msgctxt "long djevice nami"
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Upotreba:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3278,7 +3432,7 @@ msgstr ""
 "Ovaj program je komponenta NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3286,139 +3440,152 @@ msgstr ""
 "Ovaj program nije namijenjen za rad u komandnoj liniji, već je dio Gnom "
 "radnog okruženja."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:77
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:131
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nije omogućeno"
 
-#: ../src/mb-menu-item.c:137
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nije registrovan"
 
-#: ../src/mb-menu-item.c:155
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Kućna mreža (%s)"
 
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Kućna mreža"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "pretražujem"
 
-#: ../src/mb-menu-item.c:168
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registracija je odbijena"
 
-#: ../src/mb-menu-item.c:173 ../src/mb-menu-item.c:179
+#: ../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:175 ../src/mb-menu-item.c:181
+#: ../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:184
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Mreža u romingu (%s)"
 
-#: ../src/mb-menu-item.c:186
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Mreža u romingu"
 
-#: ../src/mobile-helpers.c:324
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN kod za SIM karicu '%s' na '%s'"
 
-#: ../src/mobile-helpers.c:457
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Potreban je PIN kod"
 
-#: ../src/mobile-helpers.c:465
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Potreban je PIN kod za povezivanje mobilnog, širokopojasnog uređaja"
 
-#. The %s is a mobile provider nami, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/mobile-helpers.c:619
+#, 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:622
+msgid "roaming"
+msgstr "roming"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s veza"
 
-#: ../src/utils/utils.c:386
-msgid "Store the password only for this _user"
-msgstr "Sačuvaj lozinku samo za ovog _korisnika"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:388
-msgid "Store the password for _all users"
-msgstr "Čuvaj lozinku za _sve korisnike"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:458
+#: ../src/wireless-security/eap-method.c:452
 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:461
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ili PEM sertifikati (*.der, *.pijem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:263
-#: ../src/wireless-security/eap-method-peap.c:296
-#: ../src/wireless-security/eap-method-ttls.c:327
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:401
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Izaberi PAC datoteku..."
 
-#: ../src/wireless-security/eap-method-fast.c:408
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC datoteke (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Sve datoteke"
 
@@ -3454,15 +3621,32 @@ msgstr "_Unutrašnja prijava:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Dozvoli samostalno PAC _rezervisanje"
 
-#: ../src/wireless-security/eap-method-peap.c:281
-#: ../src/wireless-security/eap-method-ttls.c:312
-#: ../src/wireless-security/wireless-security.c:412
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:375
-#: ../src/wireless-security/eap-method-tls.c:458
-#: ../src/wireless-security/eap-method-ttls.c:406
+#: ../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 "Izaberite sertifikat Potvrđivanja Autoriteta (CA)..."
 
@@ -3490,15 +3674,46 @@ msgstr "Nema _tražene CA potvrde"
 msgid "PEAP _version:"
 msgstr "PEAP _verzija:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Uvijek mi zatraži _lozinku"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:273
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "CA _potvrda:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Nešifrovani privatni ključevi nisu sigurni"
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../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 "
@@ -3512,11 +3727,11 @@ msgstr ""
 "\n"
 "(Možete zaštititi privatne ključeve koristeći openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:452
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Izaberite vaš lični sertifikat..."
 
-#: ../src/wireless-security/eap-method-tls.c:464
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Izaberite vaš lični ključ..."
 
@@ -3536,23 +3751,36 @@ msgstr "Privatni _ključ:"
 msgid "_Private key password:"
 msgstr "L_ozinka privatnog ključa:"
 
-#: ../src/wireless-security/wireless-security.c:424
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:448
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:459
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "BRZO"
 
-#: ../src/wireless-security/wireless-security.c:470
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunelski TLS"
 
-#: ../src/wireless-security/wireless-security.c:481
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Zaštićeni EAP (PEAP)"
 
@@ -3562,6 +3790,44 @@ msgstr "Zaštićeni EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Po_tvrđivanje identiteta:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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)"
@@ -3586,6 +3852,172 @@ msgstr "P_rikaži ključ"
 msgid "WEP inde_x:"
 msgstr "WEP i_ndeks:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Tip:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Omogući WiMA_X Mobilnu širokopojasnu mrežu"
+
+#~ msgid "_Help"
+#~ msgstr "_Pomoć"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Sada ste konektovani na uvezanu mrežu."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Pripremanje veze '%s'..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Konfigurisanje veze '%s' ..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Potrebna ovjera korisnika za povezivanje '%s'..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Zahtijeva adresu za '%s'..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Veza '%s' aktivna"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Sada ste konektovani na mostnu mrežu."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "U toku priprema mostne veze '%s'..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Konfigurisanje mostne veze '%s'..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Potrebna ovjera korisnika za mostnu vezu '%s'..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Mostna veza '%s' aktivna"
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "Auto InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand Mreže (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand Mreža (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand Mreže"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand Mreža"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Konektovani ste na InfiniBand mrežu."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "U toku priprema InfiniBand veze '%s'..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Konfigurisanje InfiniBand veze '%s'..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "Potrebna ovjera korisnika za InfiniBand vezu '%s'..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand veza '%s' aktivna"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Konektovani ste na udruženu mrežu."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "U toku priprema grupne veze '%s'..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Konfigurisanje grupne veze '%s'..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Potrebna ovjera korisnika za grupno povezivanje '%s'..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Grupna veza '%s' aktivna"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Konektovani ste na VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "U toku pripreme VLAN veze '%s'..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Konfigurisanje VLAN veze '%s'..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Potrebna ovjera korisnika za VLAN povezivanje '%s'..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN veza '%s' aktivna"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "ViMAH Mobilna širokopojasna (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX Mobilna širokopojasna"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX onemogućen"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX onemogućen hardverskim prekidačem"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Sada ste povezani na WiMAX mrežu."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "nepoznat"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "nepoznat"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Režim:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_MAC adresa uređaja:"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "U_baci te Grupnu konfiguraciju iz datoteke..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastruktura"
+
+#~ 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 e59abe30..6cf6bd75 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-20 09:41+0100\n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2016-03-20 07:35+0100\n"
 "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.esu>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -24,7 +24,7 @@ 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:3106
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Xarxa"
 
@@ -389,144 +389,144 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1281
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "el dispositiu no està preparat (manca el microprogramari)"
 
-#: ../src/applet.c:1283
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "el dispositiu no està preparat"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1293 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconnectat"
 
-#: ../src/applet.c:1309
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Desconnecta"
 
-#: ../src/applet.c:1323
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "no es gestiona el dispositiu"
 
-#: ../src/applet.c:1396
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "No hi ha cap dispositiu de xarxa disponible"
 
-#: ../src/applet.c:1450
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1504
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Configura la VPN..."
 
-#: ../src/applet.c:1509
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Desconnecta la VPN"
 
-#: ../src/applet.c:1616
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "No s'està executant el NetworkManager..."
 
-#: ../src/applet.c:1621 ../src/applet.c:2613
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "S'ha inhabilitat la gestió de xarxes"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1831
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Habilita la gestió de _xarxes"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1840
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Habilita el _sense fil"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1849
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Habilita la banda ampla _mòbil"
 
 #. Toggle notifications item
-#: ../src/applet.c:1861
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Habilita les n_otificacions"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1873
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Informació de la connexió"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1881
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Edita les connexions..."
 
-#: ../src/applet.c:1895
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../src/applet.c:2180
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Esteu connectat a «%s»."
 
-#: ../src/applet.c:2223
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: ../src/applet.c:2224
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "S'ha desconnectat la connexió de xarxa."
 
-#: ../src/applet.c:2475
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "S'està preparant la connexió de xarxa «%s»..."
 
-#: ../src/applet.c:2478
+#: ../src/applet.c:2477
 #, 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:2481 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, 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:2484
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "La connexió de xarxa «%s» és activa"
 
-#: ../src/applet.c:2558
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "S'està iniciant la connexió VPN «%s»..."
 
-#: ../src/applet.c:2561
+#: ../src/applet.c:2560
 #, 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:2564
+#: ../src/applet.c:2563
 #, 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:2567
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "La connexió VPN «%s» és activa"
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "No hi ha cap connexió de xarxa"
 
-#: ../src/applet.c:3205
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Miniaplicació NetworkManager"
 
@@ -762,8 +762,7 @@ msgstr "No s'ha pogut afegir una connexió nova"
 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:332
+#: ../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
 msgid "LEAP"
@@ -1091,8 +1090,7 @@ msgstr ""
 "predeterminada."
 
 #: ../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/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
@@ -1656,34 +1654,39 @@ msgid "De_fault"
 msgstr "Per de_fecte"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignora"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unidifusió"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_tidifusió"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Difusió"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "Mà_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "_Reactiva'l per contrasenya de LAN:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -2120,7 +2123,7 @@ msgstr ""
 "inhabilitar-ne alguns."
 
 #: ../src/connection-editor/connection-helpers.c:97
-#: ../src/connection-editor/page-ethernet.c:315
+#: ../src/connection-editor/page-ethernet.c:326
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Cable"
@@ -2521,26 +2524,26 @@ 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:317
+#: ../src/connection-editor/page-ethernet.c:328
 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:444
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Dispositiu Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:448
+#: ../src/connection-editor/page-ethernet.c:461
 #: ../src/connection-editor/page-vlan.c:741
 #: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "MAC clonada"
 
-#: ../src/connection-editor/page-ethernet.c:452
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Contrasenya d'activació per LAN"
 
-#: ../src/connection-editor/page-ethernet.c:487
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Connexió de xarxa amb fil %d"
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 8c7df288..0959a68e 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-15 22:00+0200\n"
+"POT-Creation-Date: 2016-04-05 14:02+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,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Xarxa"
 
@@ -134,46 +134,91 @@ msgstr ""
 "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats "
 "de CA en la segona fase de l'autenticació EAP."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Miniaplicació NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Miniaplicació NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticació 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+#, fuzzy
+msgid "C_onnect"
+msgstr "Connectat"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "Nom de _xarxa:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Ha fallat l'addició/activació de la connexió"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Ha fallat la connexió"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Ha fallat la desconnexió del dispositiu"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Ha fallat la desconnexió"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Ha fallat l'activació de la connexió"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "No tornes a mostrar este missatge"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -184,7 +229,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè s'ha interromput la "
 "connexió de xarxa."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +239,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè el servei VPN s'ha parat "
 "de manera inesperada."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -205,7 +250,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:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -215,7 +260,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:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -225,7 +270,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:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -235,7 +280,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè no s'ha pogut iniciar el "
 "servei VPN."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -245,7 +290,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè no s'ha trobat cap secret "
 "VPN vàlid."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -255,7 +300,7 @@ msgstr ""
 "No s'ha pogut establir la connexió VPN «%s» perquè els secrets VPN no són "
 "vàlids."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -264,7 +309,7 @@ msgstr ""
 "\n"
 "No s'ha pogut establir la connexió VPN «%s»."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -275,7 +320,7 @@ msgstr ""
 "S'ha desconnectat la connexió VPN «%s» perquè s'ha interromput la connexió "
 "de xarxa."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +329,7 @@ msgstr ""
 "\n"
 "S'ha desconnectat la connexió VPN «%s» perquè s'ha parat el servei VPN."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -293,7 +338,7 @@ msgstr ""
 "\n"
 "S'ha desconnectat la connexió VPN «%s»."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -304,19 +349,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "S'ha establit correctament la connexió VPN.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Missatge d'entrada de la VPN"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "No s'ha pogut establir la connexió VPN"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -330,7 +375,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -343,801 +388,547 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "el dispositiu no està preparat (manca el microprogramari)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "el dispositiu no està preparat"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconnectat"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Desconnecta"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "no es gestiona el dispositiu"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "No hi ha cap dispositiu de xarxa disponible"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Configura la VPN..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Desconnecta la VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "No s'està executant el NetworkManager..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "S'ha inhabilitat la gestió de xarxes"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Habilita la gestió de _xarxes"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Habilita el _sense fil"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Habilita la banda ampla _mòbil"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Habilita la banda ampla mòbil WiMA_X"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Habilita les n_otificacions"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Informació de la connexió"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Edita les connexions..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "A_juda"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Esteu connectat a «%s»."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "S'ha desconnectat la connexió de xarxa."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "S'està preparant la connexió de xarxa «%s»..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, 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:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, 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:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "La connexió de xarxa «%s» és activa"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "S'està iniciant la connexió VPN «%s»..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, 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:2908
+#: ../src/applet.c:2563
 #, 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:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "La connexió VPN «%s» és activa"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "No hi ha cap connexió de xarxa"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Miniaplicació NetworkManager"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Disponible"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "S'ha establit la connexió"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Esteu connectat a la xarxa vinculada."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "S'està preparant la connexió vinculada «%s»..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "S'està configurant la connexió vinculada «%s»..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Cal l'autenticació d'usuari per a la connexió vinculada «%s»..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "S'està sol·licitant una adreça per a «%s»..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "La connexió vinculada «%s» és activa"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Esteu connectat a la xarxa puntejada."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "S'està preparant la connexió puntejada «%s»..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "S'està configurant la connexió puntejada «%s»..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Cal l'autenticació d'usuari per a la connexió puntejada «%s»..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "La connexió puntejada «%s» és activa"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 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:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "S'està enviant el codi de desbloqueig..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda ampla mòbil (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Banda ampla mòbil"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Disponible"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Connexió de banda ampla mòbil nova..."
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "S'ha establit la connexió"
+
+#: ../src/applet-device-broadband.c:816
 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:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Xarxa de banda ampla mòbil."
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Esteu registrat a la xarxa local."
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Esteu registrat a una xarxa d'accés itinerant."
 
-#: ../src/applet-device-bt.c:103
+#: ../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:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, 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:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, 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:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "La connexió de banda ampla mòbil «%s» és activa"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Connexió de banda ampla mòbil (CDMA) nova..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Esteu connectat a la xarxa CDMA."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "Xarxa CDMA."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automàtic"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Xarxes amb fil (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Xarxa amb fil (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Xarxes amb fil"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Xarxa amb fil"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../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:171
+#: ../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:174
+#: ../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:177
+#: ../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:180
+#: ../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:184
+#: ../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:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticació DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Connexió de banda ampla mòbil (GSM) nova..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Esteu connectat a la xarxa GSM."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "Xarxa GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "InfiniBand automàtic"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "Xarxes InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Xarxa InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "Xarxes InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "Xarxa InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Esteu connectat a la xarxa InfiniBand."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "S'està preparant la connexió InfiniBand «%s»..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "S'està configurant la connexió InfiniBand «%s»..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Cal l'autenticació d'usuari per a la connexió InfiniBand «%s»..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "La connexió InfiniBand «%s» és activa"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Esteu connectat a la xarxa en equip."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "S'està preparant la connexió en equip «%s»..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "S'està configurant la connexió en equip «%s»..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Cal l'autenticació d'usuari per a la connexió en equip «%s»..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "La connexió en equip «%s» és activa"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Esteu connectat a la VLAN."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "S'està preparant la connexió VLAN «%s»..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "S'està configurant la connexió VLAN «%s»..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Cal l'autenticació d'usuari per a la connexió VLAN «%s»..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "La connexió VLAN «%s» és activa"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Connecta a una xarxa sense fil oculta..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Crea una xarxa sense fil _nova..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(cap)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Xarxes sense fil (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Xarxa sense fil (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Xarxa sense fil"
 msgstr[1] "Xarxes sense fil"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Les xarxes sense fil estan inhabilitades"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "L'interruptor de maquinari ha inhabilitat la xarxa sense fil"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Més xarxes"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Hi ha xarxes sense fil disponibles"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 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:1242
+#: ../src/applet-device-wifi.c:1364
 #, 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:1273
+#: ../src/applet-device-wifi.c:1399
 #, 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:1276
+#: ../src/applet-device-wifi.c:1402
 #, 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:1279
+#: ../src/applet-device-wifi.c:1405
 #, 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:1282
+#: ../src/applet-device-wifi.c:1408
 #, 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:1303
+#: ../src/applet-device-wifi.c:1419
 #, 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:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "La connexió de xarxa sense fil «%s» és activa"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Ha fallat l'activació de la connexió"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "No s'ha pogut afegir una connexió nova"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Banda ampla mòbil WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "Banda ampla mòbil WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "La xarxa WiMAX està inhabilitada"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "L'interruptor de maquinari ha inhabilitat la xarxa WiMAX"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Esteu connectat a la xarxa WiMAX."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, 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/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "itinerància"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "S'ha produït un error en mostrar la informació de la connexió:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP dinàmic"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adreces"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Cap"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (predeterminat)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "desconeguda"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "desconegut"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "Adreça IP:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Adreça IP:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Adreça de difusió:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Màscara de subxarxa:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Ruta predeterminada:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Màscara de subxarxa:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "Wi-Fi 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "General"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interfície:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Adreça del maquinari:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Controlador:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Velocitat:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Seguretat:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Ruta predeterminada:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorada"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Tipus de VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Passarel·la VPN:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Nom d'usuari de la VPN:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Bàner de la VPN:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Connexió base:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconeguda"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "No s'ha trobat cap connexió activa vàlida"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1145,44 +936,44 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "i molts col·laboradors i traductors voluntaris"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 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:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Lloc web del NetworkManager"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Recursos que manquen"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Contrasenya de la xarxa de banda ampla mòbil"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, 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:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Cal el codi PIN de desbloqueig de la SIM"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 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:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1192,25 +983,25 @@ msgstr ""
 "mòbil «%s»."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Codi PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Mostra el codi PIN"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Cal el codi PUK de desbloqueig de la SIM"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 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:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1220,27 +1011,34 @@ msgstr ""
 "mòbil «%s»."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Codi PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Codi PIN nou:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 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:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Mostra els codis PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1250,18 +1048,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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Suprimeix"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_nora les rutes obtingudes automàticament"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1269,9 +1090,8 @@ msgstr ""
 "Si s'habilita, esta connexió no s'utilitzarà mai com a connexió de xarxa "
 "predeterminada."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1279,15 +1099,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Crea..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1340,48 +1160,41 @@ msgid "Bonded _connections:"
 msgstr "_Connexions vinculades:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "M_ode:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "_Edita"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "_Suprimeix"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Edita"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "_Freqüència de seguiment:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "Nom de la _interfície:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "Seguiment de l'_enllaç:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "_Objectius ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1389,19 +1202,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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Retard de la _connexió:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Retard de la _desconnexió:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Primària:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1409,12 +1222,30 @@ 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "bytes"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 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:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Prioritat:"
 
@@ -1426,44 +1257,89 @@ msgstr "Mode de _hairpin:"
 msgid "Bridged _connections:"
 msgstr "Connexions _puntejades:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "Retard de _retransmissió:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "Temps de «_Hello»:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Habilita la gestió de _xarxes"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Habilita l'STP (protocol d'arbre d'abast)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "Edat _màxima:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "Temps d'_envelliment:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automàtic"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "predeterminat"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adreça"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adreça"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Qualsevol dispositiu"
+
+#: ../src/connection-editor/ce-page.c:591
 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 "
@@ -1564,78 +1440,78 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Control de prioritat de flux"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 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:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Prioritat:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Classe de trànsit:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Amplada de banda estricta:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Amplada de banda prioritària:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Amplada de banda del grup:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "Identificador de grup:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 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:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1644,25 +1520,25 @@ 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 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:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 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:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1675,7 +1551,7 @@ 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:4
+#: ../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
@@ -1683,8 +1559,9 @@ 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:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1696,8 +1573,8 @@ msgstr "_Contrasenya:"
 #: ../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:138
-#: ../src/connection-editor/page-ip6.c:146
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automàtic"
@@ -1753,18 +1630,18 @@ msgstr "Negociació aut_omàtica"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "Adreça _MAC del dispositiu:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Servei:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "Adreça _MAC falsejada:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1774,19 +1651,54 @@ 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-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "bytes"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Per defecte"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignora"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Difusió"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Contrasenya de la clau _privada:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1825,8 +1737,8 @@ msgstr "Automàtic amb paràmetres manuals per al DNS"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:195
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manual"
 
@@ -1838,8 +1750,8 @@ 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:215
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Compartit a altres ordinadors"
 
@@ -1853,7 +1765,7 @@ msgstr "_Mètode:"
 msgid "Addresses"
 msgstr "Adreces"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1863,8 +1775,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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1872,25 +1784,25 @@ 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.h:13
 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/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:317
+#: ../src/connection-editor/page-ip6.c:306
 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/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:308
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Servidors _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1899,11 +1811,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1911,13 +1823,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Rutes..."
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Inhabilitada"
 
@@ -1929,7 +1841,7 @@ msgstr "Habilitat (prefereix una adreça pública)"
 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.h:17
 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 "
@@ -1940,15 +1852,15 @@ 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
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 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.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1957,71 +1869,38 @@ msgstr ""
 "que la configuració IPv6 falle."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Qualsevol"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Prefereix 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Prefereix 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Prefereix 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Utilitza només 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Bàsic"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Nú_mero:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Avançat"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "Identificador de xar_xa:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Tipus:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Canvia..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "Mo_stra les contrasenyes"
 
@@ -2088,32 +1967,55 @@ msgid "_Teamed connections:"
 msgstr "Connexions en _equip:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "I_mporta una configuració en equip des d'un fiter..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Importa una configuració en equip des d'un fitxer..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "Interfície _pare:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Nom de la interfície VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "Adreça _MAC falsejada:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "_Identificador de la VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Nom del dispositiu + número"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "«vlan» + número"
 
@@ -2130,96 +2032,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
+msgid "Client"
 msgstr ""
-"Infraestructura\n"
-"Ad hoc"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 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.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Velocitat:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Canal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ban_da:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "M_ode:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Mètodes d'autenticació admesos"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Protocol d'autenticació extensible"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Protocol d'autenticació per contrasenya"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protocol d'autenticació per desafiament mutu"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Protocol d'autenticació per desafiament mutu de Microsoft"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2228,78 +2132,78 @@ msgstr ""
 "mètodes d'autenticació. En cas que fallen les connexions, intenteu "
 "inhabilitar-ne alguns."
 
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Cable"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Sense fil"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Vinculada"
 
-#: ../src/connection-editor/connection-helpers.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Equip"
 
-#: ../src/connection-editor/connection-helpers.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../src/connection-editor/connection-helpers.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:169
-#: ../src/connection-editor/connection-helpers.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Maquinari"
 
-#: ../src/connection-editor/connection-helpers.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/connection-helpers.c:347
-#: ../src/connection-editor/connection-helpers.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Importa una configuració VPN..."
 
-#: ../src/connection-editor/connection-helpers.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2307,58 +2211,79 @@ 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:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "No s'ha pogut crear la connexió nova"
 
-#: ../src/connection-editor/connection-helpers.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "No s'ha pogut suprimir la connexió"
 
-#: ../src/connection-editor/connection-helpers.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:920
+#: ../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
 msgid "Address"
 msgstr "Adreça"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Màscara de xarxa"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:954
+#: ../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
 msgid "Gateway"
 msgstr "Passarel·la"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Mètrica"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:937
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "S'està editant %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "S'està editant la connexió sense nom"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Nom de la connexió:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "S'ha produït un error en inicialitzar l'editor"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "No s'ha pogut afegir la connexió"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2366,178 +2291,216 @@ 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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "Al_ça"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Guarda els canvis fets a la connexió."
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "No s'ha pogut crear la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "No s'ha pogut editar la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 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:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "S'ha produït un error en inicialitzar l'editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:899
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "No s'ha pogut afegir la connexió"
 
-#: ../src/connection-editor/nm-connection-editor.c:939
-msgid "Error saving connection"
-msgstr "S'ha produït un error en guardar la connexió"
-
-#: ../src/connection-editor/nm-connection-editor.c:940
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "La propietat «%s» / «%s» no és vàlida: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "_Nom de la connexió:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "E_xporta..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "mai"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "ara"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Utilitzada per última vegada"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Edita la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentiqueu-vos per editar la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Suprimeix la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentiqueu-vos per suprimir la connexió seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "No hi ha cap connector VPN instal·lat."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "S'ha produït un error en crear la connexió"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "S'ha produït un error en editar la connexió"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Seguretat 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 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:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Utilitza la seguretat 802.1_X per a esta connexió"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, 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
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Connexió vinculada %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Xarxa amb fil"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Xarxa sense fil"
+
+#: ../src/connection-editor/page-bond.c:447
 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:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Primària:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Connexió vinculada %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 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:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Connexió de pont %d"
@@ -2545,59 +2508,75 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Port del pont"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 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:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 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:139
+#: ../src/connection-editor/page-dsl.c:129
 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:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Connexió DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "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:244
+#: ../src/connection-editor/page-ethernet.c:328
 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:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Cable"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "Adreça _MAC falsejada:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Per defecte"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2607,118 +2586,170 @@ 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "El FirewallD no s'està executant."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 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:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 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:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Connexió InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automàtic (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Només adreces (VPN) automàtiques"
 
-#: ../src/connection-editor/page-ip4.c:139
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automàtic, només adreces"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:143
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automàtic (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:142
-#: ../src/connection-editor/page-ip6.c:144
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Només adreces (PPPoE) automàtiques"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automàtic (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:145
+#: ../src/connection-editor/page-ip4.c:136
 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:208
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Només adreces de connexió local"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:306
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Servidors _DNS addicionals:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:315
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Dominis de _cerca addicionals:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Edició de les rutes IPv4 per a %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Paràmetres IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 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-ip6.c:159
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../src/connection-editor/page-ip6.c:183
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automàtic, només DHCP"
 
-#: ../src/connection-editor/page-ip6.c:852
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Edició de les rutes IPv6 per a %s"
 
-#: ../src/connection-editor/page-ip6.c:1003
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Paràmetres IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1005
+#: ../src/connection-editor/page-ip6.c:1157
 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-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Duplica els esclaus"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, 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:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2727,27 +2758,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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s esclava %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 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:370
+#: ../src/connection-editor/page-mobile.c:327
 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:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Seleccioneu el tipus de proveïdor de banda ampla mòbil"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2755,87 +2786,87 @@ 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:652
+#: ../src/connection-editor/page-mobile.c:561
 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, "
 "UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 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:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "cap"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Paràmetres PPP"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 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-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Seleccioneu el fitxer a importar"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Error: el fitxer no conté una configuració JSON vàlida"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 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:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Connexió en equip %d"
@@ -2843,47 +2874,56 @@ 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:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Port de l'equip"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (via «%s»)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "No hi ha cap connexió de xarxa"
+
+#: ../src/connection-editor/page-vlan.c:596
 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:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Connexió VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 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:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "No s'ha trobat cap servei de connector VPN per a «%s»."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Connexió VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2893,11 +2933,11 @@ msgstr ""
 "\n"
 "Error: no hi ha cap tipus de servei VPN."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Seleccioneu un tipus de connexió VPN"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2907,7 +2947,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:85
+#: ../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"
@@ -2915,76 +2955,96 @@ 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:201
+#: ../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)\""
+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
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 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:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Qualsevol dispositiu"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Connexió de xarxa sense fil %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "WEP dinàmic (802.1X)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Seguretat de la xarxa sense fil"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 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-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió WiMAX."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Connexió WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "No es pot importar la connexió VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2997,25 +3057,30 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Error desconegut"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Ja existeix un fitxer anomenat «%s»."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Reemplaça"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "No es pot exportar la connexió VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3026,11 +3091,11 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exporta una connexió VPN..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -3038,101 +3103,11 @@ msgstr ""
 "La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos "
 "necessaris (no s'ha trobat el fitxer d'interfície d'usuari)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"No s'ha pogut configurar el Bluetooth (no s'ha pogut connectar al D-Bus: "
-"(%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"No s'ha pogut configurar el Bluetooth (no s'ha pogut trobar el "
-"NetworkManager: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Utilitzeu el telèfon mòbil com a dispositiu de xarxa (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Accediu a Internet a través del telèfon mòbil (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Error: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "No s'ha pogut crear la connexió DUN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "Ja podeu utilitzar el telèfon."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "S'ha cancel·lat l'auxiliar per a connexions mòbils"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Tipus de dispositiu de telèfon desconegut (ni GSM ni CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "es desconeix el tipus de mòdem."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "no s'ha pogut connectar al telèfon."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "s'ha produït un error en obtindre la connexió de bus"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "el telèfon s'ha desconnectat de manera inesperada."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "s'ha acabat el temps d'espera de la detecció dels detalls del telèfon."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "S'està detectant la configuració del telèfon..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Cal habilitar l'adaptador de Bluetooth abans d'editar una connexió de xarxa "
-"de marcatge directe."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Ha fallat la creació de la connexió PAN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "Xarxa %s"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Desbloqueja"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Desbloqueja automàticament este dispositiu"
 
@@ -3140,11 +3115,12 @@ msgstr "Desbloqueja automàticament este dispositiu"
 msgid "Connection Information"
 msgstr "Informació de la connexió"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Connexions de xarxa actives"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
@@ -3152,21 +3128,25 @@ msgstr ""
 "següents:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "El dispositiu:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "El pla:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3180,23 +3160,28 @@ 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/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "No és a la llista"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../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/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3209,67 +3194,83 @@ msgstr ""
 "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/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "No és a la llista..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Proveïdor"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "No hi ha el proveïdor i vull introduir-lo _manualment:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Proveïdor:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositiu GSM instal·lat"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositiu CDMA instal·lat"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3277,90 +3278,109 @@ 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/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Vos caldrà la informació següent:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "El nom del proveïdor de banda ampla"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "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/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Crea una connexió per a aques_t dispositiu de banda ampla mòbil:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Qualsevol dispositiu"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Connexió de banda ampla mòbil nova"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Amb fil"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "Malla d'OLPC"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../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/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "Contrasenya _secundària:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../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-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Desconnecta"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nova..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Cap"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_rea"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3368,35 +3388,35 @@ msgstr ""
 "Cal una contrasenya o claus d'encriptació per accedir a la xarxa sense fil "
 "«%s»."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Cal autenticació per a la xarxa sense fil"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Crea una xarxa sense fil nova"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Xarxa sense fil nova"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connecta't a la xarxa sense fil oculta"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Xarxa sense fil oculta"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3404,31 +3424,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/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "Contrasenya _secundària:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "M_ostra les contrasenyes"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Seguretat de la _xarxa sense fil:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Co_nnexió:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptador sense fil:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "Malla d'OLPC"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Ús:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3436,7 +3480,7 @@ msgstr ""
 "Este programa és un component del NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3444,138 +3488,151 @@ 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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "no està habilitat"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "no està registrat"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Xarxa domèstica (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Xarxa domèstica"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "s'està cercant"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "s'ha denegat el registre"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Xarxa itinerant (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Xarxa itinerant"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, 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:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Cal que introduïu el codi PIN"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 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:619
+#, 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:622
+msgid "roaming"
+msgstr "itinerància"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "connexió de %s"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Guarda la contrasenya només per este _usuari"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "Guarda la contrasenya per tots els usu_aris"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificats DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Seleccioneu un fitxer PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Fitxers PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Tots els fitxers"
 
@@ -3612,15 +3669,32 @@ msgstr "Autenticació i_nterna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Permet la provisió automàtica PAC"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Trieu un certificat d'autoritat de certificació (CA)..."
 
@@ -3648,15 +3722,46 @@ msgstr "No es _requereix cap certificat de CA"
 msgid "PEAP _version:"
 msgstr "Versió del _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "_Demana la contrasenya cada vegada"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Certificat de C_A:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Les claus privades sense encriptar no són segures"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3670,11 +3775,11 @@ msgstr ""
 "\n"
 "(Podeu utilitzar l'OpenSSL per protegir la vostra clau privada)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Trieu el vostre certificat personal..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Trieu la vostra clau privada..."
 
@@ -3694,23 +3799,36 @@ msgstr "Clau _privada:"
 msgid "_Private key password:"
 msgstr "Contrasenya de la clau _privada:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "TLS per túnel"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegit (PEAP)"
 
@@ -3720,6 +3838,44 @@ msgstr "EAP protegit (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Autenticació:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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)"
@@ -3744,6 +3900,291 @@ msgstr "Most_ra la clau"
 msgid "WEP inde_x:"
 msgstr "Índe_x WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Tipus:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Habilita la banda ampla mòbil WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "A_juda"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Esteu connectat a la xarxa vinculada."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "S'està preparant la connexió vinculada «%s»..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "S'està configurant la connexió vinculada «%s»..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Cal l'autenticació d'usuari per a la connexió vinculada «%s»..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "S'està sol·licitant una adreça per a «%s»..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "La connexió vinculada «%s» és activa"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Esteu connectat a la xarxa puntejada."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "S'està preparant la connexió puntejada «%s»..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "S'està configurant la connexió puntejada «%s»..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Cal l'autenticació d'usuari per a la connexió puntejada «%s»..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "La connexió puntejada «%s» és activa"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Connexió de banda ampla mòbil (CDMA) nova..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Esteu connectat a la xarxa CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "Xarxa CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Connexió de banda ampla mòbil (GSM) nova..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Esteu connectat a la xarxa GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "Xarxa GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "InfiniBand automàtic"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Xarxes InfiniBand (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Xarxa InfiniBand (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Xarxes InfiniBand"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "Xarxa InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Esteu connectat a la xarxa InfiniBand."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "S'està preparant la connexió InfiniBand «%s»..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "S'està configurant la connexió InfiniBand «%s»..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "Cal l'autenticació d'usuari per a la connexió InfiniBand «%s»..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "La connexió InfiniBand «%s» és activa"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Esteu connectat a la xarxa en equip."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "S'està preparant la connexió en equip «%s»..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "S'està configurant la connexió en equip «%s»..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Cal l'autenticació d'usuari per a la connexió en equip «%s»..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "La connexió en equip «%s» és activa"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Esteu connectat a la VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "S'està preparant la connexió VLAN «%s»..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "S'està configurant la connexió VLAN «%s»..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Cal l'autenticació d'usuari per a la connexió VLAN «%s»..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "La connexió VLAN «%s» és activa"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Banda ampla mòbil WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Banda ampla mòbil WiMAX"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "La xarxa WiMAX està inhabilitada"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "L'interruptor de maquinari ha inhabilitat la xarxa WiMAX"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Esteu connectat a la xarxa WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "desconeguda"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "desconegut"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Mode:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Adreça _MAC del dispositiu:"
+
+#~ msgid "Any"
+#~ msgstr "Qualsevol"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Prefereix 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Prefereix 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Prefereix 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Utilitza només 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "I_mporta una configuració en equip des d'un fiter..."
+
+#~ msgid "Infrastructure"
+#~ msgstr ""
+#~ "Infraestructura\n"
+#~ "Ad hoc"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "S'ha produït un error en guardar la connexió"
+
+#~ 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)."
+#~ msgstr ""
+#~ "No s'ha pogut configurar el Bluetooth (no s'ha pogut connectar al D-Bus: "
+#~ "(%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "No s'ha pogut configurar el Bluetooth (no s'ha pogut trobar el "
+#~ "NetworkManager: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Utilitzeu el telèfon mòbil com a dispositiu de xarxa (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Accediu a Internet a través del telèfon mòbil (DUN)"
+
+#~ 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."
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "S'ha cancel·lat l'auxiliar per a connexions mòbils"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Tipus de dispositiu de telèfon desconegut (ni GSM ni CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "es desconeix el tipus de mòdem."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "no s'ha pogut connectar al telèfon."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "s'ha produït un error en obtindre la connexió de bus"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "el telèfon s'ha desconnectat de manera inesperada."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr ""
+#~ "s'ha acabat el temps d'espera de la detecció dels detalls del telèfon."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "S'està detectant la configuració del telèfon..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Cal habilitar l'adaptador de Bluetooth abans d'editar una connexió de "
+#~ "xarxa de marcatge directe."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Ha fallat la creació de la connexió PAN: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Xarxa %s"
+
 #~ msgid "Automatic (PPP)"
 #~ msgstr "Automàtic (PPP)"
 
diff --git a/po/crh.po b/po/crh.po
index 9c237578..b85b2098 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nm-aplet 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-20 19:20-0500\n"
+"POT-Creation-Date: 2016-04-05 14:02+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,7 +21,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-04-23 03:00+0000\n"
 "X-Generator: Launchpad (build 15120)\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Şebeke"
 
@@ -131,47 +131,91 @@ msgid ""
 "authentication."
 msgstr ""
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Şebeke İdarecisi"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Şebeke İdarecisi"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X sahihlenimi"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_Bağlan"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "Şebeke _adı:"
 
-#: ../src/applet.c:541
+# tüklü
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr "bunıñ-içün"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr "emniyetli."
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Bağlantı eklenamadı/faalleştirilamadı"
 
-#: ../src/applet.c:543 ../src/applet.c:587 ../src/applet.c:613
-#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Bilinmegen hata"
 
-#: ../src/applet.c:546 ../src/applet.c:616 ../src/applet-device-wifi.c:1379
-#: ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Bağlantı muvaffaqiyetsizligi"
 
 # tüklü
-#: ../src/applet.c:585
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Cihaz bağlantısı qoparılması muvaffaqiyetsiz edi"
 
-#: ../src/applet.c:590
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Bağlantını qoparma muvaffaqiyetsizligi"
 
-#: ../src/applet.c:611
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Bağlantı faalleştirilmesi muvaffaqiyetsiz edi"
 
-#: ../src/applet.c:926 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Bu mesajı tekrar gösterme"
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -181,7 +225,7 @@ msgstr ""
 "\n"
 "'%s'  VPN bağlantısı başarısız oldu çünkü şebeke bağlantısı engellendi."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -191,7 +235,7 @@ msgstr ""
 "'%s' VPN bağlantısı başarısız oldu çünkü VPN servisi beklenmedik bir anda "
 "durmuş."
 
-#: ../src/applet.c:1021
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -202,7 +246,7 @@ msgstr ""
 "'%s' VPN bağlantısı başarısız oldu çünkü VPN servisi geçersiz ayarlara geri "
 "dönmüş."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -211,7 +255,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:1027
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -220,7 +264,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu. VPN hizmeti zamanında başlamadı."
 
-#: ../src/applet.c:1030
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -229,7 +273,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu çünkü  VPN hizmeti başlatılamadı."
 
-#: ../src/applet.c:1033
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -238,7 +282,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu. Geçerli VPN güvenlikleri yok."
 
-#: ../src/applet.c:1036
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -247,7 +291,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı geçersiz VPN güvenliklerinden dolayı başarısız oldu."
 
-#: ../src/applet.c:1043
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -256,7 +300,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -266,7 +310,7 @@ msgstr ""
 "\n"
 "VPN bağlantısı '%s' qoparıldı çünki şebeke bağlantısı inqıtağa oğradı."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -275,7 +319,7 @@ msgstr ""
 "\n"
 "VPN bağlantısı '%s' qoparıldı çünki VPN hızmeti toqtatıldı."
 
-#: ../src/applet.c:1070
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +328,7 @@ msgstr ""
 "\n"
 "VPN bağlantısı '%s' qoparıldı."
 
-#: ../src/applet.c:1100
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -292,19 +336,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:1102
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:1104
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN Oturum Açılış İletisi"
 
-#: ../src/applet.c:1110 ../src/applet.c:1118 ../src/applet.c:1168
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN Bağlantısı Başarısız"
 
-#: ../src/applet.c:1175
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -317,7 +361,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1178
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -331,668 +375,554 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1493
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "cihaz hazır degil (bellenim eksik)"
 
-#: ../src/applet.c:1495
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "cihaz hazır degil"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1505 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "bağlanmağan"
 
-#: ../src/applet.c:1521
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Bağlantını qopar"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "aygıt kullanılamadı"
 
-#: ../src/applet.c:1579
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Şebeke aygıtı bulunamıyor"
 
 # tüklü
-#: ../src/applet.c:1667
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN Bağlantıları"
 
-#: ../src/applet.c:1724
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_VPN Yapılandır..."
 
-#: ../src/applet.c:1728
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "VPN Bağlantısını _Qopar"
 
-#: ../src/applet.c:1822
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Şebeke Yöneticisi çalışmıyor..."
 
-#: ../src/applet.c:1827 ../src/applet.c:2682
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Şebeke etkin değil"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2048
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "_Şebekelemeni Qabilleştir"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2057
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "_Telsiz-Vefanı Qabilleştir"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2066
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobil Kenişbant Qabil Olsun"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2075
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMA_X Mobil Kenişbant Qabil Olsun"
-
 #. Toggle notifications item
-#: ../src/applet.c:2086
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "_Bildirimler Qabil Olsun"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2097
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Bağlantı _Malümatı"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2107
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Bağlantılarnı Tahrir Et..."
 
-#. Help item
-#: ../src/applet.c:2121
-msgid "_Help"
-msgstr "_Yardım"
-
-#. About item
-#: ../src/applet.c:2130
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Haqqında"
 
-#: ../src/applet.c:2308
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "Şimdi '%s' şebekesine bağlanğan olasıñız."
+
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Bağlanmağan"
 
-#: ../src/applet.c:2309
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Şebeke bağlantısı qoparılğandır."
 
-#: ../src/applet.c:2544
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Şebeke bağlantısı hazırlana '%s'..."
 
-#: ../src/applet.c:2547
+#: ../src/applet.c:2477
 #, 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:2550 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:590
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' içün bir şebeke adresi rica etile..."
 
-#: ../src/applet.c:2553
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Şebeke bağlantısı '%s' etkin"
 
-#: ../src/applet.c:2636
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN bağlantısı başlatılıyor '%s'..."
 
-#: ../src/applet.c:2639
+#: ../src/applet.c:2560
 #, 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:2642
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s' için bir VPN adresi isteniyor..."
 
-#: ../src/applet.c:2645
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN bağlantısı '%s' etkin"
 
-#: ../src/applet.c:2687
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Şebeke bağlantısı yok"
 
-#: ../src/applet.c:3394
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Uygulamacığı"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:304
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:772
-#: ../src/applet-device-gsm.c:360 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../src/applet-device-broadband.c:159
+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:201
+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:252
+msgid "Sending unlock code..."
+msgstr "Kilitsizleme kodu yiberile..."
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Mobil Kenişbant (%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
+msgid "Mobile Broadband"
+msgstr "Mobil Kenişbant"
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Faydalanışlı"
 
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:346
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:816
-#: ../src/applet-device-gsm.c:402 ../src/applet-device-wimax.c:419
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "Şimdi '%s' şebekesine bağlanğan olasıñız."
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr "Yañı Mobil Keniş-bant Bağlantısı..."
 
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:350
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:820
-#: ../src/applet-device-gsm.c:406 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Bağlantı Tesis Etildi"
 
-#: ../src/applet-device-bt.c:200
+#: ../src/applet-device-broadband.c:816
+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:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr "Mobil Kenişbant şebekesi."
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "Şimdi ev şebekesine qaydlısıñız."
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "Şimdi bir kezeleme şebekesine qaydlısıñız."
+
+#: ../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:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:581
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Mobil keniş-bant bağlantısı hazırlana '%s'..."
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:584
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, 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:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:587
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:239 ../src/mobile-helpers.c:607
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobil kenişbant bağlantısı '%s' faal"
 
-#: ../src/applet-device-cdma.c:250 ../src/applet-device-broadband.c:718
-#: ../src/applet-device-gsm.c:306 ../src/applet-dialogs.c:425
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Mobil Kenişbant (%s)"
-
-#: ../src/applet-device-cdma.c:252 ../src/applet-device-broadband.c:720
-#: ../src/applet-device-gsm.c:308
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
-#: ../src/libnm-gtk/nm-ui-utils.c:333
-msgid "Mobile Broadband"
-msgstr "Mobil Kenişbant"
-
-#. Default connection item
-#: ../src/applet-device-cdma.c:317
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Yañı Mobil Keniş-bant (CDMA) bağlantısı..."
-
-#: ../src/applet-device-cdma.c:351
-msgid "You are now connected to the CDMA network."
-msgstr "CDMA ağına bağlandınız."
-
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-cdma.c:424
-msgid "CDMA network."
-msgstr "CDMA şebekesi."
-
-#: ../src/applet-device-cdma.c:419 ../src/applet-device-broadband.c:958
-#: ../src/applet-device-gsm.c:679
-msgid "You are now registered on the home network."
-msgstr "Şimdi ev şebekesine qaydlısıñız."
-
-#: ../src/applet-device-cdma.c:425 ../src/applet-device-broadband.c:964
-#: ../src/applet-device-gsm.c:685
-msgid "You are now registered on a roaming network."
-msgstr "Şimdi bir kezeleme şebekesine qaydlısıñız."
-
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Oto Eternet"
 
-#: ../src/applet-device-ethernet.c:202
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Kabelli (Ethernet) Şebekeler (%s)"
 
-#: ../src/applet-device-ethernet.c:204
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Kabelli (Ethernet) Şebeke (%s)"
 
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Kabelli (Ethernet) Şebekeler"
 
-#: ../src/applet-device-ethernet.c:209
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Kabelli (Ethernet) Şebeke"
 
-#: ../src/applet-device-ethernet.c:271
+#: ../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:297
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "'%s' kabelli (ethernet) şebeke bağlantısı hazırlana..."
 
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Kabelli (ethernet) şebeke bağlantısı '%s' endamlandırıla..."
 
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:167
 #, 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:306
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' içün kabelli (ethernet) şebeke adresi istene..."
 
-#: ../src/applet-device-ethernet.c:310
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Kabelli (Ethernet) şebeke bağlantısı '%s' faal"
 
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL doğrulaması"
 
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:521
-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:206 ../src/applet-device-gsm.c:498
-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:257 ../src/applet-device-gsm.c:548
-msgid "Sending unlock code..."
-msgstr "Kilitsizleme kodu yiberile..."
-
-#. Default connection item
-#: ../src/applet-device-broadband.c:785
-msgid "New Mobile Broadband connection..."
-msgstr "Yañı Mobil Keniş-bant Bağlantısı..."
-
-#: ../src/applet-device-broadband.c:821
-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:957 ../src/applet-device-broadband.c:963
-msgid "Mobile Broadband network."
-msgstr "Mobil Kenişbant şebekesi."
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:373
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Yañı Mobil Keniş-bant (GSM) bağlantısı..."
-
-#: ../src/applet-device-gsm.c:407
-msgid "You are now connected to the GSM network."
-msgstr "Şimdi GSM şebekesine bağlanğan olasıñız."
-
-#: ../src/applet-device-gsm.c:678 ../src/applet-device-gsm.c:684
-msgid "GSM network."
-msgstr "GSM şebekesi."
-
-#: ../src/applet-device-wifi.c:98
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Gizli Telsiz-Vefa Şebekege _Bağlan..."
 
-#: ../src/applet-device-wifi.c:149
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "_Yañı Telsiz-Vefa Şebeke İcat Et..."
 
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Telsiz-Vefa Şebekeler (%s)"
 
-#: ../src/applet-device-wifi.c:789
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Telsiz-Vefa Şebeke (%s)"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Telsiz-Vefa Şebeke(ler)"
 
-#: ../src/applet-device-wifi.c:824
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Telsiz-Vefa naqabildir"
 
-#: ../src/applet-device-wifi.c:825
+#: ../src/applet-device-wifi.c:935
 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:886
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Daa çoq şebeke"
 
-#: ../src/applet-device-wifi.c:1065
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Telsiz-Vefa Şebekeler Müsait"
 
-#: ../src/applet-device-wifi.c:1066
+#: ../src/applet-device-wifi.c:1181
 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:1260
+#: ../src/applet-device-wifi.c:1364
 #, 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:1291
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Telsiz-Vefa şebeke bağlantısı '%s' hazırlana..."
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1402
 #, 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:1297
+#: ../src/applet-device-wifi.c:1405
 #, 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:1300
+#: ../src/applet-device-wifi.c:1408
 #, 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:1321
+#: ../src/applet-device-wifi.c:1419
 #, 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:1326
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Telsiz-Vefa şebeke bağlantısı '%s' faal"
 
-#: ../src/applet-device-wifi.c:1374
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Bağlantısı faalleştirilamadı"
 
-#: ../src/applet-device-wifi.c:1393
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Yañı bağlantı eklenamadı"
 
-#: ../src/applet-device-wimax.c:227
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX Mobil Kenişbant (%s)"
-
-#: ../src/applet-device-wimax.c:229
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX Mobil Kenişbant"
-
-#: ../src/applet-device-wimax.c:255
-msgid "WiMAX is disabled"
-msgstr "WiMAX qabil degildir"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX donanım almaştırıcısı ile ğayrıqabilleştirilgen"
-
-#: ../src/applet-device-wimax.c:424
-msgid "You are now connected to the WiMAX network."
-msgstr "Şimdi WiMAX şebekesine bağlantılısıñız."
-
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:602
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Mobil kenişbant bağlantısı '%s' faal: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:605
-msgid "roaming"
-msgstr "kezeleme"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Bağlantı bilgisini gösterirken hata:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dinamik WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
-#: ../src/applet-dialogs.c:248
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:244
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adresler"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
-msgstr "Yoq"
+msgstr "Hiç biri"
 
-#: ../src/applet-dialogs.c:278
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (ögbelgilengen)"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:485
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:487
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Namalüm"
 
-#: ../src/applet-dialogs.c:362
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Namalüm"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "İP Adresi:"
 
-#: ../src/applet-dialogs.c:364
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "namalüm"
+# tüklü
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Yayın Adresi:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Namalüm"
 
-#: ../src/applet-dialogs.c:376
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "namalüm"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Alt-şebeke Maskası:"
 
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Eternet (%s)"
 
-#: ../src/applet-dialogs.c:414
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:421
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:427
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:433 ../src/applet-dialogs.c:792
-#: ../src/connection-editor/page-general.c:325
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Umumiy"
 
-#: ../src/applet-dialogs.c:437
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Arayüz:"
 
-#: ../src/applet-dialogs.c:453
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Donanım Adresi:"
 
 #. Driver
-#: ../src/applet-dialogs.c:461
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Sürüci:"
 
-#: ../src/applet-dialogs.c:490
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Sur'at:"
 
-#: ../src/applet-dialogs.c:500
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Emniyet:"
 
-#: ../src/applet-dialogs.c:513
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:526
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:543
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:554 ../src/applet-dialogs.c:661
-msgid "IP Address:"
-msgstr "İP Adresi:"
-
-#: ../src/applet-dialogs.c:556 ../src/applet-dialogs.c:572
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Namalüm"
-
-# tüklü
-#: ../src/applet-dialogs.c:570
-msgid "Broadcast Address:"
-msgstr "Yayın Adresi:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:579
-msgid "Subnet Mask:"
-msgstr "Alt-şebeke Maskası:"
-
-#: ../src/applet-dialogs.c:581
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Namalüm"
-
-#: ../src/applet-dialogs.c:589 ../src/applet-dialogs.c:676
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Öntanımlı Rota:"
 
-#: ../src/applet-dialogs.c:601
-msgid "Primary DNS:"
-msgstr "Birlemci DNS:"
-
-#: ../src/applet-dialogs.c:610
-msgid "Secondary DNS:"
-msgstr "Ekilemci DNS:"
-
-#: ../src/applet-dialogs.c:620
-msgid "Ternary DNS:"
-msgstr "Üçlemci DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:635
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:644
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "İhmal Etilgen"
 
-#: ../src/applet-dialogs.c:797
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN Türu:"
 
 # tüklü
-#: ../src/applet-dialogs.c:804
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN Savağı:"
 
-#: ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN Qullanıcı Adı:"
 
-#: ../src/applet-dialogs.c:816
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN Afişi:"
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Temel Bağlantı:"
 
-#: ../src/applet-dialogs.c:824 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:887
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Geçerli etkin bağlantı bulunamadı!"
 
-#: ../src/applet-dialogs.c:915
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1000,48 +930,48 @@ msgstr ""
 "Telif Hakkı © 2005-2008 Novell, Inc.\n"
 "ve çoq diger toplulıq hisse qoşucıları ve tercimeciler"
 
-#: ../src/applet-dialogs.c:918
+#: ../src/applet-dialogs.c:988
 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:920
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager Web sitesi"
 
-#: ../src/applet-dialogs.c:935
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Kaybolan kaynaklar"
 
-#: ../src/applet-dialogs.c:960
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Mobil genişbant şebeke parolası"
 
-#: ../src/applet-dialogs.c:969
+#: ../src/applet-dialogs.c:1039
 #, 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:984
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Sır-söz:"
 
-#: ../src/applet-dialogs.c:1282
+#: ../src/applet-dialogs.c:1336
 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:1283
+#: ../src/applet-dialogs.c:1337
 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:1285
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1051,29 +981,29 @@ msgstr ""
 "Modüli; AKM) PİN (Şahsiy Kimlik Nomerası; ŞKN) kodunı şart qoya"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1287
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PİN kodu:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1291
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "PİN kodunı köster"
 
-#: ../src/applet-dialogs.c:1293
+#: ../src/applet-dialogs.c:1347
 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:1294
+#: ../src/applet-dialogs.c:1348
 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:1296
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1083,29 +1013,36 @@ msgstr ""
 "Modüli; AKM) PUK (PİN Kilitsizleme Anahtarı; PKA) kodunı şart qoya"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1298
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK kodu:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1301
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Yañı PİN kodu:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1303
+#: ../src/applet-dialogs.c:1357
 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:1308
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PİN/PUK kodlarını köster"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1113,19 +1050,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: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
+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: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
+msgid "_Delete"
+msgstr "_Sil"
+
 # tüklü
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Öz-özünden elde etilgen marşrutlarnı _ihmal et"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1133,9 +1093,8 @@ msgstr ""
 "Etkinleştirilirse, bu bağlantı asla öntanımlı şebeke bağlantısı olarak "
 "kullanılamayacak."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1143,15 +1102,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "İcat Et…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1206,64 +1165,89 @@ msgid "Bonded _connections:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "_Tarz:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "K_ip:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
-msgid "_Edit"
-msgstr "_Tahrir Et"
-
-#. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "_Delete"
-msgstr "_Sil"
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Tahrir Et"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: ../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:"
 msgstr "Arayüz _ismi:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr ""
 
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "Birlemci DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "bayt"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Evveliyet:"
 
@@ -1276,40 +1260,286 @@ msgstr ""
 msgid "Bridged _connections:"
 msgstr "Köpürlengen _bağlantılar:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "_Şebekelemeni Qabilleştir"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:67
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "otomatik"
 
-#: ../src/connection-editor/ce-page.c:348
+#: ../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
+msgid "default"
+msgstr "öntanımlı"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adres"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adres"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Her hangi cihaz"
+
+#: ../src/connection-editor/ce-page.c:591
 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
+#, 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
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#, fuzzy
+msgid "Enable"
+msgstr "_Telsiz-Vefanı Qabilleştir"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#, fuzzy
+msgid "Priority"
+msgstr "_Evveliyet:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#, fuzzy
+msgid "Priority Groups"
+msgstr "_Evveliyet:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Priority:"
+msgstr "_Evveliyet:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Priority Bandwidth:"
+msgstr "_Evveliyet:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:10
+#: ../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
@@ -1322,16 +1552,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 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:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1343,7 +1574,8 @@ msgstr "_Parola:"
 #: ../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-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Avtomatik"
@@ -1397,23 +1629,22 @@ msgstr "Tam çift _yönlü"
 msgid "Aut_onegotiate"
 msgstr "_Avto-añlaş"
 
-# tüklü
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "_Cihaz MAC adresi:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Hızmet:"
 
 # tüklü
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "_Klonlanğan MAC adresi:"
 
 # tüklü
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1423,19 +1654,55 @@ 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-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "bayt"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Ögbelgileme"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "İhmal Et"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+# tüklü
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Yayın"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Hususiy anahtar sır-sözü:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1475,8 +1742,8 @@ msgstr "Avtomatik, elnen ayarlanğan DNS ile"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Elle"
 
@@ -1488,22 +1755,22 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 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:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_Usul:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Adresler"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1513,8 +1780,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:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1522,27 +1789,26 @@ 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
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 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:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS sunucıları:"
 
 # tüklü
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1551,12 +1817,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1564,17 +1830,46 @@ 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:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Marşrutlar…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Ğayrıqabilleştirilgen"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+# tüklü
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 ""
+"Qonaqbay adlarını çezmek içün qullanılğan saha adı sunucılarınıñ İP "
+"adresleri. Müteaddit saha adı sunucısı adreslerini ayırmaq içün virgüllerni "
+"qullanıñız."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1583,73 +1878,40 @@ msgstr ""
 "yapılandırması çalışmadığında bağlantının tamamlanmasına izin verir."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Her hangisi"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Prefer 3G (UMTS/HSPA) tercih et"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE) tercih et"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "4G (LTE (Uzun-Müddetli Evrim)) tercih et"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Faqat 4G (LTE) qullan"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Temel"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "_Nomera:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "İleriletilgen"
 
 # tüklü
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "_Şebeke Kimligi:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Tür:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Deñiştir..."
 
 # tüklü
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "Sır-sözlerni _köster"
 
@@ -1702,31 +1964,74 @@ msgstr "Akisseda"
 msgid "Send PPP _echo packets"
 msgstr "PPP _akisseda paketlerini yiber"
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+msgid "_Import team configuration from a file..."
+msgstr "Saqlanğan bir VPN bağlantısını ithal et..."
+
+# tüklü
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Köpürlengen _bağlantılar:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "Saqlanğan bir VPN bağlantısını ithal et..."
+
 # tüklü
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Baba arayüz:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
-msgstr ""
+#, fuzzy
+msgid "VLAN inter_face name:"
+msgstr "Arayüz _ismi:"
 
 # tüklü
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Klonlanğan MAC adresi:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr ""
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
-msgid "Device name + number"
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
 #: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
+msgid "Device name + number"
+msgstr ""
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr ""
 
@@ -1743,98 +2048,103 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Altyapı"
+msgid "Client"
+msgstr ""
 
-# tüklü
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+# tüklü
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 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.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 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.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Nisbet:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "k_anal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ban_t:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "K_ip:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Caiz Sahihlenim Usulları"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
 # tüklü
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Uzatılabilir Sahihlenüv Protokolı"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Parola Doğrulaması Protokolü"
 
 # tüklü
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Doğrulama Protokolü"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Doğrulama Protokolü"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP sürüm _2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1843,131 +2153,158 @@ msgstr ""
 "destekleyecektir. Eğer bağlantı sağlanamazsa, bazı yöntemler için desteği "
 "devre dışı bırakmayı deneyin."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:749
-#: ../src/connection-editor/ip6-routes-dialog.c:691
-#: ../src/connection-editor/page-ip4.c:915
-#: ../src/connection-editor/page-ip6.c:881
-msgid "Address"
-msgstr "Adres"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:766
-#: ../src/connection-editor/page-ip4.c:932
-msgid "Netmask"
-msgstr "Şebeke maskası"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:783
-#: ../src/connection-editor/ip6-routes-dialog.c:725
-#: ../src/connection-editor/page-ip4.c:949
-#: ../src/connection-editor/page-ip6.c:915
-msgid "Gateway"
-msgstr "Veri yolu"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:800
-#: ../src/connection-editor/ip6-routes-dialog.c:742
-msgid "Metric"
-msgstr "Ölçü"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:708
-#: ../src/connection-editor/page-ip6.c:898
-msgid "Prefix"
-msgstr "Ög-yalğama"
-
-#: ../src/connection-editor/new-connection.c:101
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Eternet"
 
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Telsiz-Vefa"
 
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr ""
 
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:131
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:392 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:559
+#: ../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
 msgid "Bond"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:143
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+#: ../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
+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
 msgid "Bridge"
 msgstr "Köpür"
 
-#: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:475 ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:563
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:252
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Donanım"
 
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Saqlanğan bir VPN bağlantısını ithal et..."
 
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/connection-helpers.c:323
 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/new-connection.c:380
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Yañı bağlantı icat etilamadı"
 
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Bağlantı silinamadı"
 
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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/nm-connection-editor.c:118
+#: ../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
+msgid "Address"
+msgstr "Adres"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Şebeke maskası"
+
+#: ../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
+msgid "Gateway"
+msgstr "Veri yolu"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Ölçü"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Ög-yalğama"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "%s Tahrir Etile"
 
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Ad-sız bağlantı düzenleniyor"
 
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Bağlantı _adı:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Muharrirni başlanğıçlandırğanda hata"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Bağlantı eklev muvafaqiyetsiz"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
 # tr
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -1975,172 +2312,202 @@ msgstr ""
 "Bağlantı düzenleyici bazı gerekli kaynakları bulamadı ( .ui dosyası "
 "bulunamadı)."
 
-#: ../src/connection-editor/nm-connection-editor.c:413
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Saqla"
 
-#: ../src/connection-editor/nm-connection-editor.c:414
+#: ../src/connection-editor/nm-connection-editor.c:420
 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:415
-msgid "_Save..."
-msgstr "_Saqla..."
-
-#: ../src/connection-editor/nm-connection-editor.c:416
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:432
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Bağlantı icat etilamadı"
 
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Bağlantı tahrir etilamadı"
 
-#: ../src/connection-editor/nm-connection-editor.c:434
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Bağlantı muharriri dialogı icat etilgende namalüm hata."
 
-#: ../src/connection-editor/nm-connection-editor.c:602
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Muharrirni başlanğıçlandırğanda hata"
 
-#: ../src/connection-editor/nm-connection-editor.c:923
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Bağlantı eklev muvafaqiyetsiz"
 
-#: ../src/connection-editor/nm-connection-editor.c:973
-msgid "Error saving connection"
-msgstr "Bağlantını saqlağanda hata"
-
-#: ../src/connection-editor/nm-connection-editor.c:974
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Hasiyet '%s' / '%s' keçersizdir: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "Bağlantı _adı:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "İh_rac Et..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "asla"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "şimdi"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d daqqa evel"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d saat önce"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d kün evel"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ay evel"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d yıl evel"
 
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "İsim"
 
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Soñki Qullanılğan"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Saylanğan bağlantını tahrir et"
 
-#: ../src/connection-editor/nm-connection-list.c:687
-msgid "_Edit..."
-msgstr "_Tahrir Et..."
-
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 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:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Saylanğan bağlantını sil"
 
-#: ../src/connection-editor/nm-connection-list.c:704
-msgid "_Delete..."
-msgstr "_Sil..."
-
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:701
 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:933
-msgid "Error creating connection"
-msgstr "Bağlantını icat etkende hata"
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:934
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:989
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "Bağlantını icat etkende hata"
+
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Bağlantını tahrir etkende hata"
 
-#: ../src/connection-editor/nm-connection-list.c:990
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x Emniyeti"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 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:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Bu bağlantı içün 802.1_X emniyetini qullan"
 
-#: ../src/connection-editor/page-bond.c:395
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Eternet qullanıcı arayüzü yüklenamadı."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "Bluetooth cihazı tapılamadı."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Telli bağlantı %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+#, fuzzy
+msgid "Select the type of the Bluetooth connection profile."
+msgstr "Saylanğan bağlantını sil."
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Kabelli (Ethernet) Şebeke"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Telsiz-Vefa Şebeke(ler)"
+
+#: ../src/connection-editor/page-bond.c:447
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "Telli qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-bond.c:534
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "Birlemci DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, 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:213
 msgid "Could not load bridge user interface."
 msgstr "Köpür qullanıcı arayüzü yüklenamadı."
 
@@ -2152,190 +2519,272 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Köpür Limanı"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Köpür limanı qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "DSL qullanıcı arayüzü yüklenamadı."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:214
 #, 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-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "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:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Eternet qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Eternet"
+
+# tüklü
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Klonlanğan MAC adresi:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+#, fuzzy
+msgid "Wake-on-LAN password"
+msgstr "Sır-sözni köster"
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:55
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Ögbelgileme"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "AteşDivarıD çapmay."
 
-#: ../src/connection-editor/page-general.c:328
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Umumiy qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand bağlantısı %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Otomatik (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Sadece otomatik (VPN) adresleri"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Otomatik (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Sadece otomatik (PPP) adresleri"
+msgid "Automatic, addresses only"
+msgstr "Avtomatik, faqat adresler"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Otomatik (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Sadece otomatik (PPPoE) adresleri"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Otomatik (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 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:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Faqat Yerli-İlişim"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Ğayrıqabilleştirilgen"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Ek _DNS sunucıları:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Ek qıdırma _sahaları:"
 
-#: ../src/connection-editor/page-ip4.c:847
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s için IPv4 yönlendiricisi düzenleniyor"
 
-#: ../src/connection-editor/page-ip4.c:998
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 Tesbitleri"
 
-#: ../src/connection-editor/page-ip4.c:1000
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "İPv4 qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "Avtomatik, faqat adresler"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "İhmal Et"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Avtomatik, ancaq DHCP"
 
-#: ../src/connection-editor/page-ip6.c:813
+#: ../src/connection-editor/page-ip6.c:964
 #, 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:962
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "İPv6 Ayarları"
 
-#: ../src/connection-editor/page-ip6.c:964
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "İPv6 qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-master.c:284
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Mobil keniş-bant qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:327
 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:658
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Mobil Keniş-bant Teminatçı Türüni Saylañız"
 
-#: ../src/connection-editor/page-mobile.c:685
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2343,94 +2792,145 @@ 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:690
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:697
+#: ../src/connection-editor/page-mobile.c:568
 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:707 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:710 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "hiçbiri"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP Tesbitleri"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-vlan.c:477
+#: ../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 "İçe aktarılacak dosyayı seç"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "VLAN qullanıcı arayüzü yüklenamadı."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+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:151
+#, fuzzy
+msgid "Team Port"
+msgstr "Köpür Limanı"
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+msgid "Could not load team port user interface."
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Şebeke bağlantısı yok"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "VLAN qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-vlan.c:673
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN bağlantısı %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN qullanıcı arayüzü yüklenamadı."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' içün VPN plagin hızmeti tapılamadı."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN bağlantısı %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2440,11 +2940,11 @@ msgstr ""
 "\n"
 "Hata: VPN hizmeti türü yok."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Bir VPN Bağlantı Türü Saylañız"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2455,7 +2955,7 @@ msgstr ""
 "VPN plaginiñiz yoq."
 
 # tr
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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"
@@ -2463,85 +2963,94 @@ msgstr ""
 "Bu seçenek bu bağlantını mında kirsetilgen BSSID tarafından belirtilgen "
 "Telsiz-Vefa irişim noqtasına (AP) kilitler. Meselâ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:172
-#: ../src/connection-editor/page-wifi.c:176
-#: ../src/connection-editor/page-wifi.c:197
-#, c-format
-msgid "default"
-msgstr "öntanımlı"
+# tüklü
+#: ../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)\""
+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:201
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 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:645
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Her hangi cihaz"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Telsiz-Vefa bağlantı %d"
 
-#: ../src/connection-editor/page-wifi-security.c:265
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "Hiç biri"
-
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Dinamik WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Kişisel"
 
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Kurum"
 
-#: ../src/connection-editor/page-wifi-security.c:396
+#: ../src/connection-editor/page-wifi-security.c:413
 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:407
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Telsiz-Vefa Emniyet"
 
-#: ../src/connection-editor/page-wifi-security.c:409
+#: ../src/connection-editor/page-wifi-security.c:426
 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-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "WiMAX qullanıcı arayüzü yüklenamadı."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX bağlantısı %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN bağlantısı içe aktarılamıyor"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2553,29 +3062,30 @@ msgstr ""
 "\n"
 "Hata: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "İçe aktarılacak dosyayı seç"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Bilinmegen hata"
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "'%s' isminde bir dosya zaten mevcut."
 
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Değiştir"
 
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:332
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN bağlantısı dışa aktarılamıyor"
 
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2586,12 +3096,12 @@ msgstr ""
 "\n"
 "Hata: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN bağlantısı dışa aktarılıyor..."
 
 # tr
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../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)."
@@ -2599,105 +3109,11 @@ msgstr ""
 "NetworkManager Uygulamacığı bazı gerekli kaynakları bulamadı (.ui dosyası "
 "bulunamadı)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Bluetooth endamlandırılması imkânsız (D-Bus'qa bağlanılamadı: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Bluetooth endamlandırılması mümkün degil (Şebekeİdarecisi tapılğanda hata: "
-"(%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr ""
-"Mobil telefonıñıznı bir şebeke cihazı olaraq qullan (PAN/NAP; Şebeke İrişimi "
-"Profili (ŞİP))"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr ""
-"İnternetke mobil telefonıñıznı qullanaraq irişiñiz (DUN; Aramalı Şebekeleme "
-"(AŞ))"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Hata: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "DUN bağlantısı icat etilamadı: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:947
-msgid "Your phone is now ready to use!"
-msgstr "Telefonıñız şimdi qullanımğa hazırdır!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Mobil sihirbaz iptal etildi"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Namalüm telefon cihazı türü (GSM yaki CDMA degil)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr ""
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:721
-#: ../src/gnome-bluetooth/nma-bt-device.c:727
-msgid "failed to connect to the phone."
-msgstr "telefonğa bağlanılamağandır."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:758
-msgid "unexpectedly disconnected from the phone."
-msgstr "beklenilmegen bir şekilde telefon bağlantısı qoparılğan."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:768
-msgid "timed out detecting phone details."
-msgstr "telefon tafsilâtını alğılağanda zaman aşıldı."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:779
-msgid "Detecting phone configuration..."
-msgstr "Telefon yapılandırılışı alğılana..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:811
-msgid "error getting bus connection"
-msgstr ""
-
-# tüklü
-#: ../src/gnome-bluetooth/nma-bt-device.c:908
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Aramalı Şebekeleme bağlantısını ayarlamazdan evel ögbelgilengen Bluetooth "
-"uyarlayıcısı qabilleştirilgen olmalı."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:945
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "PAN bağlantısı icat etilamadı: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:966
-#, c-format
-msgid "%s Network"
-msgstr "%s Şebekesi"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "Kilit_sizle"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Bu cihaznı avtomatik olaraq kilitsizle"
 
@@ -2705,31 +3121,36 @@ msgstr "Bu cihaznı avtomatik olaraq kilitsizle"
 msgid "Connection Information"
 msgstr "Bağlantı Malümatı"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Faal Şebeke Bağlantıları"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Cihazıñız:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Planıñız:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -2743,24 +3164,29 @@ msgstr ""
 "ayarlarıñıznı deñiştirmek içün, Sistem >> Tercihler menüsinden \"Şebeke "
 "Bağlantıları\"nı saylañız."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:266
+#: ../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/libnm-gtk/nm-mobile-wizard.c:330
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Listelenmegen"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: ../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/libnm-gtk/nm-mobile-wizard.c:505
+#: ../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/libnm-gtk/nm-mobile-wizard.c:525
+#: ../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"
@@ -2773,67 +3199,83 @@ msgstr ""
 "Planıñız haqqında emin degil iseñiz teminatçıñızdan planıñıznıñ İrişim "
 "Noqtası Adını (İNA, APN) sorañız."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:532
+#: ../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/libnm-gtk/nm-mobile-wizard.c:581
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Planım listelenmegendir..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:734
+#: ../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/libnm-gtk/nm-mobile-wizard.c:747
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Teminatçı"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:772
+#: ../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 "Teminatçımnı tapalmayıım ve onı _elnen kirsetmege isteyim:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:785
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Teminatçı:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:802
+#: ../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/libnm-gtk/nm-mobile-wizard.c:804
+#: ../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/libnm-gtk/nm-mobile-wizard.c:815
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1067
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1090
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1140
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Teminatçıñıznıñ Memleket yaki Bölgesini Saylañız"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1194
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Kurulu GSM aygıtı"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1197
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Kurulu CDMA aygıtı"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1365
+#: ../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."
@@ -2841,84 +3283,106 @@ msgstr ""
 "Bu muavin sizge bir hüceyresel (3G) şebekege mobil keniş-bant bağlantısını "
 "qolayca ayarlamağa yardım eter."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1370
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1381
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Keniş-bant teminatçıñıznıñ adı"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Keniş-bant faturalama planıñıznıñ adı"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
+#: ../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 ""
 "(bazan) Keniş-bant faturalama planıñıznıñ İrişim Noqtası Adı (İNA; APN)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
+#: ../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 "_Bu mobil keniş-bant cihazı içün bir bağlantı icat etiñiz:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1435
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Her hangi cihaz"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1621
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Yañı Mobil Keniş-bant Bağlantısı"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
-msgid "Wired"
-msgstr "Telli"
-
-#: ../src/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:343
-msgid "ADSL"
-msgstr ""
+#: ../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/libnm-gtk/nm-ui-utils.c:405
-msgid "PCI"
-msgstr ""
+#: ../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/libnm-gtk/nm-ui-utils.c:407
-msgid "USB"
-msgstr ""
+#: ../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:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary 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-wifi-dialog.c:132 ../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/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Yañı..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Yoq"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "İcat _Et"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -2926,35 +3390,35 @@ msgstr ""
 "'%s' Telsiz-Vefa şebekesine irişim içün sır-sözler ya da şifreleme "
 "anahtarları şarttır."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Telsiz-Vefa Şebeke Sahihlenimi Şart"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Telsiz-Vefa şebeke sahihlenimni talap ete"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Yañı Telsiz-Vefa Şebeke İcat Et"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Yañı Telsiz-Vefa şebeke"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Gizli Telsiz-Vefa Şebekege Bağlan"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Gizli Telsiz-Vefa şebeke"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -2962,32 +3426,56 @@ msgstr ""
 "Bağlanmağa istegeniñiz gizli Telsiz-Vefa şebekesiniñ ismini ve emniyet "
 "tafsilâtını kirsetiñiz."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Ekilemci Sır-söz:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "Sır-sözlerni _köster"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Telsiz-Vefa _emniyeti:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "_Bağlantı:"
 
 # tüklü
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Telsiz-Vefa _uyarlayıcısı:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Qullanılış:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -2996,7 +3484,7 @@ msgstr ""
 "Projects/NetworkManager/)."
 
 # tüklü
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3004,150 +3492,153 @@ msgstr ""
 "O, buyruq-satrı tesirleşimi içün tasarımlanmağandır, onıñ yerine GNOME "
 "masaüstü çevresinde çapar."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS (Umumiy Paket Radio Hızmeti; UPRH)"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS (Alemiy Mobil Telehaberleşme Sistemi; AMTS)"
 
-#: ../src/mb-menu-item.c:66
+#: ../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:68
+#: ../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:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA (Yüksek-Sur'at Paket İrişimi; YSPİ)"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+ (Yüksek-Sür'at Paket İrişimi; YSPİ)"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "qabilleştirilmegen"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "qayd etilmegen"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Ev şebekesi (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Ev şebekesi"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "qıdırıla"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "qayd inkâr etile"
 
 # tüklü
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Kezeleme şebekesi (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Kezeleme şebekesi"
 
-#: ../src/mobile-helpers.c:317
+#: ../src/mobile-helpers.c:331
 #, 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:450
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN kodu gerekli"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:472
 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:619
+#, 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:622
+msgid "roaming"
+msgstr "kezeleme"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s bağlantısı"
 
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "Seçili Sertifika Yetkilisi sertifikası yok"
-
-#: ../src/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"Bir Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesiniñ qullanılmaması "
-"emniyetsiz, haydut Telsiz-Vefa şebekelerine bağlantılar ile "
-"neticelenebilir.  Bir Şehadetname Salâhiyeti şehadetnamesini saylamağa ister "
-"ediñizmi?"
 
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "CA Sertifikası Seç"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:645
+#: ../src/wireless-security/eap-method.c:452
 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:648
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER veya PEM sertifikaları (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Bir PAC dosyesini saylañız..."
 
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC dosyeleri (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Dosyelerniñ hepsi"
 
@@ -3175,8 +3666,8 @@ msgid "PAC _file:"
 msgstr "PAC _dosyesi:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "_İç sahihlenme:"
 
@@ -3185,14 +3676,32 @@ msgstr "_İç sahihlenme:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Avtomatik PAC _tedarikine izin ber"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "Bir Sertifika Yetkilisi sertifikası seçin..."
 
@@ -3210,19 +3719,57 @@ msgstr "Sürüm 1"
 msgid "C_A certificate:"
 msgstr "Şehadetname _Salâhiyeti (ŞS; CA) şehadetnamesi:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesini ihmal et"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "PEAP _sürümi:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Bu sır-söz içün her sefer _sora"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Şehadetname _Salâhiyeti (ŞS; CA) şehadetnamesi:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Şifrelenmegen hususiy anahtarlar emniyetsizdir"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../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 "
@@ -3236,11 +3783,11 @@ msgstr ""
 "\n"
 "(Hususiy anahtarıñıznı openssl ile sır-söz-himayeli yapabilirsiñiz)"
 
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Kişisel sertifikanızı seçin..."
 
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Özel anahtarınızı seçin..."
 
@@ -3252,27 +3799,44 @@ msgstr "_Kimlik:"
 msgid "_User certificate:"
 msgstr "_Qullanıcı şehadetnamesi:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Hususiy _anahtar:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "_Hususiy anahtar sır-sözü:"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tünnelli TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Himayeli EAP (PEAP)"
 
@@ -3282,21 +3846,47 @@ msgstr "Himayeli EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Sahihlenim:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Ögbelgilengen)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
 msgid "Open System"
@@ -3318,6 +3908,227 @@ msgstr "Anahtarnı _köster"
 msgid "WEP inde_x:"
 msgstr "WEP _indeksi:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Tür:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "WiMA_X Mobil Kenişbant Qabil Olsun"
+
+#~ msgid "_Help"
+#~ msgstr "_Yardım"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Yañı Mobil Keniş-bant (CDMA) bağlantısı..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "CDMA ağına bağlandınız."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA şebekesi."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Yañı Mobil Keniş-bant (GSM) bağlantısı..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Şimdi GSM şebekesine bağlanğan olasıñız."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM şebekesi."
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX Mobil Kenişbant (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX Mobil Kenişbant"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX qabil degildir"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX donanım almaştırıcısı ile ğayrıqabilleştirilgen"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Şimdi WiMAX şebekesine bağlantılısıñız."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "namalüm"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "namalüm"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "Ekilemci DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "Üçlemci DNS:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Tarz:"
+
+# tüklü
+#~ msgid "_Device MAC address:"
+#~ msgstr "_Cihaz MAC adresi:"
+
+#~ msgid "Any"
+#~ msgstr "Her hangisi"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Prefer 3G (UMTS/HSPA) tercih et"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE) tercih et"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "4G (LTE (Uzun-Müddetli Evrim)) tercih et"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Faqat 4G (LTE) qullan"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Altyapı"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "_Save..."
+#~ msgstr "_Saqla..."
+
+#~ msgid "Error saving connection"
+#~ msgstr "Bağlantını saqlağanda hata"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Hasiyet '%s' / '%s' keçersizdir: %d"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Tahrir Et..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Sil..."
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Otomatik (PPP)"
+
+#~ 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)."
+#~ msgstr ""
+#~ "Bluetooth endamlandırılması imkânsız (D-Bus'qa bağlanılamadı: (%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Bluetooth endamlandırılması mümkün degil (Şebekeİdarecisi tapılğanda "
+#~ "hata: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr ""
+#~ "Mobil telefonıñıznı bir şebeke cihazı olaraq qullan (PAN/NAP; Şebeke "
+#~ "İrişimi Profili (ŞİP))"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr ""
+#~ "İnternetke mobil telefonıñıznı qullanaraq irişiñiz (DUN; Aramalı "
+#~ "Şebekeleme (AŞ))"
+
+#~ 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!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Mobil sihirbaz iptal etildi"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Namalüm telefon cihazı türü (GSM yaki CDMA degil)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "telefonğa bağlanılamağandır."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "beklenilmegen bir şekilde telefon bağlantısı qoparılğan."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "telefon tafsilâtını alğılağanda zaman aşıldı."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Telefon yapılandırılışı alğılana..."
+
+# tüklü
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Aramalı Şebekeleme bağlantısını ayarlamazdan evel ögbelgilengen Bluetooth "
+#~ "uyarlayıcısı qabilleştirilgen olmalı."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "PAN bağlantısı icat etilamadı: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s Şebekesi"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Seçili Sertifika Yetkilisi sertifikası yok"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Bir Şehadetname Salâhiyeti (CA; ŞS) şehadetnamesiniñ qullanılmaması "
+#~ "emniyetsiz, haydut Telsiz-Vefa şebekelerine bağlantılar ile "
+#~ "neticelenebilir.  Bir Şehadetname Salâhiyeti şehadetnamesini saylamağa "
+#~ "ister ediñizmi?"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "CA Sertifikası Seç"
+
 #~ msgid ""
 #~ "Set this to TRUE to disable notifications when connecting to a network."
 #~ msgstr ""
@@ -3381,13 +4192,6 @@ msgstr "WEP _indeksi:"
 #~ msgid "Create _New Wireless Network..."
 #~ msgstr "_Yañı Telsiz Şebeke İcat Et..."
 
-# tüklü
-#~ msgid "ad-hoc"
-#~ msgstr "bunıñ-içün"
-
-#~ msgid "secure."
-#~ msgstr "emniyetli."
-
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "Telsiz Şebekeler (%s)"
 
@@ -3457,9 +4261,6 @@ msgstr "WEP _indeksi:"
 #~ msgid "Could not load wired user interface."
 #~ msgstr "Telli qullanıcı arayüzü yüklenamadı."
 
-#~ msgid "Wired connection %d"
-#~ msgstr "Telli bağlantı %d"
-
 #~ msgid "Could not load Wired Security security user interface."
 #~ msgstr "Telli Emniyet emniyet qullanıcı arayüzü yüklenamadı."
 
@@ -3516,9 +4317,6 @@ msgstr "WEP _indeksi:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "'%s' bağlantılarınıñ nasıl tahrir etilgenini bilmeyim"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "Bluetooth cihazı tapılamadı."
-
 # tr
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
@@ -3600,9 +4398,6 @@ msgstr "WEP _indeksi:"
 #~ msgid "GSM network"
 #~ msgstr "GSM şebekesi"
 
-#~ msgid "C_onnect"
-#~ msgstr "_Bağlan"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "Diger Telsiz Şebeke..."
 
@@ -3613,9 +4408,6 @@ msgstr "WEP _indeksi:"
 #~ msgid "_SSID:"
 #~ msgstr "_SSID:"
 
-#~ msgid "Use 802.1X security for this connection"
-#~ msgstr "Bu bağlantı içün 802.1x emniyetini qullan"
-
 #~ msgid "Cannot start VPN connection '%s'"
 #~ msgstr "'%s' VPN bağlantısı başlatılamadı"
 
@@ -3636,9 +4428,6 @@ msgstr "WEP _indeksi:"
 #~ msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
 #~ msgstr "DER, PEM, veya PKCS#12 özel anahtarları (*.der, *.pem, *.p12)"
 
-#~ msgid "Network Manager"
-#~ msgstr "Şebeke İdarecisi"
-
 #~ msgid "_Authentication:"
 #~ msgstr "_Sahihlenme:"
 
@@ -3937,15 +4726,9 @@ msgstr "WEP _indeksi:"
 #~ msgid "Create a CDMA connection"
 #~ msgstr "Bir CDMA bağlantısı oluştur"
 
-#~ msgid "PolicyKit authorization could not be created."
-#~ msgstr "PolicyKit doğrulaması oluşturulamadı."
-
 #~ msgid "GSM connection %d"
 #~ msgstr "GSM bağlantısı %d"
 
-#~ msgid "Delete the selected connection."
-#~ msgstr "Saylanğan bağlantını sil."
-
 #~ msgid "CA Certificate:"
 #~ msgstr "CA Şehadetnamesi:"
 
@@ -3958,9 +4741,6 @@ msgstr "WEP _indeksi:"
 #~ msgid "Private Key:"
 #~ msgstr "Hususiy Anahtar:"
 
-#~ msgid "Show password"
-#~ msgstr "Sır-sözni köster"
-
 #~ msgid "User Certificate:"
 #~ msgstr "Qullanıcı Şehadetnamesi:"
 
diff --git a/po/cs.po b/po/cs.po
index 2380699c..185669e9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,9 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2015-12-22 01:56+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2015-09-21 18:51+0100\n"
 "Last-Translator: Zdeněk Hataš <zdenek.hatas@gmail.com>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
@@ -27,7 +26,7 @@ msgstr ""
 "X-Generator: Poedit 1.7.5\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3258
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Síť"
 
@@ -151,7 +150,7 @@ msgstr ""
 "Program nm-connection-editor spolupracuje se službou NetworkManager při "
 "vytváření a změnách stávajících profilů připojení pro NetworkManager."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Ověření 802.1X"
 
@@ -173,45 +172,45 @@ msgstr "Přip_ojit"
 msgid "_Network name:"
 msgstr "_Název sítě:"
 
-#: ../src/ap-menu-item.c:87
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "bezpečné."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Nepodařilo se přidat/aktivovat připojení"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Selhání připojení"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Odpojení zařízení selhalo"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Selhání odpojení"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Aktivace připojení selhala"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Tuto zprávu již příště nezobrazovat"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -221,7 +220,7 @@ msgstr ""
 "\n"
 "Připojení k VPN „%s“ selhalo, protože bylo přerušeno připojení k síti."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -230,7 +229,7 @@ msgstr ""
 "\n"
 "Připojení k VPN „%s“ selhalo, protože se služba VPN neočekávaně zastavila."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -241,7 +240,7 @@ msgstr ""
 "Připojení k VPN „%s“ selhalo, protože služba VPN vrátila neplatnou "
 "konfiguraci."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -250,7 +249,7 @@ msgstr ""
 "\n"
 "Připojení k VPN „%s“ selhalo, protože vypršel časový limit pro připojení."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -259,7 +258,7 @@ msgstr ""
 "\n"
 "Připojení k VPN „%s“ selhalo, protože se služba VPN nespustila včas."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -268,7 +267,7 @@ msgstr ""
 "\n"
 "Připojení k VPN „%s“ selhalo, protože se nezdařilo spuštění služby VPN."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -277,7 +276,7 @@ msgstr ""
 "\n"
 "Připojení k VPN „%s“ selhalo, protože nebyly zadány platné tajné klíče k VPN."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -286,7 +285,7 @@ msgstr ""
 "\n"
 "Připojení k VPN „%s“ selhalo kvůli neplatným tajným klíčům k VPN."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -295,7 +294,7 @@ msgstr ""
 "\n"
 "Připojení k VPN „%s“ selhalo."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -305,7 +304,7 @@ msgstr ""
 "\n"
 "Připojení k VPN „%s“ bylo odpojeno, protože bylo přerušeno připojení k síti."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -314,7 +313,7 @@ msgstr ""
 "\n"
 "Připojení k VPN „%s“ bylo odpojeno, protože se zastavila služba VPN."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -323,7 +322,7 @@ msgstr ""
 "\n"
 "Připojení k VPN „%s“ bylo odpojeno."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -333,19 +332,19 @@ msgstr ""
 "Připojení k VPN bylo úspěšně navázáno.\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Připojení k VPN bylo úspěšně navázáno.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Zpráva po přihlášení VPN"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Připojení k VPN selhalo"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -358,7 +357,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -371,549 +370,543 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "zařízení není připraveno (chybí firmware)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "zařízení není připraveno"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "odpojeno"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Odpojit"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "zařízení není spravováno"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Nejsou dostupná žádná síťová zařízení"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Připojení k _VPN"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Nastavit VPN…"
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "O_dpojit VPN"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager neběží…"
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Síť zakázána"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Povolit _síť"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Povolit _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Povolit _mobilní širokopásmová připojení"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Povolit up_ozornění"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Informace o spojení"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Upravit připojení…"
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "_Nápověda"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "O _aplikaci"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Jste právě připojeni k „%s“."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Odpojen"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Připojení k síti bylo odpojeno."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Připravuje se připojení k síti „%s“…"
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Je vyžadováno ověření uživatele k připojení „%s“…"
 
-#: ../src/applet.c:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Žádá se o síťovou adresu pro „%s“…"
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Připojení k síti „%s“ je aktivní"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Spouští se připojení k VPN „%s“…"
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, 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:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Žádá se o síťovou adresu k VPN pro „%s“…"
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Připojení k VPN „%s“ je aktivní"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Žádné síťové připojení"
 
-#: ../src/applet.c:3384
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Nesprávný kód PUK. Obraťte se prosím na svého poskytovatele."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Nesprávný kód PIN. Obraťte se prosím na svého poskytovatele."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Odemykací kód je zasílán…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilní širokopásmová (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobilní širokopásmová"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Dostupné"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Nové mobilní širokopásmové připojení…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Spojení navázáno"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Jste právě připojeni k mobilní širokopásmové síti."
 
-#: ../src/applet-device-broadband.c:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobilní širokopásmová síť."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Jste právě připojeni k domácí síti."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Jste právě připojeni k roamingové síti."
 
-#: ../src/applet-device-bt.c:93
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Jste právě připojeni k mobilní širokopásmové síti."
 
-#: ../src/applet-device-bt.c:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Připravuje se mobilní širokopásmové připojení „%s“…"
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Nastavuje se mobilní širokopásmové připojení „%s“…"
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
 "Je vyžadováno ověření uživatele pro mobilní širokopásmové připojení „%s“…"
 
-#: ../src/applet-device-bt.c:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobilní širokopásmové připojení „%s“ je aktivní"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Auto Ethernet"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Drátové sítě (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Drátová síť (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Drátové sítě"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Drátová síť"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Jste právě připojeni k drátové síti."
 
-#: ../src/applet-device-ethernet.c:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Připravuje se přípojení k drátové síti „%s“…"
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Nastavuje se připojení k drátové síti „%s“…"
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Je vyžadováno ověření uživatele pro připojení k drátové síti „%s“…"
 
-#: ../src/applet-device-ethernet.c:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Žádá se o síťovou adresu k drátové síti pro „%s“…"
 
-#: ../src/applet-device-ethernet.c:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Připojení k drátové síti „%s“ je aktivní"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Ověření DSL"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Připojit se ke skryté síti Wi-Fi…"
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Vytvořit _novou síť Wi-Fi…"
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(žádné)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Sítě Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Síť Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Síť Wi-Fi"
 msgstr[1] "Sítě Wi-Fi"
 msgstr[2] "Sítě Wi-Fi"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi je zakázána"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi je zakázána hardwarovým přepínačem"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Více sítí"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Dostupné sítě Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Použijte nabídku sítí pro připojení k síti Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1237
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Jste právě připojeni k síti Wi-Fi „%s“."
 
-#: ../src/applet-device-wifi.c:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Připravuje se připojení k síti Wi-Fi „%s“…"
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Nastavuje se připojení k síti Wi-Fi „%s“…"
 
-#: ../src/applet-device-wifi.c:1275
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Je vyžadováno ověření uživatele k síti Wi-Fi „%s“…"
 
-#: ../src/applet-device-wifi.c:1278
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Žádá se o síťovou adresu k síti Wi-Fi pro „%s“…"
 
-#: ../src/applet-device-wifi.c:1289
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Připojení k síti Wi-Fi „%s“ je aktivní: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Připojení k síti Wi-Fi „%s“ je aktivní"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Aktivace připojení se nezdařila"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Přidání nového připojení se nezdařilo"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Chyba při zobrazování informací o spojení:"
 
-#: ../src/applet-dialogs.c:75 ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamické WEP"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Více adres"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Žádné"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (výchozí)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Neznámá"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Neznámá"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "Adresa IP:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Adresa všesměrového vysílání:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Neznámá"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Maska podsítě:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Obecné"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Rozhraní:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Hardwarová adresa:"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Ovladač:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Rychlost:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Zabezpečení:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Výchozí trasa:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorováno"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Typ VPN:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Brána VPN:"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Uživatelské jméno VPN:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Úvodní text VPN:"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Základní připojení:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Neznámé"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Nenalezena žádná platná aktivní připojení!"
 
-#: ../src/applet-dialogs.c:977
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -923,43 +916,43 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "a mnoho dalších komunitních přispěvatelů a překladatelů"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Applet oznamovací oblasti pro správu vašich síťových zařízení a připojení."
 
-#: ../src/applet-dialogs.c:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Webová stránka aplikace NetworkManager"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Scházející zdroje"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Heslo k mobilní širokopásmové síti"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Pro připojení k „%s“ je vyžadováno heslo."
 
-#: ../src/applet-dialogs.c:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Požadováno odemčení SIM PIN"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "Požadováno odemčení SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -968,25 +961,25 @@ msgstr ""
 "Před použitím požaduje mobilní širokopásmové zařízení „%s“ SIM kód PIN."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Kód PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Ukázat kód PIN"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Požadováno odemčení SIM PUK"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "Požadováno odemčení SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -995,22 +988,22 @@ msgstr ""
 "Před použitím požaduje mobilní širokopásmové zařízení „%s“ SIM kód PUK."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Kód PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Nový kód PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Nový kód PIN znovu:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Ukázat kód PIN/PUK"
 
@@ -1051,7 +1044,7 @@ msgstr "Přid_at"
 #: ../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:697
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "O_dstranit"
 
@@ -1152,7 +1145,7 @@ 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:5
-#: ../src/connection-editor/nm-connection-list.c:681
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "Upr_avit"
 
@@ -1269,57 +1262,57 @@ msgstr "_Max age:"
 msgid "_Aging time:"
 msgstr "_Aging time:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatické"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "výchozí"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "neurčená chyba"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "Adresa MAC"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "Hardwarová adresa"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "neplatná %s pro %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:486
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "neplatná %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "neplatný název rozhraní pro %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "neplatný název rozhraní (%s)"
 
-#: ../src/connection-editor/ce-page.c:487
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "zařízení"
 
-#: ../src/connection-editor/ce-page.c:593
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Aktualizace připojení selhala kvůli neznámé chybě."
 
@@ -1536,8 +1529,8 @@ msgstr "_Zobrazit heslo"
 
 #: ../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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1549,8 +1542,8 @@ msgstr "_Heslo:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automaticky"
@@ -1635,34 +1628,39 @@ msgid "De_fault"
 msgstr "Výcho_zí"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorovat"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "_Heslo pro probuzení po síti:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1705,8 +1703,8 @@ msgstr "Automatické s ručním nastavením DNS"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Ruční"
 
@@ -1717,8 +1715,8 @@ msgstr "Link-Local"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Sdíleno s jinými počítači"
 
@@ -1754,15 +1752,15 @@ msgstr "ID klienta 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:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "Prol_edat domény:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Servery _DNS:"
 
@@ -1792,7 +1790,7 @@ msgid "_Routes…"
 msgstr "T_rasy…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Zakázané"
 
@@ -2035,7 +2033,7 @@ msgstr "_Pásmo:"
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Není autorizováno z polkit k provedení této činnosti"
 
@@ -2091,154 +2089,154 @@ msgstr ""
 "Ve většině případů podporují servery s protokolem PPP všechny metody "
 "ověření. Pokud připojení selže, zkuste zakázat podporu pro některé metody."
 
-#: ../src/connection-editor/connection-helpers.c:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:126
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Svazek"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Tým"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Přemostění"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:597 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Hardwarove"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtuální"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Importovat uložené nastavení VPN…"
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Rozhraní editoru připojení nemohlo být kvůli neznámé chybě inicializováno."
 
-#: ../src/connection-editor/connection-helpers.c:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Nelze vytvořit nové připojení"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Smazání připojení selhalo"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Jste si jisti, že chcete smazat připojení %s?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Síťová maska"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Brána"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrika"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Předpona"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Úprava %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Úprava nepojmenovaného připojení"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Chybí název připojení"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Inicializuje se editor…"
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "Připojení nemůže být změněno"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Neplatné nastavení %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2246,38 +2244,38 @@ msgstr ""
 "Editor připojení nemohl nalézt některé požadované zdroje (soubor .ui nebyl "
 "nalezen)."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Uložit"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Uložit změny provedené v tomto připojení."
 
 # Ověření k uložení...?
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Uložení tohoto připojení u všech uživatelů tohoto počítače je možné po "
 "ověření."
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Nelze vytvořit připojení"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Nelze upravit připojení"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Neznámá chyba při vytváření rozhraní editoru připojení."
 
-#: ../src/connection-editor/nm-connection-editor.c:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Chyba při inicializaci editoru"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Přidání připojení selhalo"
 
@@ -2293,17 +2291,17 @@ msgstr "_Název připojení:"
 msgid "_Export..."
 msgstr "E_xport…"
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nikdy"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "nyní"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2311,7 +2309,7 @@ msgstr[0] "před %d minutou"
 msgstr[1] "před %d minutami"
 msgstr[2] "před %d minutami"
 
-#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2319,7 +2317,7 @@ msgstr[0] "před %d hodinou"
 msgstr[1] "před %d hodinami"
 msgstr[2] "před %d hodinami"
 
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2327,7 +2325,7 @@ msgstr[0] "před %d dnem"
 msgstr[1] "před %d dny"
 msgstr[2] "před %d dny"
 
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2335,7 +2333,7 @@ msgstr[0] "před %d měsícem"
 msgstr[1] "před %d měsíci"
 msgstr[2] "před %d měsíci"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2343,116 +2341,116 @@ msgstr[0] "před %d rokem"
 msgstr[1] "před %d roky"
 msgstr[2] "před %d lety"
 
-#: ../src/connection-editor/nm-connection-list.c:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Název"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Poslední použité"
 
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Upravit zvolené připojení"
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Před úpravou zvoleného připojení musíte být ověřeni"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Odstranit zvolené připojení"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Před smazáním zvoleného připojení musíte být ověřeni"
 
-#: ../src/connection-editor/nm-connection-list.c:924
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Není nainstalován žádný zásuvný modul pro VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Není známo, jak vytvořit připojení „%s“"
 
-#: ../src/connection-editor/nm-connection-list.c:928
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Chyba při vytváření připojení"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Chyba při úpravě připojení"
 
-#: ../src/connection-editor/nm-connection-list.c:951
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Připojení s UUID „%s“ nebylo nalezeno"
 
-#: ../src/connection-editor/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Zabezpečení 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "Nelze nahrát uživatelské rozhraní bezpečnosti 802.1x."
 
-#: ../src/connection-editor/page-8021x-security.c:128
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Použít pro toto připojení zabezpečení 802.1_X"
 
-#: ../src/connection-editor/page-bluetooth.c:61
+#: ../src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Adresa MAC pro zařízení Bluetooth. Například: 00:11:22:33:AA:BB"
 
-#: ../src/connection-editor/page-bluetooth.c:128
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Nelze nahrát uživatelské rozhraní Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:178
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "neplatné zařízení Bluetooth (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:261
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Připojení přes Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:305
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Typ Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:323
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Vyberte typ profilu pro připojení přes Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:328
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "Osobní síť _PAN"
 
-#: ../src/connection-editor/page-bluetooth.c:333
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "Vy_táčené připojení"
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Nelze nahrát uživatelské rozhraní svazku připojení."
 
-#: ../src/connection-editor/page-bond.c:568
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "primární"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Svazek připojení %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Nelze nahrát uživatelské rozhraní mostu."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Přemostěné připojení %d"
@@ -2460,32 +2458,32 @@ msgstr "Přemostěné připojení %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Port mostu"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Nelze nahrát uživatelské rozhraní portu přemostění."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Nelze nahrát uživatelské rozhraní DCB."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Nelze nahrát uživatelské rozhraní DSL."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Připojení pomocí DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:77
+#: ../src/connection-editor/page-ethernet.c:74
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"em1\", "
@@ -2495,37 +2493,37 @@ msgstr ""
 "jména, s pevnou zde uvedenou adresou MAC nebo obojím. Např.  \"em1\", "
 "\"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-ethernet.c:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Nelze nahrát uživatelské rozhraní drátové sítě."
 
-#: ../src/connection-editor/page-ethernet.c:447
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Zařízení Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:744
-#: ../src/connection-editor/page-wifi.c:583
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "klonovaná adresa MAC"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Heslo probuzení po sítí"
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Drátové připojení %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:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2535,15 +2533,15 @@ msgstr ""
 "zóna, jejím výběrem dojde k použití výchozího nastavení zóny firewallu. "
 "Výchozí  Lze použít pouze pokud je aktivní firewalld."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD neběží."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Nelze nahrát obecné uživatelské rozhraní."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2555,152 +2553,152 @@ 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:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Nelze nahrát uživatelské rozhraní InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 msgid "infiniband device"
 msgstr "zařízení infiniband"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Připojení InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automaticky (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Pouze automatické adresy (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automaticky, pouze adresy"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automaticky (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Pouze automatické adresy (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automaticky (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Pouze automatické adresy (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Pouze Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Další servery _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Prol_edat také domény:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Úprava tras IPv4 pro %s"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Nastavení IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Nelze nahrát uživatelské rozhraní IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "Adresa IPv4 „%s“ je neplatná"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "Maska adresy IPv4 „%s“ je neplatná"
 
-#: ../src/connection-editor/page-ip4.c:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "Brána IPv4 „%s“ je neplatná"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "DNS server IPv4 „%s“ je neplatný"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorovat"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automaticky, pouze  DHCP"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Úprava směrovacích tras IPv6 pro %s"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Nastavení IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Nelze nahrát uživatelské rozhraní IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "Adresa IPv6 „%s“ je neplatná"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "Prefix IPv6 „%s“ je neplatný"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "Brána IPv6 „%s“ je neplatná"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "DNS server IPv6 „%s“ je neplatný"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Duplikovat podřízené"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "Podřízená rozhraní „%s“ a „%s“ jsou přiřazena k zařízení „%s“"
 
-#: ../src/connection-editor/page-master.c:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2709,25 +2707,25 @@ msgstr ""
 "Podřízená rozhraní „%s“ a „%s“ jsou přiřazena k různým virtuálním portům "
 "(„%s“ a „%s“) stejného fyzického zařízení."
 
-#: ../src/connection-editor/page-master.c:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s podřízené %d"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Nelze nahrát uživatelské rozhraní mobilního připojení."
 
-#: ../src/connection-editor/page-mobile.c:330
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Nepodporovaný typ mobilního širokopásmového připojení."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Vybrat typ poskytovatele mobilního připojení"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2735,87 +2733,87 @@ msgstr ""
 "Vyberte technologii, kterou používá váš poskytovatel mobilního připojení. "
 "Pokud si nejste jistí, obraťte se na svého poskytovatele."
 
-#: ../src/connection-editor/page-mobile.c:564
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Můj poskytovatel používá technologii založenou na _GSM (tj. GPRS, EDGE, "
 "UTMS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 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:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "žádné"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Úprava metod ověření PPP pro %s"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Nastavení PPP"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Nelze nahrát uživatelské rozhraní PPP."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Vyberte soubor k importu"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Chyba: soubor neobsahuje platné nastavení JSON"
 
-#: ../src/connection-editor/page-team.c:272
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Nelze nahrát uživatelské rozhraní týmu."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Týmové připojení %d"
@@ -2823,56 +2821,56 @@ msgstr "Týmové připojení %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:154
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Port týmu"
 
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:153
 msgid "Could not load team port user interface."
 msgstr "Nelze nahrát uživatelské rozhraní týmového portu."
 
 #. 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:417
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (přes „%s“)"
 
-#: ../src/connection-editor/page-vlan.c:429
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
 msgid "New connection..."
 msgstr "Nové připojení…"
 
-#: ../src/connection-editor/page-vlan.c:599
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Nelze nahrát uživatelské rozhraní vlan."
 
-#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr "rodičovská vlan"
 
-#: ../src/connection-editor/page-vlan.c:800
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Připojení VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Nelze nahrát uživatelské rozhraní VPN."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Nelze nalézt službu zásuvných modulů VPN pro „%s“."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Připojení k VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2882,11 +2880,11 @@ msgstr ""
 "\n"
 "Chyba: žádný typ služby VPN."
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Vyberte typ připojení VPN"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2896,7 +2894,7 @@ msgstr ""
 "připojení k VPN, který si přejete vytvořit, není v seznamu, nemáte možná "
 "nainstalován správný zásuvný modul VPN."
 
-#: ../src/connection-editor/page-wifi.c:80
+#: ../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"
@@ -2904,7 +2902,7 @@ msgstr ""
 "Tato volba umožní připojení pouze prostřednictvím přístupového bodu Wi-Fi "
 "(AP) se zde uvedeným BSSID. Např. 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:91
+#: ../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\", "
@@ -2914,81 +2912,81 @@ msgstr ""
 "jména, s pevnou zde uvedenou adresou MAC nebo obojím. Např.  \"wlan0\", "
 "\"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Nelze nahrát uživatelské rozhraní Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:579
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Zařízení Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Připojení Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Klíč WEP 40/128 bitů (Hex nebo ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Heslo WEP 128 bitů"
 
-#: ../src/connection-editor/page-wifi-security.c:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "Dynamické WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Nelze nahrát uživatelské rozhraní zabezpečení Wi-Fi. Chybí volby Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Zabezpečení Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Nelze nahrát uživatelské rozhraní zabezpečení Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "chybějící SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Bezpečnost není kompatibilní s režimem dočasné sítě"
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Nelze importovat připojení k VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3001,29 +2999,29 @@ msgstr ""
 "\n"
 "Chyba: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "neznámá chyba"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Soubor s názvem „%s“ už existuje."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Nahradit"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Chcete nahradit %s připojením k VPN, které jste právě uložili?"
 
-#: ../src/connection-editor/vpn-helpers.c:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Nelze exportovat připojení k VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3034,11 +3032,11 @@ msgstr ""
 "\n"
 "Chyba: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exportovat připojení k VPN…"
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3062,32 +3060,32 @@ msgstr "Informace o spojení"
 msgid "Active Network Connections"
 msgstr "Aktivní připojení k síti"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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še mobilní širokopásmové připojení je nastaveno s těmito parametry:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.c:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Vaše zařízení:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.c:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Váš poskytovatel:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Váš tarif:"
 
-#: ../src/libnma/nma-mobile-wizard.c:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3100,28 +3098,28 @@ msgstr ""
 "zdrojům v síti, zkontrolujte prosím svá nastavení. Změny v nastavení "
 "připojení provedete volbou „Připojení k síti“ z nabídky Systém >> Nastavení."
 
-#: ../src/libnma/nma-mobile-wizard.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Potvrdit volby širokopásmového připojení"
 
-#: ../src/libnma/nma-mobile-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Není v seznamu"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Vybrat tarif:"
 
-#: ../src/libnma/nma-mobile-wizard.c:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Zvolený přístupový bod vašeho tarifu (_APN):"
 
-#: ../src/libnma/nma-mobile-wizard.c:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3133,83 +3131,83 @@ msgstr ""
 "\n"
 "Nejste-li si jistí přístupovým bodem, obraťte se na svého poskytovatele."
 
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Vyberte svůj tarif"
 
-#: ../src/libnma/nma-mobile-wizard.c:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../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:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Vybrat poskytovate_le ze seznamu:"
 
-#: ../src/libnma/nma-mobile-wizard.c:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Poskytovatel"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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_mohu najít svého poskytovatele, chci jej zadat ručně:"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Poskytovatel:"
 
-#: ../src/libnma/nma-mobile-wizard.c:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 "Můj poskytovatel používá technologii GSM (GPRS, EDGE, UTMS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Můj poskytovatel používá technologii CDMA (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.c:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Vyberte svého poskytovatele"
 
-#: ../src/libnma/nma-mobile-wizard.c:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "Seznam zemí: nebo regionů:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Země nebo region"
 
-#: ../src/libnma/nma-mobile-wizard.c:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Moje země není v seznamu"
 
-#: ../src/libnma/nma-mobile-wizard.c:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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.c:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Nainstalované zařízení GSM"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Nainstalované zařízení CDMA"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3217,82 +3215,82 @@ msgstr ""
 "Tento pomocník vám pomůže snadno nastavit širokopásmové připojení k mobilní "
 "(3G) síti."
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Budete potřebovat tyto informace:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Název poskytovatele širokopásmového připojení"
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Název vašeho tarifu"
 
-#: ../src/libnma/nma-mobile-wizard.c:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 "(v některých případech) Přístupový bod (APN) pro váš tarif"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Vytvořit připojení pro _toto mobilní širokopásmové zařízení:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Jakékoli zařízení"
 
-#: ../src/libnma/nma-mobile-wizard.c:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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.c:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nové mobilní širokopásmové připojení"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../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žit heslo pouze pro tohoto uživatele"
 
-#: ../src/libnma/nma-ui-utils.c:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Uložit heslo pro všechny uživatele"
 
-#: ../src/libnma/nma-ui-utils.c:55 ../src/libnm-gtk/nm-ui-utils.c:620
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Pokaždé se dotazovat na heslo"
 
-#: ../src/libnma/nma-ui-utils.c:56 ../src/libnm-gtk/nm-ui-utils.c:621
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Heslo není vyžadováno"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Sekundární heslo:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "_Terciální heslo:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
 msgid "Sh_ow passwords"
 msgstr "Z_obrazit hesla"
 
-#: ../src/libnma/nma-wifi-dialog.c:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Kliknutím se připojíte"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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"
@@ -3300,55 +3298,55 @@ msgstr ""
 "Chybí heslo, nebo je neplatné připojení. V druhém případě budete muset "
 "nejdříve použít nm-connection-editor pro úpravu připojení"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nová…"
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Žádná"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Vytvořit"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Pro přístup k síti Wi-Fi „%s“ jsou vyžadována hesla nebo šifrovací klíče."
 
-#: ../src/libnma/nma-wifi-dialog.c:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "K síti Wi-Fi je vyžadováno ověření"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Síť Wi-Fi vyžadovuje ověření"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Vytvořit novou síť Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nová síť Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Zadejte název sítě Wi-Fi, kterou chcete vytvořit."
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Připojit se ke skryté síti Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Skrytá síť Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3368,23 +3366,23 @@ msgstr "_Připojení:"
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptér Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Drátové"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Buňka OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3394,17 +3392,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Použití:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3412,158 +3410,158 @@ msgstr ""
 "Tento program je součástí aplikace NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
 "Není určeno pro použití z příkazové řádky, ale pro provoz prostředí GNOME."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "není povoleno"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "neregistrované"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Domácí síť (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Domácí síť"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "vyhledává se"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrace byla odmítnuta"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Roaming síť (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Roaming síť"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "Kód PIN pro kartu SIM „%s“ na „%s“"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Požadován kód PIN"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Pro mobilní širokopásmové zařízení je vyžadován kód PIN"
 
-#: ../src/mobile-helpers.c:610
+#: ../src/mobile-helpers.c:619
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Aktivní mobilní širokopásmové připojení „%s“: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Připojení %s"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr "neurčená chyba v zabezpečení 802.1x (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "neurčená chyba při ověřování souboru eap-method"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:452
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Soukromé klíče DER, PEM nebo PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certifikáty DER nebo PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "chybějící PAC soubor EAP-FAST"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Vyberte soubor PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Soubory PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Všechny soubory"
 
@@ -3599,32 +3597,32 @@ msgstr "V_nitřní ověření:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Po_volit automatické nastavení PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr "chybějící uživatelské jméno pro EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "chybějící heslo pro EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "chybějící certifikát CA pro EAP-PEAP: %s"
 
-#: ../src/wireless-security/eap-method-peap.c:69
+#: ../src/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "chybějící certifikát CA pro EAP-PEAP: žádný certifikát nebyl zadán"
 
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Vyberte certifikát certifikační autority…"
 
@@ -3652,46 +3650,46 @@ msgstr "Žádný ce_rtifikát CA není požadován"
 msgid "PEAP _version:"
 msgstr "Verze _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "chybějící uživatelské jméno pro EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "chybějící heslo pro EAP"
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "chybějící identita EAP-TLS"
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "neplatný certifikát CA pro EAP-TLS: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "neplatný certifikát CA pro EAP-TLS: žádný certifikát nebyl zadán"
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "neplatné heslo pro EAP-TLS: chybí"
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "neplatný soukromý klíč pro EAP-TLS: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "neplatný uživatelský certifikát pro EAP-TLS: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Nešifrované soukormé klíče nejsou bezpečné"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3705,11 +3703,11 @@ msgstr ""
 "\n"
 "(Nastavit heslo svému soukromému klíči můžete prostřednictvím openssl.)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Vyberte vlastní certifikát…"
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Vyberte soukromý klíč…"
 
@@ -3729,36 +3727,36 @@ msgstr "Soukromý _klíč:"
 msgid "_Private key password:"
 msgstr "_Heslo soukromého klíče:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "neplatný certifikát CA pro EAP-TLS: %s"
 
-#: ../src/wireless-security/eap-method-ttls.c:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "neplatný certifikát CA pro EAP-TLS: žádný certifikát nebyl zadán"
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1x security"
 msgstr "Neznámá chyba při ověřování bezpečnosti 802.1x"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
@@ -3768,11 +3766,11 @@ msgstr "Protected EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Ověře_ní:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "chybí leap-username"
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "chybí leap-password"
 
@@ -3833,7 +3831,7 @@ msgstr "Z_obrazit klíč"
 msgid "WEP inde_x:"
 msgstr "Inde_x WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3842,7 +3840,7 @@ msgstr ""
 "neplatný wpa-psk: neplatná délka klíče %zu. Musí být v rozmezí 8 až 63 bajtů "
 "nebo 64 šestnáctkových číslic"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "neplatný wpa-psk: nelze interpretovat klíč délky 64 bajtů jako šestnáctkový"
@@ -3850,3 +3848,6 @@ msgstr ""
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Typ:"
+
+#~ msgid "_Help"
+#~ msgstr "_Nápověda"
diff --git a/po/da.po b/po/da.po
index cd474c77..8b98816b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-17 18:46+0200\n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-09-17 13:32+0200\n"
 "Last-Translator: Ask Hjorth Larsen\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-Language: Danish\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Netværk"
 
@@ -137,46 +137,90 @@ msgstr ""
 "Sæt denne til sand for at deaktivere advarsler om CA-certifikater i fase 2 "
 "af EAP-godkendelsen."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Panelprogram til Netværkhåndtering"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Panelprogram til Netværkhåndtering"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-godkendelse"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "F_orbind"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Netværksnavn:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Kunne ikke tilføje/aktivere forbindelse"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Forbindelsesfejl"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Frakobling af enhed mislykkedes"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Frakoblingsfejl"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Aktivering af forbindelse mislykkedes"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Vis ikke denne besked igen"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -186,7 +230,7 @@ msgstr ""
 "\n"
 "VPN-forbindelsen \"%s\" fejlede, fordi netværksforbindelsen blev afbrudt."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -195,7 +239,7 @@ msgstr ""
 "\n"
 "VPN-forbindelsen \"%s\"  fejlede, fordi VPN-tjenesten stoppede uventet."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -206,7 +250,7 @@ msgstr ""
 "VPN-forbindelsen \"%s\" fejlede, fordi VPN-tjenesten returnerede ugyldig "
 "konfiguration."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -216,7 +260,7 @@ msgstr ""
 "VPN-forbindelsen \"%s\" fejlede, fordi forsøget på at forbinde overskred "
 "tidsgrænsen."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -225,7 +269,7 @@ msgstr ""
 "\n"
 "VPN-forbindelsen \"%s\" fejlede, fordi VPN-tjenesten ikke startede i tide."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -234,7 +278,7 @@ msgstr ""
 "\n"
 "VPN-forbindelsen \"%s\"  fejlede, fordi VPN-tjenestens opstart fejlede."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -244,7 +288,7 @@ msgstr ""
 "VPN-forbindelsen \"%s\"  fejlede, fordi der ikke fandtes nogen gyldige VPN-"
 "koder."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -253,7 +297,7 @@ msgstr ""
 "\n"
 "VPN-forbindelsen \"%s\" fejlede på grund af ugyldige VPN-koder."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -262,7 +306,7 @@ msgstr ""
 "\n"
 "VPN-forbindelsen \"%s\" fejlede."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -273,7 +317,7 @@ msgstr ""
 "VPN-forbindelsen \"%s\" blev afbrudt, fordi netværksforbindelsen blev "
 "afbrudt."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -282,7 +326,7 @@ msgstr ""
 "\n"
 "VPN-forbindelsen \"%s\" blev afbrudt, fordi VPN-tjenesten stoppede."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -291,7 +335,7 @@ msgstr ""
 "\n"
 "VPN-forbindelsen \"%s\" blev afbrudt."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -302,19 +346,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-forbindelsen er blevet etableret.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Log ind-meddelelse for VPN"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN-forbindelse fejlede"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -327,7 +371,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -340,800 +384,546 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "enheden er ikke klar (firmware mangler)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "enhed er ikke klar"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ikke tilsluttet"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Afbryd"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "enhed er ikke redigeret"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Ingen tilgængelige netværksenheder"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN-forbindelser"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Konfigurér VPN..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Afbryd VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Netværkshåndtering kører ikke..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Netværk deaktiveret"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Aktivér _netværk"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Aktivér _trådløst netværk"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Aktiver _mobilt bredbånd"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Aktiver WiMA_X mobilt bredbånd"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Aktivér _påmindelser"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Forbindelses_information"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Håndter forbindelser..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "_Hjælp"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Du er nu tilsluttet \"%s\"."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Afbrudt"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Netværksforbindelsen er blevet afbrudt."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Forbereder netværksforbindelsen \"%s\"..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Der kræves brugergodkendelse til netværksforbindelsen \"%s\"..."
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Anmoder om en netværksadresse for \"%s\"..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Netværksforbindelsen \"%s\" er aktiv"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Starter VPN-forbindelsen \"%s\"..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Der kræves brugergodkendelse til VPN-forbindelsen \"%s\"..."
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Anmoder om en VPN-adresse for \"%s\"..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-forbindelsen \"%s\" er aktiv"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Ingen netværksforbindelse"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Panelprogram til Netværkhåndtering"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Tilgængelig"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Forbindelse oprettet"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Du er nu tilsluttet det bundne netværk."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Forbereder bindingsforbindelsen \"%s\"..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Konfigurerer bindingsforbindelsen \"%s\"..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Der kræves brugergodkendelse til bindingsforbindelsen \"%s\"..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Anmoder om adresse for \"%s\"..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Bindingsforbindelsen \"%s\" er aktiv"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Du er nu tilsluttet bronetværket."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Forbereder broforbindelsen \"%s\"..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Konfigurerer broforbindelsen \"%s\"..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Der kræves brugergodkendelse til broforbindelsen \"%s\"..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Broforbindelsen \"%s\" er aktiv"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Forkert PUK-kode; kontakt venligst din udbyder."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Forkert PIN-kode; kontakt venligst din udbyder."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Sender oplåsnings-kode..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilt bredbånd (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobilt bredbånd"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Tilgængelig"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Ny mobil bredbåndsforbindelse..."
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Forbindelse oprettet"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Du er nu forbundet til det mobile bredbåndsnetværk."
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobilt bredbåndsnetværk."
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Du er nu registreret på hjemmenetværket."
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Du er nu registreret på et roamingnetværk."
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Du er nu forbundet til det mobile bredbåndsnetværk."
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Forbereder mobil bredbåndsforbindelse \"%s\"..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Konfigurerer mobil bredbåndsforbindelse \"%s\"..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Der kræves brugergodkendelse for mobil bredbåndsforbindelse \"%s\"..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobil bredbåndsforbindelse \"%s\" er aktiv"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Ny mobil bredbåndsforbindelse (CDMA)..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Du er nu tilsluttet CDMA-netværket."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "CDMA-netværk."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatisk ethernet"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Kablede netværk (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Kablet netværk (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Kablede netværk"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Kablet netværk"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Du er nu tilsluttet det kablede netværk."
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Forbereder kablet netværksforbindelse \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Konfigurerer kablet netværksforbindelse \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Der kræves brugergodkendelse til kablet netværksforbindelse \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Anmoder om en kablet netværksadresse for \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Kablet netværksforbindelse \"%s\" er aktiv"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-godkendelse"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Ny mobil bredbåndsforbindelse (GSM)..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Du er nu tilsluttet GSM-netværket."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "GSM-netværk."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "InfiniBand auto"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand-netværk (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Infiniband-netværk (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "InfiniBand-netværk"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "InfiniBand-netværk"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Du er nu tilsluttet InfiniBand-netværket."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Forbereder InfiniBand-forbindelsen \"%s\"..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Konfigurerer InfiniBand-forbindelsen \"%s\"..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Der kræves brugergodkendelse til InfiniBand-forbindelsen \"%s\"..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand-forbindelsen \"%s\" er aktiv"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Du er nu tilsluttet gruppenetværket."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Forbereder gruppeforbindelsen \"%s\"..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Konfigurerer gruppeforbindelsen \"%s\"..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Der kræves brugergodkendelse til gruppeforbindelsen \"%s\"..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Gruppeforbindelsen \"%s\" er aktiv"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Du er nu tilsluttet VLAN'et."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Forbereder VLAN-forbindelsen \"%s\"..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Konfigurerer VLAN-forbindelsen \"%s\"..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Der kræves brugergodkendelse til VLAN-forbindelsen \"%s\"..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VLAN-forbindelsen \"%s\" er aktiv"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Forbind til skjult trådløst netværk..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Opret _nyt trådløst netværk..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Trådløse netværk (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Trådløst netværk (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Trådløst netværk"
 msgstr[1] "Trådløse netværk"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Trådløs forbindelse er slået fra"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Trådløs forbindelse er slået fra med hardwareknap"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Flere netværk"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Der er trådløse netværk tilgængelige"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Brug netværksmenuen til at forbinde til et trådløst netværk"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Du er nu tilsluttet det trådløse netværk \"%s\"."
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Forbereder trådløs netværksforbindelse \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Konfigurerer trådløs netværksforbindelse \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Der kræves brugergodkendelse til trådløst netværk \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Anmoder om trådløs netværksadresse for \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Trådløs netværksforbindelse \"%s\" er aktiv: %s (%d %%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Trådløs netværksforbindelse \"%s\" er aktiv"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Kunne ikke aktivere forbindelse"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Kunne ikke tilføje ny forbindelse"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX mobilt bredbånd (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX mobilt bredbånd"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX er deaktiveret"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX er deaktiveret af hardwareknap"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Du er nu tilsluttet WiMAX-netværket."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Mobil bredbåndsforbindelsen \"%s\" er aktiv: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "roaming"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Fejl ved visning af forbindelsesinformation:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adresser"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (standard)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "ukendt"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "ukendt"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP-adresse:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP-adresse:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Rundsendings-adresse:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Undernetmaske:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Standard rute:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Undernetmaske:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Grænseflade:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Hardwareadresse:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Hastighed:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Sikkerhed:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Standard rute:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignoreres"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN-type:"
 
 # gateway?
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN-gateway:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN-brugernavn:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN-banner:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Basisforbindelse:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Ukendt"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Ingen gyldige aktive forbindelser fundet!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1141,44 +931,44 @@ msgstr ""
 "Ophavsret © 2005-2008 Novell, Inc.\n"
 "og mange andre bidragydere fra fællesskabet samt oversættere"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 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:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager websted"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Manglende ressourcer"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Adgangskode til mobilt bredbåndsnetværk"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Adgangskode kræves for at forbinde til \"%s\"."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN-oplåsning kræves"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 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:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1186,25 +976,25 @@ msgid ""
 msgstr "Mobil bredbåndsenhed \"%s\" kræver en SIM PIN-kode før den kan bruges."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN-kode:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Vis PIN-kode"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK oplåsning kræves"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 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:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1212,27 +1002,34 @@ msgid ""
 msgstr "Mobil bredbåndsenhed \"%s\" kræver en SIM PUK-kode før den kan bruges."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK-kode:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Ny PIN-kode:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Gentag ny PIN-kode:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Vis PIN-/PUK-koder"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1242,18 +1039,41 @@ msgstr ""
 "IP-adresser identificerer din computer på netværket. Klik \"Tilføj\"-knappen "
 "for at tilføje en IP-adresse."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Slet"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_norér automatisk fundne ruter"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "_Brug kun denne forbindelse til ressourcer på dens netværk"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1261,9 +1081,8 @@ msgstr ""
 "Hvis aktiveret, så vil denne forbindelse aldrig blive brugt som "
 "standardnetværksforbindelse."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1271,15 +1090,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Opret…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "Vælg en forbindelsestype"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1333,48 +1152,41 @@ msgid "Bonded _connections:"
 msgstr "Bundne _forbindelser:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "_Tilstand:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "Til_stand:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "_Redigér"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "_Slet"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Redigér"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Overvågnings_frekvens:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "_Grænsefladenavn:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "_Linkovervågning:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP-_mål:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1383,19 +1195,19 @@ msgstr ""
 "efter når forbindelsesstatus kontrolleres."
 
 # ???
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Forbindelsens _op-ventetid:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Forbindelsens _ned-ventetid:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Primær:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1403,12 +1215,30 @@ msgstr ""
 "Grænsefladenavnet for den primære enhed. Hvis givet, vil denne enhed altid "
 "være den aktive slave, når den er tilgængelig."
 
+#: ../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:"
+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
+msgid "bytes"
+msgstr "byte"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "_Pris for sti:"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
@@ -1420,44 +1250,89 @@ msgstr "\"_Hairpin\"-tilstand:"
 msgid "Bridged _connections:"
 msgstr "_Forbindelser i brotilstand:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "Ventetid ved _vidersendelse:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Hilsen-tid:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Aktivér _netværk"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Aktivér _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Maks. alder:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_Forældelsestid:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatisk"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "standard"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adresse"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adresse"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Enhver enhed"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Kunne ikke opdatere forbindelseskoder på grund af en ukendt fejl."
 
@@ -1557,77 +1432,77 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Prioritetsflowkontrol"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Slå prioritetspausetransmission til eller fra for hver brugerprioritet."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Trafikklasse:"
 
 # ?
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Streng båndbredde:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Prioritetsbåndbredde:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Gruppebåndbredde:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "Gruppe-id:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr "Indtast prioritetsgruppe-id for hver brugerprioritet."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1636,23 +1511,23 @@ msgstr ""
 "Indtast den tilladte forbindelsesbåndbredde i procent, som hver "
 "prioritetsgruppe må bruge. Summen af alle grupperne skal være 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Indtast procentdelen af prioritetsgruppebåndbredde, som hver brugerprioritet "
 "må bruge."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "Slå streng båndbredde til eller fra for hver brugerprioritet."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 msgid "Enter the traffic class for each user priority."
 msgstr "Indtast trafikklassen for hver brugerprioritet."
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../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
@@ -1665,7 +1540,7 @@ msgstr "_Tjeneste:"
 
 #: ../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:4
+#: ../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
@@ -1673,8 +1548,9 @@ msgid "Sho_w password"
 msgstr "_Vis adgangskode"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1686,8 +1562,8 @@ msgstr "_Adgangskode:"
 #: ../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:138
-#: ../src/connection-editor/page-ip6.c:146
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatisk"
@@ -1742,18 +1618,18 @@ msgstr "Aut_omatisk forhandling"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "_Enheds MAC-adresse:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Tjeneste:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "_Klonet MAC-adresse:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1763,19 +1639,54 @@ msgstr ""
 "netværksenheden, denne forbindelse er aktiveret på. Denne funktion kaldes "
 "MAC-kloning eller spoofing. Eksempel: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "byte"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Standard"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorér"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Rundsending"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Adgangskode til _privat nøgle:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1814,8 +1725,8 @@ msgstr "Automatisk med manuelle DNS-indstillinger"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:195
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manuelt"
 
@@ -1826,8 +1737,8 @@ 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:215
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Delt til andre computere"
 
@@ -1841,7 +1752,7 @@ msgstr "_Metode:"
 msgid "Addresses"
 msgstr "Adresser"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1851,8 +1762,8 @@ msgstr ""
 "din computers konfiguration.  Hvis du ønsker at bruge en DHCP-klient-"
 "identifikation, så skriv det 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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1860,26 +1771,26 @@ msgstr ""
 "Domæner brugt ved evaluering af værtsnavne. Brug komma til at adskille flere "
 "domæner."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 msgid "D_HCP client ID:"
 msgstr "D_HCP-klient-id:"
 
 # Er dette Søgedomæner eller Søg domæner?
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../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:317
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "Søg_edomæner:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../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:308
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS-servere:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1887,11 +1798,11 @@ msgstr ""
 "IP-adresser for domænenavneservere som bruges til opslag af værtsnavne. Brug "
 "komma til at adskille adresser for flere servere."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Kræv IPv_4-adressering for at denne forbindelse kan oprettes"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1900,13 +1811,13 @@ msgstr ""
 "tilslutte hvis IPv4-konfigurationen fejler, men IPv6-konfigurationen "
 "lykkedes."
 
-#: ../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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Ruter…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Afbrudt"
 
@@ -1919,7 +1830,7 @@ msgid "Enabled (prefer temporary address)"
 msgstr "Slået til (foretræk midlertidig adresse)"
 
 # scope?
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 "
@@ -1929,15 +1840,15 @@ msgstr ""
 "Brug komma til at adskille flere domæne-navneserveres adresser. Link-lokale "
 "adresser vil automatisk få \"scope\" til den forbindende grænseflade."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6-_privatlivsudvidelser:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Kræv IPv_6-adressering for at denne forbindelse kan oprettes"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1947,71 +1858,38 @@ msgstr ""
 "lykkedes."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Enhver"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Foretræk 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Foretræk 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Foretræk 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Brug kun 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Grundlæggende"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Nu_mmer:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "N_etværks-ID:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Type:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Ændr..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "Tillad _roaming hvis hjemmenetværket ikke er tilgængeligt"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "_Vis adgangskoder"
 
@@ -2077,32 +1955,55 @@ msgid "_Teamed connections:"
 msgstr "_Grupperede forbindelser:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "I_mportér gruppeopsætning fra en fil..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Importér gruppeopsætning fra en fil..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Ophavsgrænseflade:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Navn på VLAN-grænseflade:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Klonet MAC-adresse:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "_Id for VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Enhedsnavn + nummer"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + nummer"
 
@@ -2119,94 +2020,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastruktur"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Sendest_yrke:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Styrke:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Kanal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Bån_d:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "Til_stand:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Tilladte godkendelsesmetoder"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Protokol til adgangskodegodkendelse"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake-godkendelsesprotokol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2215,136 +2120,157 @@ msgstr ""
 "godkendelsesmetoder. Hvis forbindelsen slår fejl, så prøv at deaktivere "
 "understøttelse af nogle af metoderne."
 
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Kablet forbindelse"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Trådløs"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Binding"
 
-#: ../src/connection-editor/connection-helpers.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Gruppe"
 
-#: ../src/connection-editor/connection-helpers.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Bro"
 
-#: ../src/connection-editor/connection-helpers.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:169
-#: ../src/connection-editor/connection-helpers.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../src/connection-editor/connection-helpers.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: ../src/connection-editor/connection-helpers.c:347
-#: ../src/connection-editor/connection-helpers.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Importér en gemt VPN-konfiguration..."
 
-#: ../src/connection-editor/connection-helpers.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Forbindelsesredigeringen kunne ikke initialiseres på grund af en ukendt fejl."
 
-#: ../src/connection-editor/connection-helpers.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Kunne ikke oprette ny forbindelse"
 
-#: ../src/connection-editor/connection-helpers.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Sletning af forbindelse fejlede"
 
-#: ../src/connection-editor/connection-helpers.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Er du sikker på, at du ønsker at slette forbindelsen %s?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:920
+#: ../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
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Netmaske"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:954
+#: ../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
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metersystem"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:937
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Præfiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Redigerer %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Redigerer unavngiven forbindelse"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Forbindelses_navn:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Kunne ikke initialisere redigeringen"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Tilføjelse af forbindelse fejlede"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2352,173 +2278,211 @@ msgstr ""
 "Forbindelsesredigering kunne ikke finde nogle krævede ressourcer (.ui-filen "
 "blev ikke fundet)."
 
-#: ../src/connection-editor/nm-connection-editor.c:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Gem"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Gem ændringer til denne forbindelse."
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Godkend for at gemme denne forbindelse for alle brugere af denne maskine."
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Kunne ikke oprette forbindelse"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Kunne ikke redigere forbindelse"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Ukendt fejl ved oprettelse af dialogvindue til forbindelsesredigering."
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Kunne ikke initialisere redigeringen"
 
-#: ../src/connection-editor/nm-connection-editor.c:899
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Tilføjelse af forbindelse fejlede"
 
-#: ../src/connection-editor/nm-connection-editor.c:939
-msgid "Error saving connection"
-msgstr "Fejl da forbindelsen blev gemt"
-
-#: ../src/connection-editor/nm-connection-editor.c:940
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Egenskaben \"%s\" / \"%s\" er ugyldig: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "Forbindelses_navn:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Eksportér..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "aldrig"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "nu"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutter siden"
 msgstr[1] "%d minutter siden"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d timer siden"
 msgstr[1] "%d timer siden"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dage siden"
 msgstr[1] "%d dage siden"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d måneder siden"
 msgstr[1] "%d måneder siden"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Sidst brugt"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Redigér den valgte forbindelse"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Bekræft identitet for at redigere den valgte forbindelse"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Slet den valgte forbindelse"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Bekræft identitet for at slette den valgte forbindelse"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Der er ikke installeret nogen VPN-udvidelsesmoduler."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Ved ikke, hvordan man opretter \"%s\"-forbindelser"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Fejl ved oprettelse af forbindelse"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Fejl ved redigering af forbindelsen"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Fandt ikke en forbindelse med UUID \"%s\""
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x sikkerhed"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "Kunne ikke indlæse brugergrænseflade til 802.1x-sikkerhed."
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Brug 802.1_X-sikkerhed til denne forbindelse"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Kunne ikke indlæse DCB-brugergrænseflade."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "kunne ikke finde Bluetooth-enheden."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Bindingsforbindelse %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Kablet netværk"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Trådløst netværk"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Kunne ikke indlæse bindings-brugergrænseflade."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Primær:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bindingsforbindelse %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Kunne ikke indlæse bro-brugergrænseflade."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Broforbindelse %d"
@@ -2526,58 +2490,74 @@ msgstr "Broforbindelse %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Bro-port"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Kunne ikke indlæse brugergrænseflade til bro-port."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Kunne ikke indlæse DCB-brugergrænseflade."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Kunne ikke indlæse DSL-brugergrænseflade."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-forbindelse %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "Denne indstilling låser forbindelsen til netværksenheden angivet med sin MAC-"
 "adresse her. Eksempel: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Kunne ikke indlæse brugergrænseflade til kablet forbindelse."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Kablet forbindelse"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Klonet MAC-adresse:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Kablet forbindelse %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2587,116 +2567,168 @@ msgstr ""
 "en egentlig zone, men resulterer i at zonen vælges ud fra firewallens "
 "standardzone. Kan kun bruges hvis firewalld er aktiv."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD kører ikke."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Kunne ikke indlæse generel brugergrænseflade."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Kunne ikke indlæse brugergrænseflade til InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-forbindelse %d"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatisk (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Kun automatiske (VPN) adresser"
 
-#: ../src/connection-editor/page-ip4.c:139
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automatisk, kun adresser"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:143
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatisk (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:142
-#: ../src/connection-editor/page-ip6.c:144
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Kun automatiske (PPPoE) adresser"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatisk (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:145
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Kun automatiske (DHCP) adresser"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Kun link-lokal"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:306
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Yderligere _DNS-servere:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:315
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Yderligere søg_edomæner:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Redigerer IPv4-ruter for %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4-indstillinger"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Kunne ikke indlæse IPv4-brugergrænseflade."
 
-#: ../src/connection-editor/page-ip6.c:159
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorér"
 
-#: ../src/connection-editor/page-ip6.c:183
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatisk, kun DHCP"
 
-#: ../src/connection-editor/page-ip6.c:852
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Redigerer IPv6-ruter for %s"
 
-#: ../src/connection-editor/page-ip6.c:1003
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6-indstillinger"
 
-#: ../src/connection-editor/page-ip6.c:1005
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Kunne ikke indlæse IPv6-brugergrænseflade."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Duplikerede slaver"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "Slaverne \"%s\" og \"%s\" svarer begge til enheden \"%s\""
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2705,25 +2737,25 @@ msgstr ""
 "Slaverne \"%s\" og \"%s\" svarer til forskellige virtuelle porte (\"%s\" og "
 "\"%s\") for samme fysiske enhed."
 
-#: ../src/connection-editor/page-master.c:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s-slave %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Kunne ikke indlæse brugergrænseflade til mobilt bredbånd."
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Ikke-understøttet type mobil bredbåndsforbindelse."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Vælg type udbyder af mobilt bredbånd"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2731,84 +2763,84 @@ msgstr ""
 "Vælg den teknologi, din mobile bredbåndsudbyder bruger. Spørg din udbyder, "
 "hvis du er i tvivl."
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Min udbyder bruger _GSM-teknologi (GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 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:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ingen"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Redigerer PPP-godkendelsesmetoder for %s"
 
-#: ../src/connection-editor/page-ppp.c:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP-indstillinger"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Kunne ikke indlæse PPP-brugergrænseflade."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Vælg fil til import"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Fejl: Filen indeholder ikke en gyldig JSON-opsætning"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Kunne ikke indlæse gruppebrugergrænseflade."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Gruppeforbindelse %d"
@@ -2816,47 +2848,56 @@ msgstr "Gruppeforbindelse %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Gruppeport"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 msgid "Could not load team port user interface."
 msgstr "Kunne ikke indlæse brugergrænseflade til gruppeport."
 
 #. 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (via \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Ingen netværksforbindelse"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Kunne ikke indlæse brugergrænseflade til vlan."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-forbindelse %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Kunne ikke indlæse VPN-brugerflade."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Kunne ikke finde VPN-udvidelsesmodultjeneste for \"%s\"."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-forbindelse %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2866,11 +2907,11 @@ msgstr ""
 "\n"
 "Fejl: Ingen VPN-tjenestetype."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Vælg type af VPN-forbindelse"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2880,7 +2921,7 @@ msgstr ""
 "VPN-forbindelse du ønsker at oprette ikke fremgår af listen, har du måske "
 "ikke installeret det korrekte VPN-udvidelsesmodul."
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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"
@@ -2888,73 +2929,93 @@ msgstr ""
 "Denne indstilling låser denne forbindelse til det trådløse adgangspunkt (AP) "
 "angivet ved BSSID'en anført her.  Eksempel: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"Denne indstilling låser forbindelsen til netværksenheden angivet med sin MAC-"
+"adresse her. Eksempel: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Kunne ikke indlæse brugergrænseflade til trådløs forbindelse."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Enhver enhed"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Trådløs forbindelse %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit-nøgle (Hex eller ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit adgangsfrase"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Dynamisk WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA og WPA2 personlig"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Kunne ikke indlæse brugergrænseflade for trådløs sikkerhed; mangler "
 "indstilling til trådløs forbindelse."
 
-#: ../src/connection-editor/page-wifi-security.c:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Trådløs sikkerhed"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Kunne ikke indlæse brugergrænseflade for trådløs sikkerhed."
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "Kunne ikke indlæse brugergrænseflade til WiMAX."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX-forbindelse %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Kan ikke importere VPN-forbindelse"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2967,25 +3028,30 @@ msgstr ""
 "\n"
 "Fejl:%s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Ukendt fejl"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "En fil ved navn \"%s\" findes allerede."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Erstat"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Ønsker du at erstatte %s med den VPN-forbindelse, du gemmer?"
 
-#: ../src/connection-editor/vpn-helpers.c:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Kan ikke eksportere VPN-forbindelse"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2996,11 +3062,11 @@ msgstr ""
 "\n"
 "Fejl: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Eksportér VPN-forbindelse..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -3008,101 +3074,11 @@ msgstr ""
 "Panelprogrammet til Netværkshåndtering kunne ikke finde nogle krævede "
 "ressourcer (.ui-filen blev ikke fundet)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Konfiguration af Bluetooth er ikke mulig (kunne ikke forbinde til D-Bus: "
-"(%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Konfiguration af Bluetooth er ikke mulig (fejl ved søgning efter "
-"Netværkshåndtering: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Brug din mobiltelefon som en netværksenhed (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Tilslut internettet ved brug af din mobiltelefon (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Fejl: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Kunne ikke oprette DUN-forbindelse: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "Din telefon er klar til brug!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Mobil-guiden blev afbrudt"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Ukendt telefonenhed (ikke GSM eller CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "ukendt modemtype."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "kunne ikke forbinde til telefonen."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "fejl ved hentning af busforbindelse"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "blev uventet afbrudt fra telefonen."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "tidsudløb for søgning efter telefondetaljer."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "Opdagelse af telefon-konfiguration..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Standard-adapteren til Bluetooth skal være aktiveret før oprettelse af en "
-"netværk-opkaldsforbindelse."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Kunne ikke oprette PAN-forbindelse: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "%s Netværk"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Lås op"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Lås automatisk denne enhed op"
 
@@ -3110,32 +3086,37 @@ msgstr "Lås automatisk denne enhed op"
 msgid "Connection Information"
 msgstr "Forbindelsesinformation"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Aktive netværksforbindelser"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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åndsforbindelse er konfigureret med følgende indstillinger:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Din enhed:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Din udbyder:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Din løsning:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3149,23 +3130,28 @@ msgstr ""
 "Hvis du vil tilpasse dine indstillinger for mobil bredbåndsforbindelse, så "
 "vælg 'Netværksforbindelser' fra menuen System >> Indstillinger."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Bekræft indstillinger for mobilt bredbånd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Ikke på listen"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Vælg din løsning:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Valgt løsning _APN (Access Point Name):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3177,67 +3163,83 @@ msgstr ""
 "\n"
 "Spørg din udbyder om din løsnings APN, hvis du er i tvivl om din løsning."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Vælg betalingsmetode"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Min betalingsmetode er ikke på listen..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Vælg din udbyder på en _liste:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Udbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Jeg kan ikke finde min udbyder og jeg ønsker at indtaste den _manuelt:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Udbyder:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 udbyder bruger GSM-teknologi (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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 udbyder bruger CDMA-teknologi (1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Vælg din udbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "Land- eller regionsliste:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Mit land er ikke på listen"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Installeret GSM-enhed"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installeret CDMA-enhed"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3245,89 +3247,108 @@ msgstr ""
 "Denne guide hjælper dig med at oprette en mobil bredbåndsforbindelse til et "
 "mobilt (3G) netværk."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Du har brug for følgende oplysninger:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Navnet på din bredbåndsudbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Navnet på din bredbånd-afregningsløsning"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(i visse tilfælde) Din bredbånd-afregningsløsnings APN (Access Point Name)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Opret en forbindelse til _denne mobile bredbåndsenhed:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Enhver enhed"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Opsæt en mobil bredbåndsforbindelse"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Ny mobil bredbåndsforbindelse"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Kablet"
+#: ../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 "Gem kun adgangskoden for denne _bruger"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Gem adgangskoden for _alle brugere"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC-gitter"
+#: ../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ørg efter denne adgangs_kode hver gang"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#, fuzzy
+msgid "The password is not required"
+msgstr "Adgangskode kræves for at forbinde til \"%s\"."
 
-#: ../src/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Sekundær adgangskode:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Sekundær adgangskode:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+msgid "Sh_ow passwords"
+msgstr "_Vis adgangskoder"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Afbryd"
+
+#: ../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/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Ny..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "O_pret"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3335,35 +3356,35 @@ msgstr ""
 "Der kræves adgangskoder eller krypteringsnøgler for at få adgang til det "
 "trådløse netværk \"%s\"."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Der kræves godkendelse på trådløst netværk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Der kræves godkendelse på trådløst netværk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Opret nyt trådløst netværk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nyt trådløst netværk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Indtast et navn til det trådløse netværk, du ønsker at oprette."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Forbind til skjult trådløst netværk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Skjult trådløst netværk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3371,31 +3392,55 @@ msgstr ""
 "Indtast navn og sikkerhedsoplysninger til det trådløse netværk du ønsker at "
 "forbinde til."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Sekundær adgangskode:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "_Vis adgangskoder"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_Sikkerhed for trådløst netværk:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Forbi_ndelse:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Trådløs _adapter:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC-gitter"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Brug:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3403,7 +3448,7 @@ msgstr ""
 "Dette program er en komponent til Netværkshåndtering (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3411,138 +3456,151 @@ msgstr ""
 "Det er ikke tiltænkt kommandolinjeindtastning, men kører istedet i GNOME "
 "skrivebordsmiljø."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ikke aktiveret"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ikke registreret"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Hjemmenetværk (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Hjemmenetværk"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "søger"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrering nægtet"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Roaming netværk (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Roaming netværk"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN-kode til SIM-kortet \"%s\" på \"%s\""
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN-kode kræves"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Der skal bruges en PIN-kode til den mobile bredbåndsenhed"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Mobil bredbåndsforbindelsen \"%s\" er aktiv: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "roaming"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Forbindelse til %s"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Gem kun adgangskoden for denne _bruger"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "Gem adgangskoden for _alle brugere"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER-, PEM- eller PKCS#12-private nøgler (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- eller PEM-certifikater (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Vælg en PAC-fil..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Alle filer"
 
@@ -3578,15 +3636,32 @@ msgstr "_Indre godkendelse:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillad automatisk PAC-pro_vision"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Vælg et certifikat fra certifikatautoritet..."
 
@@ -3614,15 +3689,46 @@ msgstr "CA-certifikat ikke _påkrævet"
 msgid "PEAP _version:"
 msgstr "PEAP-_version:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Spørg efter denne adgangs_kode hver gang"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A-certifikat:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Ukrypterede privatnøgler er usikre"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3636,11 +3742,11 @@ msgstr ""
 "\n"
 "(du kan adgangskodebeskytte din private nøgle med openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Vælg dit personlige certifikat..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Vælg din private nøgle..."
 
@@ -3660,23 +3766,36 @@ msgstr "Privat nøg_le:"
 msgid "_Private key password:"
 msgstr "Adgangskode til _privat nøgle:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "TLS gennem tunnel"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Beskyttet EAP (PEAP)"
 
@@ -3686,6 +3805,44 @@ msgstr "Beskyttet EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Godkendelse:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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)"
@@ -3710,6 +3867,287 @@ msgstr "Vis nøg_le"
 msgid "WEP inde_x:"
 msgstr "WEP-inde_ks:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Type:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Aktiver WiMA_X mobilt bredbånd"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjælp"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Du er nu tilsluttet det bundne netværk."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Forbereder bindingsforbindelsen \"%s\"..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Konfigurerer bindingsforbindelsen \"%s\"..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Der kræves brugergodkendelse til bindingsforbindelsen \"%s\"..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Anmoder om adresse for \"%s\"..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Bindingsforbindelsen \"%s\" er aktiv"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Du er nu tilsluttet bronetværket."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Forbereder broforbindelsen \"%s\"..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Konfigurerer broforbindelsen \"%s\"..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Der kræves brugergodkendelse til broforbindelsen \"%s\"..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Broforbindelsen \"%s\" er aktiv"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Ny mobil bredbåndsforbindelse (CDMA)..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Du er nu tilsluttet CDMA-netværket."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA-netværk."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Ny mobil bredbåndsforbindelse (GSM)..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Du er nu tilsluttet GSM-netværket."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM-netværk."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "InfiniBand auto"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand-netværk (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Infiniband-netværk (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand-netværk"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand-netværk"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Du er nu tilsluttet InfiniBand-netværket."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Forbereder InfiniBand-forbindelsen \"%s\"..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Konfigurerer InfiniBand-forbindelsen \"%s\"..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "Der kræves brugergodkendelse til InfiniBand-forbindelsen \"%s\"..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand-forbindelsen \"%s\" er aktiv"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Du er nu tilsluttet gruppenetværket."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Forbereder gruppeforbindelsen \"%s\"..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Konfigurerer gruppeforbindelsen \"%s\"..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Der kræves brugergodkendelse til gruppeforbindelsen \"%s\"..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Gruppeforbindelsen \"%s\" er aktiv"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Du er nu tilsluttet VLAN'et."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Forbereder VLAN-forbindelsen \"%s\"..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Konfigurerer VLAN-forbindelsen \"%s\"..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Der kræves brugergodkendelse til VLAN-forbindelsen \"%s\"..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN-forbindelsen \"%s\" er aktiv"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX mobilt bredbånd (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX mobilt bredbånd"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX er deaktiveret"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX er deaktiveret af hardwareknap"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Du er nu tilsluttet WiMAX-netværket."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "ukendt"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "ukendt"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Tilstand:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_Enheds MAC-adresse:"
+
+#~ msgid "Any"
+#~ msgstr "Enhver"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Foretræk 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Foretræk 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Foretræk 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Brug kun 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "I_mportér gruppeopsætning fra en fil..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastruktur"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Fejl da forbindelsen blev gemt"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Egenskaben \"%s\" / \"%s\" er ugyldig: %d"
+
+#~ msgid "Could not load WiMAX user interface."
+#~ msgstr "Kunne ikke indlæse brugergrænseflade til WiMAX."
+
+#~ msgid "WiMAX connection %d"
+#~ msgstr "WiMAX-forbindelse %d"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Konfiguration af Bluetooth er ikke mulig (kunne ikke forbinde til D-Bus: "
+#~ "(%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Konfiguration af Bluetooth er ikke mulig (fejl ved søgning efter "
+#~ "Netværkshåndtering: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Brug din mobiltelefon som en netværksenhed (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Tilslut internettet ved brug af din mobiltelefon (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Fejl: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Kunne ikke oprette DUN-forbindelse: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Din telefon er klar til brug!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Mobil-guiden blev afbrudt"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Ukendt telefonenhed (ikke GSM eller CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "ukendt modemtype."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "kunne ikke forbinde til telefonen."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "fejl ved hentning af busforbindelse"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "blev uventet afbrudt fra telefonen."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "tidsudløb for søgning efter telefondetaljer."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Opdagelse af telefon-konfiguration..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Standard-adapteren til Bluetooth skal være aktiveret før oprettelse af en "
+#~ "netværk-opkaldsforbindelse."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Kunne ikke oprette PAN-forbindelse: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s Netværk"
+
 #~ msgid "Automatic (PPP)"
 #~ msgstr "Automatisk (PPP)"
 
@@ -3822,9 +4260,6 @@ msgstr "WEP-inde_ks:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "Ved ikke, hvordan man redigerer \"%s\"-forbindelser"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "kunne ikke finde Bluetooth-enheden."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr ""
 #~ "Konfiguration af Bluetooth er ikke mulig (kunne ikke forbinde til D-Bus "
diff --git a/po/de.po b/po/de.po
index 9408909c..4dc2d67d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,20 +21,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-01-21 01:58+0000\n"
-"PO-Revision-Date: 2016-01-21 13:52+0100\n"
-"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
+"PO-Revision-Date: 2016-03-29 22:55+0200\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3258
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Netzwerk"
 
@@ -170,7 +169,7 @@ msgstr ""
 "nm-connection-editor arbeitet gemeinsam mit NetworkManager zum Anlegen und "
 "Bearbeiten von vorhandenen Verbindungsprofilen für NetworkManager."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-Legitimierung"
 
@@ -192,47 +191,47 @@ msgstr "_Verbinden"
 msgid "_Network name:"
 msgstr "_Netzwerkname:"
 
-#: ../src/ap-menu-item.c:87
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "sicher."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Hinzufügen/Aktivierung der Verbindung schlug fehl"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
 #
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Trennen des Gerätes schlug fehl"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Trennen schlug fehl"
 
 #
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Aktivierung der Verbindung fehlgeschlagen"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Diesen Hinweis nicht mehr anzeigen"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -243,7 +242,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil die "
 "Netzwerkverbindung getrennt wurde."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -253,7 +252,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der VPN-Dienst "
 "unerwartet beendet wurde."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -264,7 +263,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der VPN-Server "
 "keine geeignete Netzwerkkonfiguration lieferte."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -274,7 +273,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil die "
 "Netzwerkverbindung eine Zeitüberschreitung verursacht hat."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +283,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der VPN-Dienst "
 "nicht in der vorgesehenen Zeit gestartet wurde."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -294,7 +293,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil der Start des "
 "VPN-Dienstes fehlgeschlagen ist."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -304,7 +303,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil keine gültigen "
 "VPN-Geheimnisse vorliegen."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -314,7 +313,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden, weil VPN-"
 "Geheimnisse ungültig sind."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -323,7 +322,7 @@ msgstr ""
 "\n"
 "Die VPN-Verbindung »%s« konnte nicht hergestellt werden."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -334,7 +333,7 @@ msgstr ""
 "Die VPN-Verbindung »%s« wurde getrennt, weil die Netzwerkverbindung getrennt "
 "wurde."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -343,7 +342,7 @@ msgstr ""
 "\n"
 "Die VPN-Verbindung »%s« wurde getrennt, weil der VPN-Dienst sich beendet hat."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -352,7 +351,7 @@ msgstr ""
 "\n"
 "Die VPN-Verbindung »%s« wurde getrennt."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -363,20 +362,20 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Die VPN-Verbindung wurde erfolgreich eingerichtet.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN-Anmeldemitteilung"
 
 #
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN-Verbindung fehlgeschlagen"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -390,7 +389,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -403,550 +402,544 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "Gerät ist nicht betriebsbereit (Firmware fehlt)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "Gerät ist nicht betriebsbereit"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "nicht verbunden"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Verbindung trennen"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "Gerät wird nicht verwaltet"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Es sind keine Netzwerkgeräte verfügbar"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN-Verbindungen"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "VPN _konfigurieren …"
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "VPN _trennen"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Der Netzwerk-Manager läuft zur Zeit nicht …"
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Netzwerk deaktiviert"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "_Netzwerk aktivieren"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "_Funknetzwerk aktivieren"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobiles Breitband aktivieren"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "_Benachrichtigungen aktivieren"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Verbindungs_informationen"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Verbindungen bearbeiten …"
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "_Hilfe"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Info"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Sie sind nun mit »%s« verbunden."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Verbindung getrennt"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Die Netzwerkverbindung wurde getrennt."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Netzwerkverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Benutzerlegitimierung ist erforderlich für Netzwerkverbindung »%s«"
 
-#: ../src/applet.c:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Netzwerkadresse für »%s« wird angefordert …"
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Netzwerkverbindungen »%s« aktiv"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN-Verbindung »%s« wird gestartet …"
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Benutzerlegitimierung ist erforderlich für VPN-Verbindung »%s«"
 
-#: ../src/applet.c:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Anfordern einer Netzwerkadresse von VPN-Verbindung »%s« …"
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-Verbindung »%s« aktiv"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Keine Netzwerkverbindung"
 
-#: ../src/applet.c:3384
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Netzwerk-Manager-Applet"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Falscher PUK-Code. Bitte kontaktieren Sie Ihren Dienstanbieter."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 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:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Code zum Entsperren wird gesendet …"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobiles Breitband (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobiles Breitband"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Verfügbar"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Neue mobile Breitbandverbindung …"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Verbindung hergestellt"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Sie sind nun mit dem mobilen Breitbandnetzwerk verbunden."
 
-#: ../src/applet-device-broadband.c:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobiles Breitbandnetzwerk."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Sie sind nun im Heimnetzwerk angemeldet."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Sie sind nun in einem Roaming-Netzwerk angemeldet."
 
-#: ../src/applet-device-bt.c:93
+#: ../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:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Mobile Breitbandverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Mobile Breitbandverbindung »%s« wird konfiguriert"
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobile Breitbandverbindung »%s« ist aktiv"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Auto-Ethernet"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Kabelnetzwerke (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Kabelnetzwerk (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Kabelnetzwerke"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Kabelnetzwerk"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Sie sind nun über Kabel mit dem Netzwerk verbunden."
 
-#: ../src/applet-device-ethernet.c:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Kabelnetzwerkverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Kabelnetzwerkverbindung »%s« wird konfiguriert …"
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr ""
 "Benutzerlegitimierung ist erforderlich für Kabelnetzwerkverbindung »%s«"
 
-#: ../src/applet-device-ethernet.c:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Netzwerkadresse für Kabelnetzwerkverbindung »%s« wird angefordert …"
 
-#: ../src/applet-device-ethernet.c:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Kabelnetzwerkverbindung »%s« ist aktiv"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-Legitimierung"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Mit einem verborgenen Funknetzwerk _verbinden …"
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "_Neues Funknetzwerk erstellen …"
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(keine)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Funknetzwerke (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Funknetzwerk (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Funknetzwerk"
 msgstr[1] "Funknetzwerke"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Funknetzwerk ist deaktiviert"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Funknetzwerk wurde durch Schalter deaktiviert"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Weitere Netzwerke"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Funknetzwerke sind verfügbar"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 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:1237
+#: ../src/applet-device-wifi.c:1364
 #, 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:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Funknetzwerkverbindung »%s« wird vorbereitet …"
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Funknetzwerkverbindung »%s« wird konfiguriert …"
 
-#: ../src/applet-device-wifi.c:1275
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Benutzerlegitimierung ist erforderlich für Funknetzwerk »%s«"
 
-#: ../src/applet-device-wifi.c:1278
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Funknetzwerkadresse für »%s« wird angefordert …"
 
-#: ../src/applet-device-wifi.c:1289
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Funknetzwerkverbindung mit »%s« ist aktiv: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Funknetzwerkverbindung »%s« ist aktiv"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Aktivierung der Verbindung schlug fehl"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Hinzufügen einer neuen Verbindung schlug fehl"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Die Verbindungsinformationen konnten nicht angezeigt werden:"
 
-#: ../src/applet-dialogs.c:75 ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamisches WEP"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Weitere Adressen"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (Vorgabe)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "IP-Adresse:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Broadcast-Adresse:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Subnetz-Maske:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Schnittstelle:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Hardware-Adresse:"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Treiber:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Geschwindigkeit:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Sicherheit:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Vorgaberoute:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN-Typ:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN-Gateway:"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN-Benutzername:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN-Banner:"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Zugordnete Verbindung:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Keine aktiven Netzwerkverbindungen gefunden!"
 
-#: ../src/applet-dialogs.c:977
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -956,44 +949,44 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "und viele andere Mitwirkende und Übersetzer"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 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:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Netzwerk-Manager-Website"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Fehlende Ressourcen"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Passwort der mobilen Breitbandverbindung"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, 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:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Entsperren der SIM-Karte mittels PIN-Code erforderlich"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 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:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1002,25 +995,25 @@ msgstr ""
 "Das mobile Breitband-Gerät »%s« erfordert vor Verwendung eine SIM-PIN-Nummer."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN-Code:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "PIN-Code anzeigen"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Entsperren der SIM-Karte mittels PUK-Code erforderlich"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 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:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1029,22 +1022,22 @@ msgstr ""
 "Das mobile Breitband-Gerät »%s« erfordert vor Verwendung einen SIM-PUK-Code."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK-Code:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Neuer PIN-Code:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 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:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK-Codes anzeigen"
 
@@ -1085,7 +1078,7 @@ msgstr "_Hinzufügen"
 #: ../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:701
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Löschen"
 
@@ -1186,7 +1179,7 @@ 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:5
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
@@ -1309,57 +1302,57 @@ msgstr "_Höchstzulässiges Alter:"
 msgid "_Aging time:"
 msgstr "_Alterungszeit:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "Automatisch"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "Vorgabe"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "Unbestimmter Fehler"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "Hardware-Adresse"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%s ungültig für %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:486
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s ungültig (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "ungültiger Schnittstellenname für %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "ungültiger Schnittstellenname %s"
 
-#: ../src/connection-editor/ce-page.c:487
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "Gerät"
 
-#: ../src/connection-editor/ce-page.c:593
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Das Aktualisieren der Verbindungspasswörter ist wegen eines unbekannten "
@@ -1578,8 +1571,8 @@ msgstr "Passwort _anzeigen"
 
 #: ../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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1591,8 +1584,8 @@ msgstr "_Passwort:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatisch"
@@ -1677,34 +1670,38 @@ msgid "De_fault"
 msgstr "_Vorgabe"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr "_Ignorieren"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "Passwort für Auf_wecken über LAN:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1748,8 +1745,8 @@ msgstr "Automatisch mit manuellen DNS-Einstellungen"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manuell"
 
@@ -1760,8 +1757,8 @@ msgstr "Link-Local"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Gemeinsam mit anderen Rechnern"
 
@@ -1800,15 +1797,15 @@ msgstr "D_HCP Client-Kennung:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "_Suchdomänen:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS-Server:"
 
@@ -1839,7 +1836,7 @@ msgid "_Routes…"
 msgstr "_Routen …"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Deaktiviert"
 
@@ -2082,7 +2079,7 @@ msgstr "Ban_d:"
 msgid "SS_ID:"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../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"
 
@@ -2139,78 +2136,78 @@ msgstr ""
 "Legitimierungsmethoden. Falls eine Verbindung fehlschlägt, versuchen Sie, "
 "die Unterstützung für einige Methoden zu deaktivieren."
 
-#: ../src/connection-editor/connection-helpers.c:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Funknetzwerk"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:126
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Gebündelt"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Brücke"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:597 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtuell"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Gespeicherte VPN-Konfiguration importieren …"
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2218,78 +2215,78 @@ msgstr ""
 "Der Verbindungseditor kann wegen eines unbekannten Fehlers nicht "
 "initialisiert werden."
 
-#: ../src/connection-editor/connection-helpers.c:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Neue Verbindung konnte nicht erstellt werden"
 
 #
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Löschen der Verbindung fehlgeschlagen"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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/ip4-routes-dialog.c:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Netzmaske"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrik"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Präfix"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "%s bearbeiten"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Unbenannte Verbindung bearbeiten"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Fehlender Verbindungsname:"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Editors wird initialisiert …"
 
 #
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "Verbindung kann nicht bearbeitet werden"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "ungültige Einstellung %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2297,40 +2294,40 @@ msgstr ""
 "Der Verbindungseditor konnte benötigte Ressourcen nicht finden (Die .ui-"
 "Datei wurde nicht gefunden)."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Alle Änderungen an dieser Verbindung speichern."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Verbindung konnte nicht erstellt werden"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Verbindung konnte nicht bearbeitet werden"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 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:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Fehler beim Initialisieren des Editors"
 
 #
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Hinzufügen der Verbindung fehlgeschlagen"
 
@@ -2346,161 +2343,161 @@ msgstr "Verbindungs_name:"
 msgid "_Export..."
 msgstr "E_xportieren …"
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nie"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "jetzt"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Name"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Zuletzt verwendet"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Die ausgewählte Verbindung bearbeiten"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Legitimieren, um die ausgewählte Verbindung zu bearbeiten"
 
-#: ../src/connection-editor/nm-connection-list.c:702
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Die ausgewählte Verbindung löschen"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Legitimieren, um die ausgewählte Verbindung zu löschen"
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Es sind keine VPN-Plugins installiert."
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:935
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Fehler beim Erstellen der Verbindung"
 
-#: ../src/connection-editor/nm-connection-list.c:957
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Fehler beim Bearbeiten der Verbindung"
 
-#: ../src/connection-editor/nm-connection-list.c:958
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x-Sicherheit"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 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:128
+#: ../src/connection-editor/page-8021x-security.c:125
 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:61
+#: ../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:128
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Bluetooth-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-bluetooth.c:178
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "Ungültiges Bluetooth-Gerät (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:261
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth-Verbindung %d"
 
-#: ../src/connection-editor/page-bluetooth.c:305
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Bluetooth-Typ"
 
-#: ../src/connection-editor/page-bluetooth.c:323
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Wählen Sie die Art des Bluetooth-Verbindungsprofils."
 
-#: ../src/connection-editor/page-bluetooth.c:328
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "_Privates Netzwerk"
 
-#: ../src/connection-editor/page-bluetooth.c:333
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "_Einwahlverbindung"
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Bündel-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-bond.c:568
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "Primär"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bündel-Verbindung %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Bündel-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Brückenverbindung %d"
@@ -2508,32 +2505,32 @@ 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:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Port einer Brücke"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Brücken-Port-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "DCB-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-Verbindung %d"
 
-#: ../src/connection-editor/page-ethernet.c:77
+#: ../src/connection-editor/page-ethernet.c:74
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"em1\", "
@@ -2544,37 +2541,37 @@ 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:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Kabel-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-ethernet.c:447
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Ethernet-Gerät"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:744
-#: ../src/connection-editor/page-wifi.c:583
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "Geklonte MAC-Adresse"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Passwort für Aufwecken über LAN"
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Kabelnetzwerkverbindung %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:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Vorgabe"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2584,15 +2581,15 @@ 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD läuft zur Zeit nicht"
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Allgemeine Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2605,152 +2602,152 @@ 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:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 msgid "infiniband device"
 msgstr "InfiniBand-Gerät"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-Verbindung %d"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatisch (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatisch (VPN), nur Adressen"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automatisch, nur Adressen"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatisch (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatisch (PPPoE), nur Adressen"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatisch (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatisch (DHCP), nur Adressen"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Nur per Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Zusätzliche _DNS-Server:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Zusätzliche Suchdomän_en:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "IPv4-Routen für »%s« bearbeiten"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4-Einstellungen"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "IPv4-Adresse »%s« ungültig"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "IPv4 Adressen-Netzmaske »%s« ungültig"
 
-#: ../src/connection-editor/page-ip4.c:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "IPv4-Gateway »%s« ungültig"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "IPv4 DNS-Server »%s« ungültig"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatisch, nur DHCP"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "IPv6-Routen für »%s« bearbeiten"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6-Einstellungen"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "IPv6-Adresse »%s« ungültig"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "IPv6-Prefix »%s« ungültig"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "IPv6-Gateway »%s« ungültig"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "IPv6 DNS-Server »%s« ungültig"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Doppelte Sklaven"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, 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:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2759,27 +2756,27 @@ msgstr ""
 "Sklaven »%s« und »%s« bewerben verschiedene virtuelle Ports (»%s« und »%s«) "
 "auf demselben physikalischen Gerät."
 
-#: ../src/connection-editor/page-master.c:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s Sklave %d"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Benutzerschnittstelle für mobile Breitbandverbindungen konnte nicht geladen "
 "werden."
 
-#: ../src/connection-editor/page-mobile.c:330
+#: ../src/connection-editor/page-mobile.c:327
 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:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Typ des mobilen Breitbandanbieters auswählen"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2787,87 +2784,87 @@ 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:564
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Mein Dienstanbieter verwendet _GSM-basierte Technologien (z.B. GPRS, EDGE, "
 "UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 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:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "keine"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../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:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP-Einstellungen"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Datei zum Import auswählen"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Fehler: Datei enthält keine gültige JSON-Konfiguration"
 
-#: ../src/connection-editor/page-team.c:272
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Benutzerschnittstelle für Netzwerk-Team konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Netzwerk-Team %d"
@@ -2875,11 +2872,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:154
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Netzwerk-Team Anschluss"
 
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:153
 msgid "Could not load team port user interface."
 msgstr ""
 "Benutzerschnittstelle für Netzwerk-Team-Anschluss konnte nicht geladen "
@@ -2888,45 +2885,45 @@ 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:417
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (über »%s«)"
 
-#: ../src/connection-editor/page-vlan.c:429
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
 msgid "New connection..."
 msgstr "Neue Verbindung …"
 
-#: ../src/connection-editor/page-vlan.c:599
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "VLAN-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr "vlan-Elter"
 
-#: ../src/connection-editor/page-vlan.c:800
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-Verbindung %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN-Benutzerschnittstelle konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "VPN-Plugin-Dienst für »%s« konnte nicht gefunden werden."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-Verbindung %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2937,11 +2934,11 @@ msgstr ""
 "Fehler: Kein VPN-Diensttyp."
 
 #
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "VPN-Verbindungstyp wählen"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2952,7 +2949,7 @@ msgstr ""
 "Liste erscheint, haben Sie möglicherweise nicht das richtige VPN-Plugin "
 "installiert."
 
-#: ../src/connection-editor/page-wifi.c:80
+#: ../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"
@@ -2961,7 +2958,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:91
+#: ../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\", "
@@ -2972,83 +2969,83 @@ 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:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Benutzerschnittstelle für Funknetzwerke konnte nicht geladen werden."
 
-#: ../src/connection-editor/page-wifi.c:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:579
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "WLAN-Gerät"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Funknetzwerkverbindung %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Kennwort"
 
-#: ../src/connection-editor/page-wifi-security.c:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "Dynamisches WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 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:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Sicherheit des Funknetzwerks"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 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:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "fehlende SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Sicherheit ist mit Ad-Hoc-Modus nicht kompatibel"
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Die VPN-Verbindung konnte nicht importiert werden"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3061,30 +3058,30 @@ msgstr ""
 "\n"
 "Fehler: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Eine Datei mit dem Namen »%s« existiert bereits."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Ersetzen"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Die VPN-Verbindung konnte nicht exportiert werden"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3095,11 +3092,11 @@ msgstr ""
 "\n"
 "Fehler: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN-Verbindung exportieren …"
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3123,8 +3120,8 @@ msgstr "Verbindungsinformationen"
 msgid "Active Network Connections"
 msgstr "Aktive Netzwerkverbindungen"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
@@ -3132,25 +3129,25 @@ msgstr ""
 "eingerichtet:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.c:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Ihr Gerät:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.c:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Ihr Dienstanbieter:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Ihr Abrechnungsmodus:"
 
-#: ../src/libnma/nma-mobile-wizard.c:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3165,28 +3162,28 @@ msgstr ""
 "Breitbandverbindungen zu ändern, wählen Sie »Netzwerkverbindungen« im Menü "
 "System → Einstellungen."
 
-#: ../src/libnma/nma-mobile-wizard.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Mobile Breitbandeinstellungen bestätigen"
 
-#: ../src/libnma/nma-mobile-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nicht aufgelistet"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "Abrechnung_smodus auswählen:"
 
-#: ../src/libnma/nma-mobile-wizard.c:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../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.c:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3200,85 +3197,85 @@ msgstr ""
 "Im Zweifelsfall sollten Sie Ihren Dienstanbieter nach dem Abrechnungsmodus "
 "Ihres Zugangspunktes fragen."
 
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Abrechnungsmodus wählen"
 
-#: ../src/libnma/nma-mobile-wizard.c:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../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:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../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.c:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Dienstanbieter"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 ""
 "Ich kann meinen Dienstanbieter nicht finden und möchte ihn _manuell eingeben:"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Dienstanbieter:"
 
-#: ../src/libnma/nma-mobile-wizard.c:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 ""
 "Mein Dienstanbieter verwendet GSM-Technologien (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../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.c:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Dienstanbieter auswählen"
 
-#: ../src/libnma/nma-mobile-wizard.c:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "Länder- oder Regionsliste:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Land oder Region"
 
-#: ../src/libnma/nma-mobile-wizard.c:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../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:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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.c:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Installiertes GSM-Gerät"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installiertes CDMA-Gerät"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3286,83 +3283,83 @@ msgstr ""
 "Dieser Assistent hilft Ihnen bei der Einrichtung einer mobilen "
 "Breitbandverbindung über ein UMTS-(3G)-Netzwerk."
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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.c:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Name Ihres Breitbandanbieters"
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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.c:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(in einigen Fällen) Name des Zugangspunktes für Ihren Abrechnungsmodus:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Eine Verbindung für dieses mobile Brei_tbandgerät einrichten:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Irgendein Gerät"
 
-#: ../src/libnma/nma-mobile-wizard.c:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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.c:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Neue mobile Breitbandverbindung"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../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:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../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:55 ../src/libnm-gtk/nm-ui-utils.c:620
+#: ../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:56 ../src/libnm-gtk/nm-ui-utils.c:621
+#: ../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.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Sekundäres Passwort:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "_Tertiäres Passwort:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
 msgid "Sh_ow passwords"
 msgstr "Passwörter _zeigen"
 
-#: ../src/libnma/nma-wifi-dialog.c:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Klicken Sie zum Verbinden"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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"
@@ -3370,20 +3367,20 @@ 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/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Neu …"
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "E_rzeugen"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3391,36 +3388,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:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Legitimierung für Funknetzwerk wird benötigt"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Legitimierung für Funknetzwerk wird benötigt"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Neues Funknetzwerk erstellen"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Neues Funknetzwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Mit einem verborgenen Funknetzwerk verbinden"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Verborgenes Funknetzwerk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3440,23 +3437,23 @@ msgstr "_Verbindung:"
 msgid "Wi-Fi _adapter:"
 msgstr "Funknetzwerkk_arte:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../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:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC-Mesh-Netzwerk"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3466,17 +3463,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3484,7 +3481,7 @@ msgstr ""
 "Dieses Programm ist eine Komponente von NetworkManager (https://wiki.gnome."
 "org/Projects/NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3492,151 +3489,151 @@ msgstr ""
 "Es ist nicht für die Befehlszeileninteraktion bestimmt, sondern für den "
 "Betrieb innerhalb der GNOME-Arbeitsumgebung."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nicht aktiviert"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nicht angemeldet"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Heimnetzwerk (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Heimnetzwerk"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "Suche läuft"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "Registrierung abgelehnt"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Roaming-Netzwerk (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Roaming-Netzwerk"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, 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:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN-Code erforderlich"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 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:610
+#: ../src/mobile-helpers.c:619
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Mobile Breitbandverbindung »%s« ist aktiv: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "Roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Verbindung mit %s"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 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:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "Nicht spezifizierter Fehler beim Überprüfen der eap-method-Datei"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:452
 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:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- oder PEM-Zertifikate (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC-Datei fehlt"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "PAC-Datei wählen …"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC-Dateien (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Alle Dateien"
 
@@ -3672,32 +3669,32 @@ msgstr "I_nnere Legitimierung:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Automatische PAC-Bereitstellung erlauben"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP-Benutzername fehlt"
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP-Passwort fehlt"
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "Ungültiges EAP-PEAP-CA-Zertifikat: %s"
 
-#: ../src/wireless-security/eap-method-peap.c:69
+#: ../src/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "Ungültiges EAP-PEAP-CA-Zertifikat: Kein Zertifikat angegeben"
 
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "CA-Zertifikat auswählen …"
 
@@ -3725,46 +3722,46 @@ msgstr "CA-Zertifikat igno_rieren"
 msgid "PEAP _version:"
 msgstr "_PEAP-Version:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "EAP-Benutzername fehlt"
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "EAP-Passwort fehlt"
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "EAP-TLS-Identität fehlt"
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "Ungültiges EAP-TLS CA-Zertifikat: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "Ungültiges EAP-TLS-CA-Zertifikat: Kein Zertifikat angegeben"
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "Ungültiges EAP-TLS-Passwort: fehlt"
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "Ungültiger privater Schlüssel für EAP-TLS: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "Ungültiges Benutzerzertifikat für EAP-TLS: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Nicht verschlüsselte geheime Schlüssel sind unsicher"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3778,11 +3775,11 @@ msgstr ""
 "\n"
 "Sie können Ihren Schlüssel mittels Openssl durch ein Passwort schützen."
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Ihr persönliches Zertifikat auswählen …"
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Ihren geheimen Schlüssel auswählen …"
 
@@ -3802,36 +3799,36 @@ msgstr "Geheimer _Schlüssel:"
 msgid "_Private key password:"
 msgstr "_Passwort des geheimen Schlüssels:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "Ungültiges EAP-TTLS-CA-Zertifikat: %s"
 
-#: ../src/wireless-security/eap-method-ttls.c:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "Ungültiges EAP-TTLS-CA-Zertifikat: Kein Zertifikat angegeben"
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../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:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Getunneltes TLS"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Geschütztes EAP (PEAP)"
 
@@ -3841,11 +3838,11 @@ msgstr "Geschütztes EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Legitimierung:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "LEAP-Benutzername fehlt"
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "LEAP-Passwort fehlt"
 
@@ -3909,7 +3906,7 @@ msgstr "Schlüssel an_zeigen"
 msgid "WEP inde_x:"
 msgstr "WEP-Inde_x:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3918,7 +3915,7 @@ 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:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 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 "
@@ -3928,6 +3925,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Typ:"
 
+#~ msgid "_Help"
+#~ msgstr "_Hilfe"
+
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "WiMA_X Mobiles Breitband aktivieren"
 
diff --git a/po/dz.po b/po/dz.po
index abd986b3..7425ff5d 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-15 03:35+0000\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,725 +20,4077 @@ msgstr ""
 "X-Poedit-Country: Bhutan\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: ../src/applet-compat.c:171
-#: ../src/applet-dbus-info.c:937
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#, fuzzy
+msgid "Network"
+msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
+
+#: ../nm-applet.desktop.in.h:2
+#, fuzzy
+msgid "Manage your network connections"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#, fuzzy
+msgid "Network Connections"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+msgid "Disable connected notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+msgid "Disable disconnected notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+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
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+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 WiFi Create"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "མཐུད། (_o)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#, fuzzy
+msgid "_Network name:"
+msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
+
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr ""
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr ""
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འཐུས་ཤོར་"
+
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་ལུ་མཐུད་མ་ཚུགས།"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+#, fuzzy
+msgid "Don't show this message again"
+msgstr "ང་ལུ་ལོག་དྲན་བསྐུལ་མ་འབད། (_D)"
+
+#: ../src/applet.c:844
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
+
+#: ../src/applet.c:847
 #, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་%sགི་དོན་ལུ་ཆོག་ཚིག་"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+
+#: ../src/applet.c:850
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུག་  ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ཝི་པི་ཨེན་སར་བར་དེ་གིས་དགོས་མཁོ་ལྡན་"
+"པའི་ཡོངས་འབྲེལ་རིམ་སྒྲིག་སླར་ལོག་འབདཝ་ལས་ཨིན།"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../src/applet.c:853
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
+
+#: ../src/applet.c:856
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུག་  ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ཝི་པི་ཨེན་སར་བར་དེ་གིས་དགོས་མཁོ་ལྡན་"
+"པའི་ཡོངས་འབྲེལ་རིམ་སྒྲིག་སླར་ལོག་འབདཝ་ལས་ཨིན།"
+
+#: ../src/applet.c:859
 #, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "ཁྱོད་ Ad-Hoc རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལུ་མཐུད་དེཡོདཔ་ཨིན།"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
 
-#: ../src/applet-dbus-devices.c:903
+#: ../src/applet.c:862
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "ཁྱོད་རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s'ལུ་མཐུད་དེ་ཡོདཔ་ཨིན།"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
 
-#: ../src/applet-dbus-devices.c:910
-msgid "You are now connected to the wired network."
-msgstr "ཝའེརཊི་ཡོངས་འབྲེལ་ལུ་ཁྱོད་མཐུད་དེ་ཡོདཔ་ཨིན།"
+#: ../src/applet.c:865
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
-msgstr "མཐུད་ལམ་གཞི་འཛུགས་འབད་དེ་ཡོདཔ་ཨིན་"
+#: ../src/applet.c:872
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+
+#: ../src/applet.c:888
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
+
+#: ../src/applet.c:891
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
+
+#: ../src/applet.c:897
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr "ཡོངས་འབྲེལ་མཐུན་ལམ་འདི་ མཐུད་ལམ་བཏོག་ཡོདཔ།"
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཕྲིན་དོན་"
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+#, fuzzy
+msgid "VPN Connection Failed"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འཐུས་ཤོར་"
+
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/applet.c:993
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
+
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr ""
+
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr ""
+
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#, fuzzy
+msgid "disconnected"
+msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
+
+#: ../src/applet.c:1308
+#, fuzzy
+msgid "Disconnect"
+msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
+
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr ""
+
+#: ../src/applet.c:1395
+#, fuzzy
+msgid "No network devices available"
+msgstr "ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ཐོབ་མ་ཚུགས་"
+
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "ཝི་པི་ཨེན་རིམ་སྒྲིག་འབད... (_C)"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../src/applet.c:1508
+#, fuzzy
+msgid "_Disconnect VPN"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་བཏོག... (_D)"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པ་འདི་ལཱ་མི་འབད་བས..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་མེད་བཟོ་ཡོདཔ་"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་ཅན་བཟོ། (_N)"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "རླུང་འཕྲིན་ལྕོགས་ཅན་བཟོ། (_W)"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr ""
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "མཐུད་ལམ་བརྡ་དོན། (_I)"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+#, fuzzy
+msgid "Edit Connections..."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "སྐོར་ལས། (_A)"
+
+#: ../src/applet.c:2179
+#, fuzzy, c-format
+msgid "You are now connected to '%s'."
+msgstr "ཁྱོད་རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s'ལུ་མཐུད་དེ་ཡོདཔ་ཨིན།"
+
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "མཐུད་ལམ་བཏོག་ཡོདཔ་"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "ཡོངས་འབྲེལ་མཐུན་ལམ་འདི་ མཐུད་ལམ་བཏོག་ཡོདཔ།"
 
-#: ../src/applet-dbus.c:274
+#: ../src/applet.c:2474
+#, fuzzy, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#: ../src/applet.c:2477
 #, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s' ལུ་མཐུད་མ་ཚུགས།"
+msgid "User authentication required for network connection '%s'..."
+msgstr ""
 
-#: ../src/applet-dbus.c:279
-msgid "Connection to the wired network failed."
-msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་ལུ་མཐུད་མ་ཚུགས།"
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, fuzzy, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལས་ཡོངས་འབྲེལ་ཁ་བྱང་གཅིག་ཞུ་བ་འབད་དོ..."
+
+#: ../src/applet.c:2483
+#, fuzzy, c-format
+msgid "Network connection '%s' active"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: ../src/applet.c:2557
+#, fuzzy, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུགས་"
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2563
+#, fuzzy, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལས་ཡོངས་འབྲེལ་ཁ་བྱང་གཅིག་ཞུ་བ་འབད་དོ..."
+
+#: ../src/applet.c:2566
+#, fuzzy, c-format
+msgid "VPN connection '%s' active"
+msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་"
+
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr ""
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr ""
 
-#: ../src/applet.c:186
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr ""
+
+#: ../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
+msgid "Mobile Broadband"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr ""
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "མཐུད་ལམ་གཞི་འཛུགས་འབད་དེ་ཡོདཔ་ཨིན་"
+
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "ཝའེརཊི་ཡོངས་འབྲེལ་ལུ་ཁྱོད་མཐུད་དེ་ཡོདཔ་ཨིན།"
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:957
+#, fuzzy
+msgid "You are now registered on the home network."
+msgstr "ཝའེརཊི་ཡོངས་འབྲེལ་ལུ་ཁྱོད་མཐུད་དེ་ཡོདཔ་ཨིན།"
+
+#: ../src/applet-device-broadband.c:963
+#, fuzzy
+msgid "You are now registered on a roaming network."
+msgstr "ཝའེརཊི་ཡོངས་འབྲེལ་ལུ་ཁྱོད་མཐུད་དེ་ཡོདཔ་ཨིན།"
+
+#: ../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
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:30
+msgid "Auto Ethernet"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
+
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
+
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
+msgstr "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
+
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
+msgstr "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
+
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
+msgstr "ཝའེརཊི་ཡོངས་འབྲེལ་ལུ་ཁྱོད་མཐུད་དེ་ཡོདཔ་ཨིན།"
+
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s'གི་དོན་ལུ་ ཐབས་འཕྲུལ་ %sའདི་གྲ་སྒྲིག་འབད་དོ..."
+
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
+msgstr "'%s' (%d%%)ལུ་རླུང་འཕྲིན་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#: ../src/applet-device-ethernet.c:167
+#, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr ""
+
+#: ../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
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
+msgstr "'%s' (%d%%)ལུ་རླུང་འཕྲིན་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#: ../src/applet-device-ethernet.c:346
+#, fuzzy
+msgid "DSL authentication"
+msgstr "བདེན་བཤད:"
+
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གཞན་མི་ལུ་མཐུད... (_C)"
+
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད... (_N)"
+
+#: ../src/applet-device-wifi.c:431
+msgid "(none)"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
+
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
+
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
+msgstr[1] "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
+
+#: ../src/applet-device-wifi.c:934
+msgid "Wi-Fi is disabled"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:996
+#, fuzzy
+msgid "More networks"
+msgstr "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
+
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
+msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་མེད་བཟོ་ཡོདཔ་"
+
+#: ../src/applet-device-wifi.c:1181
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1364
+#, fuzzy, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "ཁྱོད་རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s'ལུ་མཐུད་དེ་ཡོདཔ་ཨིན།"
+
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#: ../src/applet-device-wifi.c:1405
+#, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལས་ཡོངས་འབྲེལ་ཁ་བྱང་གཅིག་ཞུ་བ་འབད་དོ..."
+
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr "'%s' (%d%%)ལུ་རླུང་འཕྲིན་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
+
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
 
-#: ../src/applet.c:204
-msgid "Could not find some required resources (the glade file)!"
-msgstr "དགོ་པའི་ཐོན་ཁུངས་(གེལེཌི་ཡིག་སྣོད་) ལ་ལོ་ཅིག་ཐོབ་མ་ཚུགས!"
+#: ../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
+msgid "LEAP"
+msgstr ""
 
-#: ../src/applet.c:215
-msgid "No active connections!"
-msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
+#: ../src/applet-dialogs.c:74
+msgid "Dynamic WEP"
+msgstr "ནུས་ཅན་ཌབ་ལུ་ཨི་པི་"
 
-#: ../src/applet.c:236
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
+msgid "WPA/WPA2"
+msgstr ""
+
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+msgid "More addresses"
+msgstr ""
+
+#: ../src/applet-dialogs.c:226
+msgid "WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, 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
 #, c-format
-msgid "Wired Ethernet (%s)"
+msgid "%u Mb/s"
+msgstr ""
+
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+msgctxt "Speed"
+msgid "Unknown"
+msgstr ""
+
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "ཨའི་པི་ཁ་བྱང་:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "རྒྱང་བསྒྲགས་འབད་བའི་ཁ་བྱང་:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "སབ་ནེཊི་གདོང་ཁེབས:"
+
+#: ../src/applet-dialogs.c:492
+#, fuzzy, c-format
+msgid "Ethernet (%s)"
 msgstr "ཝའིརཌི་ཨི་ཐར་ནེཊི་(%s)"
 
-#: ../src/applet.c:238
+#: ../src/applet-dialogs.c:495
 #, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "རླུང་འཕྲིན་ཨི་ཐར་ནེཊི་(%s)"
+msgid "802.11 WiFi (%s)"
+msgstr ""
 
-#: ../src/applet.c:334
-#: ../src/applet.c:360
-msgid "NetworkManager Applet"
-msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་"
+#: ../src/applet-dialogs.c:502
+#, c-format
+msgid "GSM (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:504
+#, c-format
+msgid "CDMA (%s)"
+msgstr ""
+
+#. --- General ---
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
+msgid "General"
+msgstr ""
 
-#: ../src/applet.c:336
+#: ../src/applet-dialogs.c:516
+msgid "Interface:"
+msgstr "ངོས་འདྲ་བ:"
+
+#: ../src/applet-dialogs.c:536
+msgid "Hardware Address:"
+msgstr "སྲ་ཆས་ཁ་བྱང་:"
+
+#. Driver
+#: ../src/applet-dialogs.c:550
+msgid "Driver:"
+msgstr "འདྲེན་བྱེད:"
+
+#: ../src/applet-dialogs.c:585
+msgid "Speed:"
+msgstr "མགྱོགས་ཚད:"
+
+#: ../src/applet-dialogs.c:600
+#, fuzzy
+msgid "Security:"
+msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+msgid "IPv4"
+msgstr ""
+
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "སྔོན་སྒྲིག་འགྲུལ་ལམ:"
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+msgid "IPv6"
+msgstr ""
+
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+msgid "Ignored"
+msgstr ""
+
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "དབྱེ་བ:"
+
+#: ../src/applet-dialogs.c:822
+msgid "VPN Gateway:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:828
+#, fuzzy
+msgid "VPN Username:"
+msgstr "ལག་ལེན་པའི་མིང་:"
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr ""
+
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:957
+#, fuzzy
+msgid "No valid active connections found!"
+msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
+
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2006 Red Hat, Inc.\n"
-"Copyright © 2005-2006 Novell, Inc."
+"Copyright © 2004-2014 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.c:338
-#: ../src/applet.c:364
-msgid "Notification area applet for managing your network devices and connections."
-msgstr "ཁྱོད་རའི་ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ཚུ་དང་མཐུད་ལམ་ཚུ་འཛིན་སྐྱོང་འཐབ་ནིའི་དོན་ལུ་  བརྡ་བསྐུལ་མངའ་ཁོངས་ཨེཔ་ལེཊི།"
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr ""
+"ཁྱོད་རའི་ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ཚུ་དང་མཐུད་ལམ་ཚུ་འཛིན་སྐྱོང་འཐབ་ནིའི་དོན་ལུ་  བརྡ་བསྐུལ་མངའ་ཁོངས་ཨེཔ་"
+"ལེཊི།"
+
+#: ../src/applet-dialogs.c:990
+#, fuzzy
+msgid "NetworkManager Website"
+msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་"
+
+#: ../src/applet-dialogs.c:1005
+msgid "Missing resources"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1030
+msgid "Mobile broadband network password"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1039
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr ""
+
+#: ../src/applet-dialogs.c:1054
+msgid "Password:"
+msgstr "ཆོག་ཡིག:"
 
-#: ../src/applet.c:341
-#: ../src/applet.c:368
-msgid "translator-credits"
-msgstr "སྐད་བསྒྱུར་པའི་-ངོ་བསྟོད་ཚུ་"
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr ""
 
-#: ../src/applet.c:362
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr ""
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
+#, c-format
 msgid ""
-"Copyright © 2004-2005 Red Hat, Inc.\n"
-"Copyright © 2005-2006 Novell, Inc."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
 msgstr ""
-"Copyright © 2004-2005 Red Hat, Inc.\n"
-"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:424
-msgid "VPN Login Failure"
-msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར་"
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr ""
 
-#: ../src/applet.c:425
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr "ནང་བསྐྱོད་འཐུས་ཤོར་ལས་བརྟེན་  ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་འགོ་བཙུགས་མ་ཚུགས།"
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr ""
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr ""
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
+
+#: ../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
+msgid ""
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
+msgstr ""
 
-#: ../src/applet.c:429
-msgid "VPN Start Failure"
-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: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
+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: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
+msgid "_Delete"
+msgstr ""
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr ""
+
+#: ../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…"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+msgid "Choose a Connection Type"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+msgid ""
+"Select the type of connection you wish to create.\n"
+"\n"
+"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."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "རྒྱང་བསྒྲགས་འབད་བའི་ཁ་བྱང་:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "པི་ཨེ་པི་"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "ངོས་འདྲ་བ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+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:"
+msgstr ""
 
-#: ../src/applet.c:430
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "ཌི་ཨེན་ཨེསི་གཙོ་རིམ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+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.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་ཅན་བཟོ། (_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr ""
+
+#: ../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
-msgid "Could not start the VPN connection '%s' due to a failure launching the VPN program."
-msgstr "ཝི་པི་ཨེན་ལས་རིམ་གཞི་བཙུགས་འབདཝ་ད་འཐུས་ཤོར་ལས་བརྟེན་  ཝི་པི་ཨེན་མཐུད་ལམ་'%s'འགོ་བཙུགས་མ་ཚུགས།"
+msgid "default"
+msgstr ""
 
-#: ../src/applet.c:434
-#: ../src/applet.c:444
-msgid "VPN Connect Failure"
-msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་འཐུས་ཤོར་"
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "ཨའི་པི་ཁ་བྱང་:"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "ཨའི་པི་ཁ་བྱང་:"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:435
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+msgid "device"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:591
+#, fuzzy
+msgid "Failed to update connection secrets due to an unknown error."
 msgstr "མཐུད་ལམ་འཛོལ་བ་ལུ་བརྟན་  ཝི་པི་ཨེན་མཐུད་ལམ་ '%s' འགོ་བཙུགས་མ་ཚུགས།"
 
-#: ../src/applet.c:439
-msgid "VPN Configuration Error"
-msgstr "ཝི་པི་ཨེན་རིམ་སྒྲིག་འཛོལ་བ་"
+#: ../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.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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
+#, fuzzy
+msgid "_Username:"
+msgstr "ལག་ལེན་པའི་མིང་:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#, 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
+#, 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-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
+#, fuzzy
+msgid "Automatic"
+msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#, fuzzy
+msgid "_Speed:"
+msgstr "མགྱོགས་ཚད:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr ""
+
+#: ../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
+msgid "_Device:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+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 ""
+"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-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "སྔོན་སྒྲིག་འགྲུལ་ལམ:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "རྒྱང་བསྒྲགས་འབད་བའི་ཁ་བྱང་:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+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.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "མཐུད། (_o)"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+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:186
+#: ../src/connection-editor/page-ip6.c:204
+msgid "Shared to other computers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#, fuzzy
+msgid "_Method:"
+msgstr "ཨི་ཨེ་པི་ཐབས་ལམ:"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#, fuzzy
+msgid "Addresses"
+msgstr "ཨའི་པི་ཁ་བྱང་:"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr ""
+
+#: ../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
+msgid "S_earch domains:"
+msgstr ""
+
+#: ../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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+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:17
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+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
+msgid "Basic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "Nu_mber:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Advanced"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "_APN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#, fuzzy
+msgid "N_etwork ID:"
+msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#, fuzzy
+msgid "Sho_w passwords"
+msgstr "ཆོག་ཡིག་ཚུ་སྟོན་"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#, fuzzy
+msgid "Authentication"
+msgstr "བདེན་བཤད:"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
+msgid "Allowed methods:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+msgid "Compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
+msgid "_Require 128-bit encryption"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+msgid "Use _stateful MPPE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Allow _BSD data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
+msgid "Allow _Deflate data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Use TCP _header compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid "Send PPP _echo packets"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+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.h:3
+msgid "Cloned MAC _address:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
+msgid "Device name + number"
+msgstr ""
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/applet.c:440
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Allowed Authentication Methods"
+msgstr "བདེན་བཤད:"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#, fuzzy
+msgid "_MSCHAP"
+msgstr "MSCHAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#, fuzzy
+msgid "MSCHAP v_2"
+msgstr "MSCHAPV2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "སྲ་ཆས་ཁ་བྱང་:"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+msgid "Import a saved VPN configuration..."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:332
+#, fuzzy
+msgid "Could not create new connection"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: ../src/connection-editor/connection-helpers.c:469
+#, fuzzy
+msgid "Connection delete failed"
+msgstr "མཐུད་ལམ་གཞི་འཛུགས་འབད་དེ་ཡོདཔ་ཨིན་"
+
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
-msgid "The VPN connection '%s' was not correctly configured."
-msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr ""
 
-#: ../src/applet.c:445
+#: ../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
+#, fuzzy
+msgid "Address"
+msgstr "ཨའི་པི་ཁ་བྱང་:"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr ""
+
+#: ../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
+msgid "Gateway"
+msgstr ""
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr ""
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
-msgid "Could not start the VPN connection '%s' because the VPN server did not return an adequate network configuration."
-msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུག་  ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ཝི་པི་ཨེན་སར་བར་དེ་གིས་དགོས་མཁོ་ལྡན་པའི་ཡོངས་འབྲེལ་རིམ་སྒྲིག་སླར་ལོག་འབདཝ་ལས་ཨིན།"
+msgid "Editing %s"
+msgstr ""
 
-#: ../src/applet.c:515
-msgid "VPN Login Message"
-msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཕྲིན་དོན་"
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
 
-#: ../src/applet.c:739
-#: ../src/applet.c:2536
-#: ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:232
-msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)."
-msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཏི་འདི་གིས་  དགོས་མཁོ་ཡོད་པའི་ཐོན་ཁུངས་(གེལེཌི་ཡིག་སྣོད་འདི་ཐོབ་མ་ཚུགས་)ལ་ལོ་ཅིག་ཐོབ་མ་ཚུགས།"
+#: ../src/connection-editor/nm-connection-editor.c:187
+msgid "Editor initializing..."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "མཐུད་ལམ་གཞི་འཛུགས་འབད་དེ་ཡོདཔ་ཨིན་"
 
-#: ../src/applet.c:751
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr "ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ \"%s (%s)\" རླུང་འཕྲིན་ཞིབ་ལྟའབད་ནི་ལུ་རྒྱབ་སྐྱོར་མི་འབད།"
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+#, 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:419
+msgid "_Save"
+msgstr ""
 
-#: ../src/applet.c:759
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not edit connection"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+#, 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
+#, fuzzy
+msgid "Connection _name:"
+msgstr "མཐུད་ལམ་བརྡ་དོན། (_I)"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr ""
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr "ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ \"%s (%s)\" དེ་གིས་འབྲེལ་ལམ་སྐྱོན་འཛིན་འབད་མི་ལུ་རྒྱབ་སྐྱོར་མི་འབད།"
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/applet.c:906
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་གྱི་དོན་ལུ་  ཐབས་འཕྲུལ་ %sགྲ་སྒྲིག་འབད་དོ..."
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/applet.c:908
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s'གི་དོན་ལུ་ ཐབས་འཕྲུལ་ %sའདི་གྲ་སྒྲིག་འབད་དོ..."
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/applet.c:916
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་གྱི་དོན་ལུ་ ཐབས་འཕྲུལ་ %sའདི་རིམ་སྒྲིག་འབད་དོ..."
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/applet.c:918
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་  '%s'མཐུད་ནི་ལུ་དཔའ་བཅམ་དོ..."
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/applet.c:926
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:684
+#, fuzzy
+msgid "Edit the selected connection"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s'དང་ཅིག་ཁར་ ཡོངས་འབྲེལ་ལྡེ་མིག་གི་དོན་ལུ་བསྒུག་དོ..."
+msgid "Don't know how to create '%s' connections"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:933
+#, fuzzy
+msgid "Error creating connection"
+msgstr "ཤུགས་ལྡན་མཐུད་ལམ་ཚུ་མེདཔ་ཨིན!"
 
-#: ../src/applet.c:934
-#: ../src/applet.c:944
-msgid "Requesting a network address from the wired network..."
-msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་ལས་ཡོངས་འབྲེལ་ཁ་བྱང་ཞུ་བ་འབད་དོ..."
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "མཐུད་ལམ་བརྡ་དོན་བཀྲམ་སྟོན་འབདཝ་ད་འཛོལ་བ:"
 
-#: ../src/applet.c:936
-#: ../src/applet.c:946
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལས་ཡོངས་འབྲེལ་ཁ་བྱང་གཅིག་ཞུ་བ་འབད་དོ..."
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:111
+msgid "Could not load 802.1x Security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr ""
 
-#: ../src/applet.c:954
-msgid "Finishing connection to the wired network..."
-msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་ལུ་མཐུད་ལམ་མཇུག་བསྡུ་དོ..."
+#: ../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
+msgid "Could not load Bluetooth user interface."
+msgstr ""
 
-#: ../src/applet.c:956
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལུ་མཐུད་ལམ་མཇུག་བསྡུ་དོ..."
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
 
-#: ../src/applet.c:1073
-msgid "NetworkManager is not running"
-msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་འདི་ལཱ་མི་འབད་བས་"
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/applet.c:1081
-#: ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་མེད་བཟོ་ཡོདཔ་"
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
 
-#: ../src/applet.c:1086
-msgid "No network connection"
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "ཡོངས་འབྲེལ་ལུ་ནང་བསྐྱོད་འབད། (_L)"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "ཌི་ཨེན་ཨེསི་གཙོ་རིམ:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
 msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
 
-#: ../src/applet.c:1091
-msgid "Wired network connection"
+#: ../src/connection-editor/page-bridge.c:213
+msgid "Could not load bridge user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+msgid "Could not load bridge port user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+msgid "Could not load DCB user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:129
+msgid "Could not load DSL user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:214
+#, fuzzy, c-format
+msgid "DSL connection %d"
+msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+
+#: ../src/connection-editor/page-ethernet.c:74
+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:328
+msgid "Could not load ethernet user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:457
+msgid "Ethernet device"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+msgid "cloned MAC"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:465
+#, fuzzy
+msgid "Wake-on-LAN password"
+msgstr "ཆོག་ཡིག་སྟོན་"
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, fuzzy, c-format
+msgid "Ethernet connection %d"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet.c:1095
-msgid "Connected to an Ad-Hoc wireless network"
-msgstr "Ad-Hocརླུང་འཕྲིན་ཡོངས་འབྲེལ་ལུ་མཐུད་དེ་ཡོད་"
+#. 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
+#, fuzzy
+msgid "Default"
+msgstr "སྔོན་སྒྲིག་འགྲུལ་ལམ:"
+
+#: ../src/connection-editor/page-general.c:52
+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 "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པ་འདི་ལཱ་མི་འབད་བས..."
 
-#: ../src/applet.c:1097
+#: ../src/connection-editor/page-general.c:350
+msgid "Could not load General user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "'%s' (%d%%)ལུ་རླུང་འཕྲིན་ཡོངས་འབྲེལ་མཐུད་ལམ་"
+msgid "InfiniBand connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
+#, fuzzy
+msgid "Automatic (VPN)"
+msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
 
-#: ../src/applet.c:1118
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
+msgid "Automatic (VPN) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
+#, fuzzy
+msgid "Automatic (PPPoE)"
+msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
+
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
+msgid "Automatic (PPPoE) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:135
+#, fuzzy
+msgid "Automatic (DHCP)"
+msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
+
+#: ../src/connection-editor/page-ip4.c:136
+msgid "Automatic (DHCP) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
+msgid "Link-Local Only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+msgid "Additional DNS ser_vers:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+msgid "Additional s_earch domains:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
-msgid "VPN connection to '%s'"
-msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+msgid "Editing IPv4 routes for %s"
+msgstr ""
 
-#: ../src/applet.c:1126
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1160
+msgid "Could not load IPv4 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
-msgid "VPN connecting to '%s'"
-msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1539
-msgid "_Connect to Other Wireless Network..."
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གཞན་མི་ལུ་མཐུད... (_C)"
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1560
-msgid "Create _New Wireless Network..."
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད... (_N)"
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1683
-msgid "_VPN Connections"
-msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1728
-msgid "_Configure VPN..."
-msgstr "ཝི་པི་ཨེན་རིམ་སྒྲིག་འབད... (_C)"
+#: ../src/connection-editor/page-ip6.c:148
+msgid "Ignore"
+msgstr ""
 
-#: ../src/applet.c:1732
-msgid "_Disconnect VPN..."
-msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་བཏོག... (_D)"
+#: ../src/connection-editor/page-ip6.c:172
+#, fuzzy
+msgid "Automatic, DHCP only"
+msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
 
-#: ../src/applet.c:1754
-msgid "_Dial Up Connections"
-msgstr "མཐུད་ལམ་ཚུ་ཌེལ་ཨཔ། (_D)"
+#: ../src/connection-editor/page-ip6.c:964
+#, c-format
+msgid "Editing IPv6 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr ""
 
-#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1765
+#: ../src/connection-editor/page-ip6.c:1157
+msgid "Could not load IPv6 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
-msgid "Connect to %s..."
-msgstr "%sལུ་མཐུད..."
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1772
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
-msgid "Disconnect from %s..."
-msgstr "%s ལས་མཐུད་ལམ་བཏོག..."
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1822
-msgid "No network devices have been found"
-msgstr "ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ཐོབ་མ་ཚུགས་"
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:2014
-msgid "NetworkManager is not running..."
-msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པ་འདི་ལཱ་མི་འབད་བས..."
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2193
-msgid "Enable _Networking"
-msgstr "ཡོངས་འབྲེལ་བཟོ་བ་ལྕོགས་ཅན་བཟོ། (_N)"
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2199
-msgid "Enable _Wireless"
-msgstr "རླུང་འཕྲིན་ལྕོགས་ཅན་བཟོ། (_W)"
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
 
-#. 'Connection Information' item
-#: ../src/applet.c:2205
-msgid "Connection _Information"
-msgstr "མཐུད་ལམ་བརྡ་དོན། (_I)"
+#: ../src/connection-editor/page-master.c:260
+#, c-format
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2216
-msgid "_Help"
-msgstr "གྲོགས་རམ། (_H)"
+#: ../src/connection-editor/page-master.c:385
+#, c-format
+msgid "%s slave %d"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2225
-msgid "_About"
-msgstr "སྐོར་ལས། (_A)"
+#: ../src/connection-editor/page-mobile.c:310
+msgid "Could not load mobile broadband user interface."
+msgstr ""
 
-#: ../src/applet.c:2697
-msgid "The NetworkManager applet could not find some required resources.  It cannot continue.\n"
-msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་འདི་གིས་  དགོས་མཁོ་ཡོད་པའི་ཐོན་ཁུངས་ཐོབ་མ་ཚུགས།  འདི་འཕྲོ་མཐུད་མི་ཚུགས།\n"
+#: ../src/connection-editor/page-mobile.c:327
+msgid "Unsupported mobile broadband connection type."
+msgstr ""
 
-#: ../src/applet.glade.h:1
-msgid " "
-msgstr " "
+#. Fall back to just asking for GSM vs. CDMA
+#: ../src/connection-editor/page-mobile.c:529
+msgid "Select Mobile Broadband Provider Type"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
 
-#: ../src/applet.glade.h:2
-msgid "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">ཤུགས་ལྡན་མཐུད་ལམ་བརྡ་དོན</span>"
+#: ../src/connection-editor/page-mobile.c:561
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+msgstr ""
 
-#: ../src/applet.glade.h:4
-#, no-c-format
+#: ../src/connection-editor/page-mobile.c:568
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+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:258
+msgid "PAP"
+msgstr "པི་ཨེ་པི་"
+
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
+#, fuzzy
+msgid "CHAP"
+msgstr "MSCHAP"
+
+#: ../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
+#, fuzzy
+msgid "MSCHAPv2"
+msgstr "MSCHAPV2"
+
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:136
+msgid "none"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:196
+#, c-format
+msgid "Editing PPP authentication methods for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:281
+msgid "Could not load PPP user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+msgid "Could not load team user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "ཡོངས་འབྲེལ་མཐུད་ལམ་མེད་"
+
+#: ../src/connection-editor/page-vlan.c:596
+msgid "Could not load vlan user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+
+#: ../src/connection-editor/page-vpn.c:103
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:118
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
+#, fuzzy, c-format
+msgid "VPN connection %d"
+msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless Network</span>\n"
+"The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
-"A passphrase or encryption key is required to access the wireless network '%s'."
+"Error: no VPN service type."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱིས་དགོས་མཁོ་ཡོད་པའི་ཆོག་ཚིག་</span>\n"
-"\n"
-"ཆོག་ཚིག་ཡང་ན་གསང་བཟོ་ལྡེ་མིག་འདི་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s' འཛུལ་སྤྱོད་འབད་ནི་ལུ་དགོཔ་ཨིན།"
 
-#: ../src/applet.glade.h:8
-#, no-c-format
+#: ../src/connection-editor/page-vpn.c:254
+#, fuzzy
+msgid "Choose a VPN Connection Type"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
+
+#: ../src/connection-editor/page-vpn.c:255
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
-"\n"
-"%s  It will not be completely functional."
+"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 ""
-"<span weight=\"bold\" size=\"larger\">ཡོངས་འབྲེལ་ལས་འགན་ཕབ་ལེན་འབད་ཡོདཔ་</span>\n"
-"\n"
-"%s  འདི་གིས་ལས་འགན་ཅན་ཨིནམ་འོང་།"
 
-#: ../src/applet.glade.h:12
-#, no-c-format
+#: ../src/connection-editor/page-wifi.c:77
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</span>\n"
-"\n"
-"You have chosen to log in to the wireless network '%s'.  If you are sure that this wireless network is secure, click the checkbox below and NetworkManager will not require confirmation on subsequent log ins."
+"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
+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
+#, c-format
+msgid "%u (%u MHz)"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:450
+msgid "Could not load Wi-Fi user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+msgid "Wi-Fi device"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP 128-བིཊི་ཆོག་ཚིག་"
+
+#: ../src/connection-editor/page-wifi-security.c:345
+#: ../src/libnma/nma-wifi-dialog.c:945 ../src/libnm-gtk/nm-wifi-dialog.c:961
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "ནུས་ཅན་ཌབ་ལུ་ཨི་པི་"
+
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#, fuzzy
+msgid "WPA & WPA2 Personal"
+msgstr "WPA2 རང་དོན་"
+
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#, fuzzy
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA2 ཚོང་ལས་"
+
+#: ../src/connection-editor/page-wifi-security.c:413
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
+msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
+
+#: ../src/connection-editor/page-wifi-security.c:426
+msgid "Could not load Wi-Fi security user interface."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">རླུང་འཕྲིན་ཡོངས་འབྲེལ་ནང་བསྐྱོད་ངེས་དཔྱད་</span>\n"
+
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:512
+#, c-format
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:138
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུགས་"
+
+#: ../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"
-"ཁྱོད་ཀྱིས་རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལུ་ནང་བསྐྱོད་འབད་ནི་གདམ་ཁ་བརྐྱབ་ཡོདཔ།  རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདི་མཐའ་བཙན་ཡོདཔ་སྦེ་ ཁྱོད་ངེས་བདེན་ཨིན་པ་ཅིན་, འོག་ལུ་ཡོད་མི་ཞིབ་དཔྱད་སྒྲོམ་ཨེབ་གཏང་འབད་ནི་དང་  ཡོགས་འབྲེལ་འཛིན་སྐྱོང་པ་འདི་  ཤུལ་ལུ་ནང་བསྐྱོད་གུ་ངེས་དཔྱད་མི་དགོ། "
+"Error: %s."
+msgstr ""
 
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr "མིང་མེད་པའི་ངོ་རྟགས:"
+#: ../src/connection-editor/vpn-helpers.c:141
+msgid "unknown error"
+msgstr ""
 
-#: ../src/applet.glade.h:16
-msgid "Authentication:"
-msgstr "བདེན་བཤད:"
+#: ../src/connection-editor/vpn-helpers.c:215
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr ""
 
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr "རྒྱང་བསྒྲགས་འབད་བའི་ཁ་བྱང་:"
+#: ../src/connection-editor/vpn-helpers.c:217
+msgid "_Replace"
+msgstr ""
 
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+#: ../src/connection-editor/vpn-helpers.c:219
+#, c-format
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr ""
 
-#: ../src/applet.glade.h:19
-msgid "C_onnect"
-msgstr "མཐུད། (_o)"
+#: ../src/connection-editor/vpn-helpers.c:255
+#, fuzzy
+msgid "Cannot export VPN connection"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུགས་"
 
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr "ཞབས་ཏོག་སྤྱོད་མི་ལག་ཁྱེར་ཡིག་སྣོད:"
+#: ../src/connection-editor/vpn-helpers.c:257
+#, fuzzy, c-format
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་ལེགས་ཤོམ་སྦེ་རིམ་སྒྲིག་མ་འབད་བས།"
 
-#: ../src/applet.glade.h:21
+#: ../src/connection-editor/vpn-helpers.c:292
+#, fuzzy
+msgid "Export VPN connection..."
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
+
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
+#, fuzzy
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཏི་འདི་གིས་  དགོས་མཁོ་ཡོད་པའི་ཐོན་ཁུངས་(གེལེཌི་ཡིག་སྣོད་འདི་ཐོབ་མ་"
+"ཚུགས་)ལ་ལོ་ཅིག་ཐོབ་མ་ཚུགས།"
+
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr ""
+
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr ""
+
+#: ../src/info.ui.h:1
 msgid "Connection Information"
 msgstr "མཐུད་ལམ་བརྡ་དོན་"
 
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr "སྔོན་སྒྲིག་འགྲུལ་ལམ:"
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr "འགྲོ་ཡུལ་ཁ་བྱང་:"
+#: ../src/info.ui.h:3
+#, fuzzy
+msgid "Active Network Connections"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-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/applet.glade.h:25
-msgid "EAP Method:"
-msgstr "ཨི་ཨེ་པི་ཐབས་ལམ:"
+#. Device
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr ""
 
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr "སྲ་ཆས་ཁ་བྱང་:"
+#. Provider
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr ""
 
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr "ཨའི་པི་ཁ་བྱང་:"
+#. Plan and APN
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr ""
 
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-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/applet.glade.h:29
-msgid "Interface:"
-msgstr "ངོས་འདྲ་བ:"
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr ""
 
-#: ../src/applet.glade.h:30
-msgid "Key Type:"
-msgstr "ལྡེ་མིག་དབྱེ་བ:"
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
+msgstr ""
 
-#: ../src/applet.glade.h:31
-msgid "Key management:"
-msgstr "ལྡེ་མིག་འཛིན་འཛིན་སྐྱོང་:"
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr ""
 
-#: ../src/applet.glade.h:32
-msgid "Key:"
-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/applet.glade.h:33
+#: ../src/libnma/nma-mobile-wizard.c:500
+#: ../src/libnm-gtk/nm-mobile-wizard.c:501
 msgid ""
-"None\n"
-"WEP 128-bit Passphrase\n"
-"WEP 64/128-bit Hex\n"
-"WEP 64/128-bit ASCII\n"
+"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
+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
+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 ""
-"None\n"
-"WEP 128-བིཊི་ཆོག་ཚིག\n"
-"WEP 64/128-བིཊི་ཧེགསི\n"
-"WEP 64/128-བིཊི་ ASCII\n"
 
-#: ../src/applet.glade.h:38
+#: ../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 ""
+
+#: ../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
+msgid "Installed GSM device"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../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
 msgid ""
-"Open System\n"
-"Shared Key"
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
-"རིམ་ལུགས་ཁ་ཕྱེ་\n"
-"རུབ་སྤྱོད་འབད་ཡོད་པའི་ལྡེ་མིག་"
 
-#: ../src/applet.glade.h:40
-msgid "Other Wireless Network..."
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གཞན་མི..."
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
+msgstr ""
 
-#: ../src/applet.glade.h:41
-msgid "Passphrase:"
-msgstr "ཆོག་ཚིག:"
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+msgid "Your broadband provider's name"
+msgstr ""
 
-#: ../src/applet.glade.h:42
-msgid "Password:"
-msgstr "ཆོག་ཡིག:"
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
+msgstr ""
 
-#: ../src/applet.glade.h:43
-msgid "Phase2 Type:"
-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 ""
 
-#: ../src/applet.glade.h:44
-msgid "Primary DNS:"
-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 ""
 
-#: ../src/applet.glade.h:45
-msgid "Private Key File:"
-msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཡིག་སྣོད:"
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr ""
 
-#: ../src/applet.glade.h:46
-msgid "Private Key Password:"
-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/applet.glade.h:47
-msgid "Secondary DNS:"
-msgstr "གལ་གནད་ཆུང་བ་ཌི་ཨེན་ཨེསི:"
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr ""
 
-#: ../src/applet.glade.h:48
-msgid "Select the CA Certificate File"
-msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
+#: ../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/applet.glade.h:49
-msgid "Select the Client Certificate File"
-msgstr "ཞབས་ཏོག་ལག་ཁྱེར་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/applet.glade.h:50
-msgid "Select the Private Key File"
-msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+msgid "Ask for this password every time"
+msgstr ""
 
-#: ../src/applet.glade.h:51
-msgid "Show key"
-msgstr "ལྡེ་མིག་སྟོན་"
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+msgid "The password is not required"
+msgstr ""
 
-#: ../src/applet.glade.h:52
-msgid "Show passphrase"
-msgstr "ཆོག་ཚིག་སྟོན་"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "གལ་གནད་ཆུང་བ་ཌི་ཨེན་ཨེསི:"
 
-#: ../src/applet.glade.h:53
-msgid "Show password"
-msgstr "ཆོག་ཡིག་སྟོན་"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག:"
 
-#: ../src/applet.glade.h:54
-msgid "Show passwords"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
 msgstr "ཆོག་ཡིག་ཚུ་སྟོན་"
 
-#: ../src/applet.glade.h:55
-msgid "Speed:"
-msgstr "མགྱོགས་ཚད:"
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/applet.glade.h:56
-msgid "Subnet Mask:"
-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/applet.glade.h:57
-msgid "Type:"
-msgstr "དབྱེ་བ:"
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
+msgid "New..."
+msgstr ""
 
-#: ../src/applet.glade.h:58
-msgid "User Name:"
-msgstr "ལག་ལེན་པའི་མིང་:"
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ཅི་མེད་"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+msgid "C_reate"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
 
-#: ../src/applet.glade.h:59
-msgid "Wireless Network Key Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ལྡེ་མིག་དགོཔ་"
 
-#: ../src/applet.glade.h:60
-msgid "Wireless _adapter:"
-msgstr "རླུང་འཕྲིན་མཐུན་བྱེད: (_a)"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
 
-#: ../src/applet.glade.h:61
-msgid "_Always Trust this Wireless Network"
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདི་ཨ་རྟག་རང་བློ་གཏད། (_A)"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད་"
 
-#: ../src/applet.glade.h:62
-msgid "_Don't remind me again"
-msgstr "ང་ལུ་ལོག་དྲན་བསྐུལ་མ་འབད། (_D)"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+msgid "New Wi-Fi network"
+msgstr ""
 
-#: ../src/applet.glade.h:63
-msgid "_Login to Network"
-msgstr "ཡོངས་འབྲེལ་ལུ་ནང་བསྐྱོད་འབད། (_L)"
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "ཁྱོད་ཀྱིས་མཐུད་དགོ་མནོ་མི་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་འདི་ཐོ་བཀོད་འབད།"
 
-#: ../src/applet.glade.h:64
-msgid "_Network Name:"
-msgstr "ཡོངས་འབྲེལ་མིང་: (_N)"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "རླུང་འཕྲིན་ཡོངས་འབྲུལ་གཞན་མི་ལུ་མཐུད་"
 
-#: ../src/applet.glade.h:65
-msgid "_Wireless Security:"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, 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:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
 msgstr "རླུང་འཕྲིན་སྲུང་སྐྱོབ: (_W)"
 
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr "ཕྱོགས་"
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#, fuzzy
+msgid "C_onnection:"
+msgstr "མཐུད། (_o)"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "རླུང་འཕྲིན་མཐུན་བྱེད: (_a)"
 
-#: ../src/eggtrayicon.c:135
-msgid "The orientation of the tray."
-msgstr "ཤོག་སྣོད་ཀྱི་ཕྱོགས།"
+#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+msgid "Wired"
+msgstr ""
 
-#: ../src/menu-items.c:88
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
 #, c-format
-msgid "Wired Network (%s)"
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr ""
+
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+
+#: ../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
+msgid "EVDO"
+msgstr ""
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:68
+msgid "HSPA+"
+msgstr ""
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr ""
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr ""
+
+#: ../src/mb-menu-item.c:141
+#, fuzzy, c-format
+msgid "Home network (%s)"
 msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
 
-#: ../src/menu-items.c:91
-msgid "_Wired Network"
+#: ../src/mb-menu-item.c:143
+#, fuzzy, c-format
+msgid "Home network"
 msgstr "ཡོངས་འབྲེལ་ཝའིརཌི། (_W)"
 
-#: ../src/menu-items.c:163
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr ""
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr ""
+
+#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
 #, c-format
-msgid "Wireless Network (%s)"
-msgid_plural "Wireless Networks (%s)"
-msgstr[0] "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ (%s)"
-msgstr[1] "རླུང་འཕྲིན་ཡོངས་འབྲེལ་  (%s)"
+msgid "%s (%s roaming)"
+msgstr ""
 
-#: ../src/menu-items.c:165
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "རླུང་འཕྲིན་ཡོངས་འབྲེལ་"
-msgstr[1] "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ཚུ་"
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#, c-format
+msgid "%s (roaming)"
+msgstr ""
+
+#: ../src/mb-menu-item.c:170
+#, fuzzy, c-format
+msgid "Roaming network (%s)"
+msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་(%s)"
 
-#: ../src/menu-items.c:344
-msgid " (invalid Unicode)"
-msgstr " (ནུས་ཅན་མེད་པའི་ཡུ་ནི་ཀོཌི་)"
+#: ../src/mb-menu-item.c:172
+#, fuzzy, c-format
+msgid "Roaming network"
+msgstr "ཡོངས་འབྲེལ་ལུ་ནང་བསྐྱོད་འབད། (_L)"
 
-#: ../src/other-network-dialog.c:352
+#: ../src/mobile-helpers.c:331
 #, c-format
-msgid "By default, the wireless network's name is set to your computer's name, %s, with no encryption enabled"
-msgstr "སྔོན་སྒྲིག་གིས་སྦེ་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་འདི་ཁྱོད་རའི་རློག་རིག་མིང་ལུ་  %s གསང་བཟོས་ལྕོགས་ཅན་མ་བཟོ་མི་དང་ཅིག་ཁར་གཞི་སྒྲིག་འབད་དེ་ཡོདཔ་ཨིན་"
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
 
-#: ../src/other-network-dialog.c:358
-msgid "Create new wireless network"
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད་"
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr ""
 
-#: ../src/other-network-dialog.c:359
-msgid "Enter the name and security settings of the wireless network you wish to create."
-msgstr "ཁྱོད་རང་བཟོ་དགོ་མནོ་དོ་བཟུམ་སྦེ་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་དང་སྲུང་སྐྱོབ་སྒྲིག་སྟངས་ཚུ་ཐོ་བཀོད་འབད།"
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr ""
 
-#: ../src/other-network-dialog.c:363
-msgid "Create New Wireless Network"
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད་"
+#: ../src/mobile-helpers.c:619
+#, fuzzy, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "'%s' (%d%%)ལུ་རླུང་འཕྲིན་ཡོངས་འབྲེལ་མཐུད་ལམ་"
 
-#: ../src/other-network-dialog.c:368
-msgid "Existing wireless network"
-msgstr "ད་ལྟོ་ཡོད་པའི་རླུང་འཕྲིན་ཡོངས་འབྲེལ་"
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr ""
 
-#: ../src/other-network-dialog.c:369
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr "ཁྱོད་ཀྱིས་མཐུད་དགོ་མནོ་མི་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་འདི་ཐོ་བཀོད་འབད།"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ཚུ། (_V)"
 
-#: ../src/other-network-dialog.c:371
-msgid "Connect to Other Wireless Network"
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲུལ་གཞན་མི་ལུ་མཐུད་"
+#: ../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/passphrase-dialog.c:219
-msgid "Error connecting to wireless network"
-msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ལུ་མཐུད་པའི་བསྒང་འཛོལ་བ་"
+#: ../src/wireless-security/eap-method.c:452
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
 
-#: ../src/passphrase-dialog.c:220
-msgid "The requested wireless network requires security capabilities unsupported by your hardware."
-msgstr "ཞུ་བ་འབད་ཡོད་པའི་རླུང་འཕྲིན་ཡོངས་འབྲེལ་དེ་གིས་  ཁྱོད་རའི་སྲ་ཆས་ཀྱི་རྒྱབ་སྐྱོར་མ་འབད་མི་སྲུང་སྐྱོབ་ལྕོགས་འགྲུབ་འདི་དགོཔ་ཨིན།"
+#: ../src/wireless-security/eap-method.c:455
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr ""
 
-#: ../src/vpn-password-dialog.c:154
-#: ../src/vpn-password-dialog.c:191
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr "ཇི་ཊི་སི་"
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "མིང་མེད་པའི་ངོ་རྟགས:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "བདེན་བཤད:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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
+#, fuzzy
+msgid "Anony_mous identity:"
+msgstr "མིང་མེད་པའི་ངོ་རྟགས:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+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
+#, fuzzy
+msgid "_Inner authentication:"
+msgstr "བདེན་བཤད:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+msgid "missing EAP-LEAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འགོ་བཙུགས་མ་ཚུགས་"
+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
+msgid "MD5"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "C_A certificate:"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+msgid "PEAP _version:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
 
-#: ../src/vpn-password-dialog.c:157
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
+msgid "Unencrypted private keys are insecure"
+msgstr ""
+
+#: ../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)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:475
+msgid "Choose your personal certificate..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:487
+msgid "Choose your private key..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+#, fuzzy
+msgid "I_dentity:"
+msgstr "ངོ་རྟགས:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+#, fuzzy
+msgid "_User certificate:"
+msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+#, fuzzy
+msgid "Private _key:"
+msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཡིག་སྣོད:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+#, fuzzy
+msgid "_Private key password:"
+msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཆོག་ཡིག:"
+
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
+msgid "TLS"
+msgstr "TLS"
+
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
+msgid "Tunneled TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:493
+msgid "Protected EAP (PEAP)"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Au_thentication:"
+msgstr "བདེན་བཤད:"
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
 #, c-format
-msgid "Could not find the authentication dialog for VPN connection type '%s'. Contact your system administrator."
-msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་དབྱེ་བ་ '%s' གི་དོན་ལུ་བདེན་བཤད་ཌའི་ལོག་ཐོབ་མ་ཚུགས།  ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་ལུ་འབྲེལ་བ་འཐབ།"
+msgid ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr ""
 
-#: ../src/vpn-password-dialog.c:194
+#: ../src/wireless-security/ws-wep-key.c:125
 #, c-format
-msgid "There was a problem launching the authentication dialog for VPN connection type '%s'. Contact your system administrator."
-msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་དབྱེ་བ་'%s'གི་དོན་ལུ་བདེན་བཤད་ཌའི་ལོག་གཞི་བཙུགས་འབདཝ་ད་དཀའ་ངལ་བྱུང་ཡོདཔ།  ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་ལུ་འབྲེལ་བ་འཐབ།"
+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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
 
-#: ../src/wireless-security-option.c:157
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
 msgid "Open System"
 msgstr "རིམ་ལུགས་ཁ་ཕྱེ་"
 
-#: ../src/wireless-security-option.c:160
+#: ../src/wireless-security/ws-wep-key.ui.h:6
 msgid "Shared Key"
 msgstr "རུབ་སྤྱོད་འབད་ཡོད་པའི་ལྡེ་མིག་"
 
-#: ../src/wireless-security-option.c:207
-msgid "Automatic (Default)"
-msgstr "རང་བཞིན་གྱི་ (སྔོན་སྒྲིག་)"
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+#, fuzzy
+msgid "_Key:"
+msgstr "ལྡེ་མིག:"
 
-#: ../src/wireless-security-option.c:214
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+#, fuzzy
+msgid "Sho_w key"
+msgstr "ལྡེ་མིག་སྟོན་"
 
-#: ../src/wireless-security-option.c:222
-msgid "TKIP"
-msgstr "TKIP"
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x:"
+msgstr ""
 
-#: ../src/wireless-security-option.c:230
-msgid "Dynamic WEP"
-msgstr "ནུས་ཅན་ཌབ་ལུ་ཨི་པི་"
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+msgstr ""
 
-#: ../src/wireless-security-option.c:252
-msgid "None (Default)"
-msgstr "ཅི་མེད་ (སྔོན་སྒྲིག་)"
+#: ../src/wireless-security/ws-wpa-psk.c:77
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
 
-#: ../src/wireless-security-option.c:257
-msgid "PAP"
-msgstr "པི་ཨེ་པི་"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#, fuzzy
+msgid "_Type:"
+msgstr "དབྱེ་བ:"
 
-#: ../src/wireless-security-option.c:262
-msgid "MSCHAP"
-msgstr "MSCHAP"
+#~ msgid "Passphrase for wireless network %s"
+#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་%sགི་དོན་ལུ་ཆོག་ཚིག་"
 
-#: ../src/wireless-security-option.c:267
-msgid "MSCHAPV2"
-msgstr "MSCHAPV2"
+#~ msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+#~ msgstr "ཁྱོད་ Ad-Hoc རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལུ་མཐུད་དེཡོདཔ་ཨིན།"
 
-#: ../src/wireless-security-option.c:272
-msgid "GTC"
-msgstr "ཇི་ཊི་སི་"
+#~ msgid "Connection to the wireless network '%s' failed."
+#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s' ལུ་མཐུད་མ་ཚུགས།"
 
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr "ཅི་མེད་"
+#~ msgid "Could not find some required resources (the glade file)!"
+#~ msgstr "དགོ་པའི་ཐོན་ཁུངས་(གེལེཌི་ཡིག་སྣོད་) ལ་ལོ་ཅིག་ཐོབ་མ་ཚུགས!"
 
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr "WEP 64/128-བིཊི་ ASCII"
+#~ msgid "Wireless Ethernet (%s)"
+#~ msgstr "རླུང་འཕྲིན་ཨི་ཐར་ནེཊི་(%s)"
 
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr "WEP 64/128-བིཊི་ཧེགསི་"
+#~ msgid "translator-credits"
+#~ msgstr "སྐད་བསྒྱུར་པའི་-ངོ་བསྟོད་ཚུ་"
 
-#: ../src/wso-wep-passphrase.c:135
-msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-བིཊི་ཆོག་ཚིག་"
+#~ msgid ""
+#~ "Copyright © 2004-2005 Red Hat, Inc.\n"
+#~ "Copyright © 2005-2006 Novell, Inc."
+#~ msgstr ""
+#~ "Copyright © 2004-2005 Red Hat, Inc.\n"
+#~ "Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/wso-wpa-eap.c:244
-msgid "PEAP"
-msgstr "PEAP"
+#~ msgid "VPN Login Failure"
+#~ msgstr "ཝི་པི་ཨེན་ནང་བསྐྱོད་འཐུས་ཤོར་"
 
-#: ../src/wso-wpa-eap.c:245
-msgid "TLS"
-msgstr "TLS"
+#~ msgid "Could not start the VPN connection '%s' due to a login failure."
+#~ msgstr "ནང་བསྐྱོད་འཐུས་ཤོར་ལས་བརྟེན་  ཝི་པི་ཨེན་མཐུད་ལམ་ '%s'འདི་འགོ་བཙུགས་མ་ཚུགས།"
 
-#: ../src/wso-wpa-eap.c:246
-msgid "TTLS"
-msgstr "TTLS"
+#~ msgid "VPN Start Failure"
+#~ msgstr "ཝི་པི་ཨེན་འགོ་བཙུགས་མ་ཚུགས་"
 
-#: ../src/wso-wpa-eap.c:254
-msgid "WPA2 Enterprise"
-msgstr "WPA2 ཚོང་ལས་"
+#~ msgid ""
+#~ "Could not start the VPN connection '%s' due to a failure launching the "
+#~ "VPN program."
+#~ msgstr ""
+#~ "ཝི་པི་ཨེན་ལས་རིམ་གཞི་བཙུགས་འབདཝ་ད་འཐུས་ཤོར་ལས་བརྟེན་  ཝི་པི་ཨེན་མཐུད་ལམ་'%s'འགོ་བཙུགས་མ་"
+#~ "ཚུགས།"
+
+#~ msgid "VPN Configuration Error"
+#~ msgstr "ཝི་པི་ཨེན་རིམ་སྒྲིག་འཛོལ་བ་"
+
+#~ msgid "The network device \"%s (%s)\" does not support wireless scanning."
+#~ msgstr "ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ \"%s (%s)\" རླུང་འཕྲིན་ཞིབ་ལྟའབད་ནི་ལུ་རྒྱབ་སྐྱོར་མི་འབད།"
+
+#~ msgid "The network device \"%s (%s)\" does not support link detection."
+#~ msgstr ""
+#~ "ཡོངས་འབྲེལ་ཐབས་འཕྲུལ་ \"%s (%s)\" དེ་གིས་འབྲེལ་ལམ་སྐྱོན་འཛིན་འབད་མི་ལུ་རྒྱབ་སྐྱོར་མི་འབད།"
+
+#~ msgid "Preparing device %s for the wired network..."
+#~ msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་གྱི་དོན་ལུ་  ཐབས་འཕྲུལ་ %sགྲ་སྒྲིག་འབད་དོ..."
 
-#: ../src/wso-wpa-eap.c:256
-msgid "WPA Enterprise"
-msgstr "ཌབ་ལུ་པི་ཨེ་ཚོང་ལས་"
+#~ msgid "Configuring device %s for the wired network..."
+#~ msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་གྱི་དོན་ལུ་ ཐབས་འཕྲུལ་ %sའདི་རིམ་སྒྲིག་འབད་དོ..."
+
+#~ msgid "Attempting to join the wireless network '%s'..."
+#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་  '%s'མཐུད་ནི་ལུ་དཔའ་བཅམ་དོ..."
+
+#~ msgid "Waiting for Network Key for the wireless network '%s'..."
+#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s'དང་ཅིག་ཁར་ ཡོངས་འབྲེལ་ལྡེ་མིག་གི་དོན་ལུ་བསྒུག་དོ..."
+
+#~ msgid "Requesting a network address from the wired network..."
+#~ msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་ལས་ཡོངས་འབྲེལ་ཁ་བྱང་ཞུ་བ་འབད་དོ..."
+
+#~ msgid "Finishing connection to the wired network..."
+#~ msgstr "ཝའིརཌི་ཡོངས་འབྲེལ་ལུ་མཐུད་ལམ་མཇུག་བསྡུ་དོ..."
+
+#~ msgid "Finishing connection to the wireless network '%s'..."
+#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལུ་མཐུད་ལམ་མཇུག་བསྡུ་དོ..."
+
+#~ msgid "NetworkManager is not running"
+#~ msgstr "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་འདི་ལཱ་མི་འབད་བས་"
+
+#~ msgid "Connected to an Ad-Hoc wireless network"
+#~ msgstr "Ad-Hocརླུང་འཕྲིན་ཡོངས་འབྲེལ་ལུ་མཐུད་དེ་ཡོད་"
+
+#~ msgid "VPN connecting to '%s'"
+#~ msgstr "'%s'ལུ་ཝི་པི་ཨེན་མཐུད་ལམ་"
+
+#~ msgid "_Dial Up Connections"
+#~ msgstr "མཐུད་ལམ་ཚུ་ཌེལ་ཨཔ། (_D)"
+
+#~ msgid "Connect to %s..."
+#~ msgstr "%sལུ་མཐུད..."
+
+#~ msgid "Disconnect from %s..."
+#~ msgstr "%s ལས་མཐུད་ལམ་བཏོག..."
+
+#~ msgid "_Help"
+#~ msgstr "གྲོགས་རམ། (_H)"
+
+#~ msgid ""
+#~ "The NetworkManager applet could not find some required resources.  It "
+#~ "cannot continue.\n"
+#~ msgstr ""
+#~ "ཡོངས་འབྲེལ་འཛིན་སྐྱོང་པའི་ཨེཔ་ལེཊི་འདི་གིས་  དགོས་མཁོ་ཡོད་པའི་ཐོན་ཁུངས་ཐོབ་མ་ཚུགས།  འདི་འཕྲོ་མཐུད་"
+#~ "མི་ཚུགས།\n"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">ཤུགས་ལྡན་མཐུད་ལམ་བརྡ་དོན</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+#~ "Network</span>\n"
+#~ "\n"
+#~ "A passphrase or encryption key is required to access the wireless network "
+#~ "'%s'."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱིས་དགོས་མཁོ་ཡོད་པའི་ཆོག་"
+#~ "ཚིག་</span>\n"
+#~ "\n"
+#~ "ཆོག་ཚིག་ཡང་ན་གསང་བཟོ་ལྡེ་མིག་འདི་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་ '%s' འཛུལ་སྤྱོད་འབད་ནི་ལུ་དགོཔ་ཨིན།"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</"
+#~ "span>\n"
+#~ "\n"
+#~ "%s  It will not be completely functional."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">ཡོངས་འབྲེལ་ལས་འགན་ཕབ་ལེན་འབད་ཡོདཔ་</"
+#~ "span>\n"
+#~ "\n"
+#~ "%s  འདི་གིས་ལས་འགན་ཅན་ཨིནམ་འོང་།"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
+#~ "Confirmation</span>\n"
+#~ "\n"
+#~ "You have chosen to log in to the wireless network '%s'.  If you are sure "
+#~ "that this wireless network is secure, click the checkbox below and "
+#~ "NetworkManager will not require confirmation on subsequent log ins."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">རླུང་འཕྲིན་ཡོངས་འབྲེལ་ནང་བསྐྱོད་ངེས་དཔྱད་</"
+#~ "span>\n"
+#~ "\n"
+#~ "ཁྱོད་ཀྱིས་རླུང་འཕྲིན་ཡོངས་འབྲེལ་'%s'ལུ་ནང་བསྐྱོད་འབད་ནི་གདམ་ཁ་བརྐྱབ་ཡོདཔ།  རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདི་"
+#~ "མཐའ་བཙན་ཡོདཔ་སྦེ་ ཁྱོད་ངེས་བདེན་ཨིན་པ་ཅིན་, འོག་ལུ་ཡོད་མི་ཞིབ་དཔྱད་སྒྲོམ་ཨེབ་གཏང་འབད་ནི་དང་  "
+#~ "ཡོགས་འབྲེལ་འཛིན་སྐྱོང་པ་འདི་  ཤུལ་ལུ་ནང་བསྐྱོད་གུ་ངེས་དཔྱད་མི་དགོ། "
+
+#~ msgid "Client Certificate File:"
+#~ msgstr "ཞབས་ཏོག་སྤྱོད་མི་ལག་ཁྱེར་ཡིག་སྣོད:"
+
+#~ msgid "Destination Address:"
+#~ msgstr "འགྲོ་ཡུལ་ཁ་བྱང་:"
+
+#~ msgid "Key Type:"
+#~ msgstr "ལྡེ་མིག་དབྱེ་བ:"
+
+#~ msgid "Key management:"
+#~ msgstr "ལྡེ་མིག་འཛིན་འཛིན་སྐྱོང་:"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP 128-bit Passphrase\n"
+#~ "WEP 64/128-bit Hex\n"
+#~ "WEP 64/128-bit ASCII\n"
+#~ msgstr ""
+#~ "None\n"
+#~ "WEP 128-བིཊི་ཆོག་ཚིག\n"
+#~ "WEP 64/128-བིཊི་ཧེགསི\n"
+#~ "WEP 64/128-བིཊི་ ASCII\n"
+
+#~ msgid ""
+#~ "Open System\n"
+#~ "Shared Key"
+#~ msgstr ""
+#~ "རིམ་ལུགས་ཁ་ཕྱེ་\n"
+#~ "རུབ་སྤྱོད་འབད་ཡོད་པའི་ལྡེ་མིག་"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གཞན་མི..."
+
+#~ msgid "Passphrase:"
+#~ msgstr "ཆོག་ཚིག:"
+
+#~ msgid "Phase2 Type:"
+#~ msgstr "གོ་རིམ་ ༢་པའི་དབྱེ་བ:"
+
+#~ msgid "Select the CA Certificate File"
+#~ msgstr "སི་ཨེ་ལག་ཁྱེར་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
+
+#~ msgid "Select the Client Certificate File"
+#~ msgstr "ཞབས་ཏོག་ལག་ཁྱེར་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
+
+#~ msgid "Select the Private Key File"
+#~ msgstr "སྒེར་སྡེ་ལྡེ་མིག་ཡིག་སྣོད་འདི་སེལ་འཐུ་འབད་"
+
+#~ msgid "Show passphrase"
+#~ msgstr "ཆོག་ཚིག་སྟོན་"
+
+#~ msgid "_Always Trust this Wireless Network"
+#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་འདི་ཨ་རྟག་རང་བློ་གཏད། (_A)"
+
+#~ msgid "Orientation"
+#~ msgstr "ཕྱོགས་"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ཤོག་སྣོད་ཀྱི་ཕྱོགས།"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgid_plural "Wireless Networks (%s)"
+#~ msgstr[0] "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ (%s)"
+#~ msgstr[1] "རླུང་འཕྲིན་ཡོངས་འབྲེལ་  (%s)"
+
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "རླུང་འཕྲིན་ཡོངས་འབྲེལ་"
+#~ msgstr[1] "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ཚུ་"
+
+#~ msgid " (invalid Unicode)"
+#~ msgstr " (ནུས་ཅན་མེད་པའི་ཡུ་ནི་ཀོཌི་)"
+
+#~ msgid ""
+#~ "By default, the wireless network's name is set to your computer's name, "
+#~ "%s, with no encryption enabled"
+#~ msgstr ""
+#~ "སྔོན་སྒྲིག་གིས་སྦེ་  རླུང་འཕྲིན་ཡོངས་འབྲེལ་གྱི་མིང་འདི་ཁྱོད་རའི་རློག་རིག་མིང་ལུ་  %s གསང་བཟོས་ལྕོགས་ཅན་"
+#~ "མ་བཟོ་མི་དང་ཅིག་ཁར་གཞི་སྒྲིག་འབད་དེ་ཡོདཔ་ཨིན་"
+
+#~ msgid "Create new wireless network"
+#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་གསརཔ་གསར་བསྐྲུན་འབད་"
+
+#~ msgid "Existing wireless network"
+#~ msgstr "ད་ལྟོ་ཡོད་པའི་རླུང་འཕྲིན་ཡོངས་འབྲེལ་"
+
+#~ msgid "Error connecting to wireless network"
+#~ msgstr "རླུང་འཕྲིན་ཡོངས་འབྲེལ་ལུ་མཐུད་པའི་བསྒང་འཛོལ་བ་"
+
+#~ msgid ""
+#~ "The requested wireless network requires security capabilities unsupported "
+#~ "by your hardware."
+#~ msgstr ""
+#~ "ཞུ་བ་འབད་ཡོད་པའི་རླུང་འཕྲིན་ཡོངས་འབྲེལ་དེ་གིས་  ཁྱོད་རའི་སྲ་ཆས་ཀྱི་རྒྱབ་སྐྱོར་མ་འབད་མི་སྲུང་སྐྱོབ་ལྕོགས་"
+#~ "འགྲུབ་འདི་དགོཔ་ཨིན།"
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "ཝི་པི་ཨེན་མཐུད་ལམ་དབྱེ་བ་ '%s' གི་དོན་ལུ་བདེན་བཤད་ཌའི་ལོག་ཐོབ་མ་ཚུགས།  ཁྱོད་རའི་རིམ་ལུགས་བདག་"
+#~ "སྐྱོང་པ་ལུ་འབྲེལ་བ་འཐབ།"
 
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr "WPA2 རང་དོན་"
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "ཝི་པི་ཨེན་མཐུད་ལམ་དབྱེ་བ་'%s'གི་དོན་ལུ་བདེན་བཤད་ཌའི་ལོག་གཞི་བཙུགས་འབདཝ་ད་དཀའ་ངལ་བྱུང་"
+#~ "ཡོདཔ།  ཁྱོད་རའི་རིམ་ལུགས་བདག་སྐྱོང་པ་ལུ་འབྲེལ་བ་འཐབ།"
+
+#~ msgid "AES-CCMP"
+#~ msgstr "AES-CCMP"
+
+#~ msgid "TKIP"
+#~ msgstr "TKIP"
+
+#~ msgid "WEP 64/128-bit Hex"
+#~ msgstr "WEP 64/128-བིཊི་ཧེགསི་"
+
+#~ msgid "TTLS"
+#~ msgstr "TTLS"
 
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr "ཌབ་ལུ་པི་ཨེ་རང་དོན་"
+#~ msgid "WPA Enterprise"
+#~ msgstr "ཌབ་ལུ་པི་ཨེ་ཚོང་ལས་"
 
+#~ msgid "WPA Personal"
+#~ msgstr "ཌབ་ལུ་པི་ཨེ་རང་དོན་"
diff --git a/po/el.po b/po/el.po
index c5922d51..4f92bdf9 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,9 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-07-07 21:57+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -25,7 +24,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.5\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Δίκτυο"
 
@@ -137,46 +136,90 @@ msgstr ""
 "Ορίστε το ως αληθές για να απενεργοποιήσετε τις προειδοποιήσεις σχετικά με "
 "τα πιστοποιητικά CA στην 2η φάσης της EAP πιστοποίησης."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Εφαρμογή NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Εφαρμογή NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Πιστοποίηση 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "Σύν_δεση"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "Ό_νομα δικτύου:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Αποτυχία προσθήκης/ενεργοποίησης σύνδεσης"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Άγνωστο σφάλμα"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Αποτυχία σύνδεσης"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Αποτυχία αποσύνδεσης της συσκευής"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Αποτυχία αποσύνδεσης"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Απέτυχε η ενεργοποίηση της σύνδεσης"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Να μην εμφανιστεί αυτό το μήνυμα ξανά"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -186,7 +229,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί διακόπηκε η σύνδεση δικτύου."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -195,7 +238,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί η υπηρεσία VPN διακόπηκε ανεξήγητα."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -205,7 +248,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί η υπηρεσία VPN επέστρεψε άκυρες ρυθμίσεις."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -214,7 +257,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί έληξε το χρονικό όριο σύνδεσης."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -224,7 +267,7 @@ msgstr ""
 "Απέτυχε η σύνδεση VPN '%s', γιατί δεν έγινε έγκαιρη εκκίνηση της υπηρεσίας "
 "VPN."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -233,7 +276,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί απέτυχε η εκκίνηση της υπηρεσίας VPN."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -242,7 +285,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί δεν βρέθηκαν έγκυρα VPN secrets."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -251,7 +294,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s', γιατί τα VPN secrets ήταν άκυρα."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -260,7 +303,7 @@ msgstr ""
 "\n"
 "Απέτυχε η σύνδεση VPN '%s'."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -270,7 +313,7 @@ msgstr ""
 "\n"
 "Αποσυνδεθήκατε από το VPN '%s', γιατί διακόπηκε η σύνδεση δικτύου."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -279,7 +322,7 @@ msgstr ""
 "\n"
 "Αποσυνδεθήκατε από το VPN '%s', γιατί διακόπηκε η υπηρεσία VPN."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -288,7 +331,7 @@ msgstr ""
 "\n"
 "Αποσυνδεθήκατε από το VPN '%s'."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -299,19 +342,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Έχει πραγματοποιηθεί επιτυχώς η σύνδεση VPN.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Μήνυμα εισόδου VPN"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Απέτυχε η σύνδεση VPN"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -324,7 +367,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -337,800 +380,546 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "η συσκευή δεν είναι έτοιμη (λείπει υλικολογισμικό)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "η συσκευή δεν είναι έτοιμη"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "χωρίς σύνδεση"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Αποσύνδεση"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "δε γίνεται διαχείριση της συσκευής"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Δε βρέθηκαν συσκευές δικτύου"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Συνδέσεις _VPN"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Ρύθμιση VPN..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "Α_ποσύνδεση VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Ο NetworkManager δεν εκτελείται..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Δικτύωση απενεργοποιημένη"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Ενεργοποίηση _δικτύωσης"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Ενεργοποίηση _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Ενεργοποίηση _κινητής ευρυζωνικής"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Ενεργοποίηση κινητής ευρυζωνικής WiMA_X"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Ενεργοποίηση ει_δοποιήσεων"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Π_ληροφορίες σύνδεσης"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Επεξεργασία συνδέσεων..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "_Βοήθεια"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "Πε_ρί"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Συνδεθήκατε στο '%s'."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Χωρίς σύνδεση"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Αποσυνδεθήκατε από το δίκτυο."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Προετοιμασία της σύνδεσης '%s'..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Απαιτείται πιστοποίηση του χρήστη για τη σύνδεση '%s'..."
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Ζητείται διεύθυνση δικτύου για το '%s'..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Η σύνδεση '%s' είναι ενεργή"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Εκκίνηση της σύνδεσης VPN '%s'..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Απαιτείται πιστοποίηση του χρήστη για τη σύνδεση VPN '%s'..."
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Ζητείται διεύθυνση VPN για το '%s'..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Η σύνδεση VPN '%s' είναι ενεργή"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Δεν υπάρχει σύνδεση δικτύου"
 
-#: ../src/applet.c:3628
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Μικροεφαρμογή NetworkManager"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Διαθέσιμα"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Η σύνδεση επιτεύχθηκε"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Συνδεθήκατε στο συζευγμένο δίκτυο."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Προετοιμασία σύνδεσης δεσμού '%s'..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Ρύθμιση της σύνδεσης δεσμού '%s'..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Απαιτείται πιστοποίηση του χρήστη για σύνδεση δεσμού '%s'..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Ζητείται η διεύθυνση για το '%s'..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Η σύνδεση δεσμού '%s' είναι ενεργή"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Συνδεθήκατε στο γεφυρωμένο δίκτυο."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Προετοιμασία σύνδεσης γέφυρας '%s'..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Ρύθμιση της σύνδεσης γέφυρας '%s'..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Απαιτείται πιστοποίηση του χρήστη για σύνδεση γέφυρας '%s'..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Η σύνδεση γέφυρας '%s' είναι ενεργή"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Σφάλμα κωδικού PUK· παρακαλούμε επικοινωνήστε με τον πάροχό σας."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Αποστολή κωδικού ξεκλειδώματος..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Κινητή ευρυζωνική (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Κινητή ευρυζωνική"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Διαθέσιμα"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Νέα κινητή ευρυζωνική σύνδεση..."
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Η σύνδεση επιτεύχθηκε"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Συνδεθήκατε στο κινητό ευρυζωνικό δίκτυο."
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Κινητό ευρυζωνικό δίκτυο."
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Είστε πλέον εγγεγραμμένος στο οικιακό δίκτυο."
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Είστε πλέον εγγεγραμμένος σε ένα δίκτυο περιαγωγής."
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Συνδεθήκατε στο κινητό ευρυζωνικό δίκτυο."
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Προετοιμασία της κινητής ευρυζωνικής σύνδεσης '%s'..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Ρύθμιση της κινητής ευρυζωνικής σύνδεσης '%s'..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Απαιτείται πιστοποίηση για την κινητή ευρυζωνική σύνδεση '%s'..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Η κινητή ευρυζωνική σύνδεση '%s' είναι ενεργή"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Νέα κινητή ευρυζωνική σύνδεση (CDMA)..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Συνδεθήκατε στο δίκτυο CDMA."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "Δίκτυο CDMA."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Αυτόματο Ethernet"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Δίκτυα Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Δίκτυο Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Δίκτυα Ethernet"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Δίκτυο Ethernet"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Συνδεθήκατε στο δίκτυο Ethernet."
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Προετοιμασία της σύνδεσης δικτύου Ethernet '%s'..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Ρύθμιση της σύνδεσης δικτύου Ethernet '%s'..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../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:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Ζητείται διεύθυνση δικτύου Ethernet για το '%s'..."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Η σύνδεση δικτύου Ethernet '%s' είναι ενεργή"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Πιστοποίηση DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Νέα κινητή ευρυζωνική σύνδεση (GSM)..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Συνδεθήκατε στο δίκτυο GSM."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "Δίκτυο GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "Αυτόματο InfiniBand"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "Δίκτυα InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Δίκτυο InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "Δίκτυα InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "Δίκτυο InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Συνδεθήκατε στο δίκτυο InfiniBand."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Προετοιμασία σύνδεσης InfiniBand '%s'..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Ρύθμιση της σύνδεσης InfiniBand '%s'..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Απαιτείται πιστοποίηση του χρήστη για τη σύνδεση InfiniBand '%s'..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "Η σύνδεση InfiniBand '%s' είναι ενεργή"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Συνδεθήκατε στο δίκτυο ομάδας."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Προετοιμασία σύνδεσης ομάδας '%s'..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Ρύθμιση σύνδεσης ομάδας '%s'..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Απαιτείται πιστοποίηση του χρήστη για τη σύνδεση ομάδας '%s'..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Η σύνδεση ομάδας '%s' είναι ενεργή"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Συνδεθήκατε στο VLAN."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Προετοιμασία της σύνδεσης VLAN '%s'..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Ρύθμιση της σύνδεσης VLAN '%s'..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Απαιτείται πιστοποίηση του χρήστη για τη σύνδεση VLAN '%s'..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "Η σύνδεση VLAN '%s' είναι ενεργή"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Σύνδεση σε _κρυφό δίκτυο Wi-Fi..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Δημιουργία _νέου δικτύου Wi-Fi..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Δίκτυα Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Δίκτυο Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Δίκτυο Wi-Fi "
 msgstr[1] "Δίκτυα Wi-Fi"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Το Wi-Fi είναι ανενεργό"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Το Wi-Fi είναι ανενεργό από τον διακόπτη"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Περισσότερα δίκτυα"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Διαθέσιμα δίκτυα Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Χρησιμοποιήστε το μενού δικτύου για να συνδεθείτε σε δίκτυο Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Συνδεθήκατε στο δίκτυο Wi-Fi '%s'."
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Προετοιμασία σύνδεσης δικτύου Wi-Fi '%s'..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Ρύθμιση της σύνδεσης δικτύου Wi-Fi '%s'..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Απαιτείται πιστοποίηση του χρήστη για το δίκτυο Wi-Fi '%s'..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Αιτείται διεύθυνση δικτύου Wi-Fi για το '%s'..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Η σύνδεση δικτύου Wi-Fi '%s' είναι ενεργή: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Η σύνδεση δικτύου Wi-Fi '%s' είναι ενεργή"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Αποτυχία ενεργοποίησης της σύνδεσης"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Αποτυχία προσθήκης νέας σύνδεσης"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Κινητή ευρυζωνική WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "Κινητή ευρυζωνική WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "Η ασύρματη δικτύωση WiMAX είναι απενεργοποιημένη"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "Η ασύρματη δικτύωση WiMAX είναι απενεργοποιημένη από το διακόπτη"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Συνδεθήκατε στο δίκτυο WiMAX."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Η κινητή ευρυζωνική σύνδεση '%s' είναι ενεργή: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "περιαγωγή"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Σφάλμα εμφάνισης πληροφοριών σύνδεσης:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Δυναμικό WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Διευθύνσεις"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Καμία"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (προεπιλογή)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "άγνωστο"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "άγνωστο"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "Διεύθυνση IP:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Άγνωστη"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Διεύθυνση IP:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Διεύθυνση μετάδοσης:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Μάσκα υποδικτύου:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Προεπιλεγμένη διαδρομή:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Μάσκα υποδικτύου:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Γενικά"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Διεπαφή:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Διεύθυνση υλικού:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Οδηγός:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Ταχύτητα:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Ασφάλεια:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Προεπιλεγμένη διαδρομή:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Αγνόηση"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Τύπος VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Πύλη VPN:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Όνομα χρήστη VPN:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Κείμενο εισόδου VPN:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Σύνδεση βάσης:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Άγνωστο"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Δε βρέθηκαν έγκυρες ενεργές συνδέσεις!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1138,44 +927,44 @@ msgstr ""
 "Πνευματικά δικαιώματα © 2005-2008 Novell, Inc.\n"
 "και πολλοί άλλοι προγραμματιστές της κοινότητας και μεταφραστές"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Μικροεφαρμογή για τη διαχείριση των συσκευών και των συνδέσεων του δικτύου "
 "σας."
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Ιστοσελίδα του NetworkManager"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Λείπουν πόροι"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Κωδικός πρόσβασης κινητού ευρυζωνικού δικτύου"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Απαιτείται κωδικός πρόσβασης για σύνδεση στο '%s'."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Απαιτείται ξεκλείδωμα SIM PIN"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "Απαιτείται ξεκλείδωμα SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1185,25 +974,25 @@ msgstr ""
 "χρησιμοποιηθεί."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Κωδικός PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Εμφάνιση κωδικού PIN"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Απαιτείται ξεκλείδωμα SIM PUK"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "Απαιτείται ξεκλείδωμα SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1213,27 +1002,34 @@ msgstr ""
 "χρησιμοποιηθεί."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Κωδικός PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Νέος κωδικός PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Εισάγετε ξανά τον κωδικό PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Εμφάνιση κωδικών PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1243,18 +1039,41 @@ msgstr ""
 "Οι διευθύνσεις IP επιτρέπουν την αναγνώριση του υπολογιστή σας στο δίκτυο. "
 "Πατήστε το κουμπί \"Προσθήκη\" για να προσθέσετε μια διεύθυνση IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Διαγραφή"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Α_γνόηση διαδρομών που ελήφθησαν αυτόματα"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "Χρ_ησιμοποιήστε αυτή τη σύνδεση μόνο για πόρους του δικτύου της"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1262,9 +1081,8 @@ msgstr ""
 "Αν είναι ενεργοποιημένο, αυτή η σύνδεση δε θα χρησιμοποιείται ποτέ ως "
 "προεπιλεγμένη σύνδεση δικτύου."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1272,15 +1090,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Δημιουργία…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "Επιλογή τύπου σύνδεσης"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1333,48 +1151,41 @@ msgid "Bonded _connections:"
 msgstr "Συζευγμένες _συνδέσεις:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
 msgstr "_Κατάσταση:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "_Επεξεργασία"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "_Διαγραφή"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Επεξεργασία"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Σ_υχνότητα παρακολούθησης:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "Όνομα _διεπαφής:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "Παρακολούθηση συ_νδέσμου:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "_Προορισμοί ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1382,19 +1193,19 @@ msgstr ""
 "Μια διεύθυνση IP ή μια λίστα διευθύνσεων IP που χωρίζεται με κόμμα, για "
 "αναζήτηση κατά τον έλεγχο της κατάστασης συνδέσμου."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Καθυστέρηση _σύνδεσης:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Καθυστέρηση _αποσύνδεσης:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Πρωτεύον:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1402,12 +1213,30 @@ msgstr ""
 "Το όνομα της διεπαφής της πρωτεύουσας συσκευής. Αν οριστεί, αυτή η συσκευή "
 "θα είναι πάντα η ενεργή υποτελής, όταν είναι διαθέσιμη."
 
+#: ../src/connection-editor/ce-page-bond.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:17
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "bytes"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "_Κόστος διαδρομής:"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Προτεραιότητα:"
 
@@ -1419,44 +1248,89 @@ msgstr "Κατάσταση _φουρκέτας:"
 msgid "Bridged _connections:"
 msgstr "Γεφυρωμένες _συνδέσεις:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "Καθυστέρηση _προώθησης:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "Χρόνος _χαιρετισμού:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Ενεργοποίηση _δικτύωσης"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Ενεργοποίηση _STP (πρωτόκολλο δένδρου κάλυψης)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Μέγιστη ηλικία:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "Χρόνος _ωρίμανσης:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "αυτόματα"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "προεπιλεγμένη"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Διεύθυνση"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Διεύθυνση"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Οποιαδήποτε συσκευή"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Απέτυχε η ενημέρωση των μυστικών της σύνδεσης εξαιτίας άγνωστου σφάλματος."
@@ -1556,79 +1430,79 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Έλεγχος ροής προτεραιότητας"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Ενεργοποίηση ή απενεργοποίηση της προτεραιότητας για μετάδοση παύσης, για "
 "κάθε προτεραιότητα χρήστη."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Προτεραιότητα:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Κλάση κυκλοφορίας:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Αυστηρό εύρος ζώνης:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Εύρος ζώνης προτεραιότητας:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Εύρος ζώνης ομάδας:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "Αναγνωριστικό ομάδας:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 "Εισάγετε το αναγνωριστικό ομάδας προτεραιότητας για κάθε προτεραιότητα "
 "χρήστη."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1638,25 +1512,25 @@ msgstr ""
 "προτεραιότητας μπορεί να χρησιμοποιήσει. Το άθροισμα όλων των ομάδων πρέπει "
 "να είναι συνολικά 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "Εισάγετε το ποσοστό τους εύρους ζώνης ομάδας προτεραιότητας που κάθε χρήστης "
 "προτεραιότητας μπορεί να χρησιμοποιήσει."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 "Ενεργοποίηση ή απενεργοποίηση αυστηρού εύρους ζώνης για κάθε προτεραιότητα "
 "χρήστη."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1669,7 +1543,7 @@ 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:4
+#: ../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
@@ -1677,8 +1551,9 @@ msgid "Sho_w password"
 msgstr "Εμ_φάνιση κωδικού πρόσβασης"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1690,7 +1565,8 @@ msgstr "Κωδικός _πρόσβασης:"
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Αυτόματα"
@@ -1745,18 +1621,18 @@ msgstr "Α_υτόματη διαπραγμάτευση"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "Διεύθυνση _MAC συσκευής:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Υπηρεσία:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "_Κλωνοποιημένη διεύθυνση MAC:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1767,19 +1643,54 @@ msgstr ""
 "χαρακτηριστικό είναι γνωστό ως κλωνοποίηση ή προστασία εκχώρησης MAC. "
 "Παράδειγμα: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "bytes"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Προεπιλογή"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Αγνόηση"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Εκπομπή"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1818,8 +1729,8 @@ msgstr "Αυτόματα με χειροκίνητες ρυθμίσεις DNS"
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Χειροκίνητα"
 
@@ -1830,8 +1741,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Κοινή χρήση με άλλους υπολογιστές"
 
@@ -1845,7 +1756,7 @@ msgstr "_Μέθοδος:"
 msgid "Addresses"
 msgstr "Διευθύνσεις"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1855,8 +1766,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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1864,25 +1775,25 @@ msgstr ""
 "Οι τομείς χρησιμοποιούνται για την ανάλυση του ονόματος κεντρικών "
 "υπολογιστών. Χρησιμοποιήστε κόμματα για τον διαχωρισμό πολλαπλών τομέων."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Διακομιστές _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1892,12 +1803,12 @@ msgstr ""
 "τον διαχωρισμό των διευθύνσεων των πολλαπλών διευθύνσεων διακομιστή ονόματος "
 "τομέα."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1905,13 +1816,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "Διαδ_ρομές…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
@@ -1923,7 +1834,7 @@ msgstr "Ενεργοποιημένο (προτιμήσετε δημόσια δι
 msgid "Enabled (prefer temporary address)"
 msgstr "Ενεργοποιημένο (προτιμήσετε προσωρινή διεύθυνση)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 "
@@ -1935,16 +1846,16 @@ msgstr ""
 "τομέα. Οι συνδεμένες τοπικές διευθύνσεις θα έχουν εμβέλεια αυτόματα στη "
 "διεπαφή σύνδεσης."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "Επεκτάσεις α_πορρήτου IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1953,71 +1864,38 @@ msgstr ""
 "αποτύχει η διαμόρφωση IPv6 αλλά επιτύχει η διαμόρφωση IPv4."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Οποιαδήποτε"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Να προτιμάται το 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Να προτιμάται το 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Να προτιμάται το 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Να χρησιμοποιείται μόνο το 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Βασικό"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Αριθ_μός:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "Αναγνωριστικό _δικτύου:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Τύπος:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Αλλαγή..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "Να επιτρέπεται η _περιαγωγή αν το οικιακό δίκτυο δεν είναι διαθέσιμο"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "Εμ_φάνιση κωδικών πρόσβασης"
 
@@ -2083,32 +1961,55 @@ msgid "_Teamed connections:"
 msgstr "Συνδέσεις σε _ομάδες:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "Ει_σαγωγή διαμόρφωσης ομάδας από αρχείο..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "Ε_ισαγωγή διαμόρφωσης ομάδας από αρχείο..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Γονική διεπαφή:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "Ό_νομα διεπαφής VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Κλωνοποιημένη διεύθυνση MAC:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "_Αναγνωριστικό VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Όνομα συσκευής + αριθμός"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + αριθμός"
 
@@ -2125,95 +2026,99 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Υποδομή"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Ισ_χύς μετάδοσης:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Ρυθμός:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "Κα_νάλι:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_Ζώνη:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "_Κατάσταση:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Επιτρεπτές μέθοδοι πιστοποίησης"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Επεκτάσιμο πρωτόκολλο πιστοποίησης "
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Πρωτόκολλο πιστοποίησης μέσω κωδικού πρόσβασης"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Πρωτόκολλο πιστοποίησης μέσω ανταλλαγής χειραψίας"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Πρωτόκολλο πιστοποίησης μέσω ανταλλαγής χειραψίας της Microsoft"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr ""
 "Πρωτόκολλο πιστοποίησης μέσω ανταλλαγής χειραψίας της Microsoft έκδοση 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2222,136 +2127,157 @@ msgstr ""
 "όλες τις μεθόδους πιστοποίησης. Αν αποτυγχάνει η σύνδεση, δοκιμάστε να "
 "απενεργοποιήσετε κάποιες μεθόδους."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "Διεύθυνση"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "Μάσκα δικτύου"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "Πύλη δικτύου"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "Μετρικό"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "Πρόθεμα"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Δεσμός"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Ομάδα"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Γέφυρα"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Υλικό"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Εικονικό"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Εισαγωγή αποθηκευμένης διαμόρφωσης VPN..."
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Απέτυχε η αρχικοποίηση του διαλόγου επεξεργασίας συνδέσεων για άγνωστο λόγο."
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Αδύνατη η δημιουργία νέας σύνδεσης"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Απέτυχε η διαγραφή της σύνδεσης"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τη σύνδεση %s;"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "Διεύθυνση"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Μάσκα δικτύου"
+
+#: ../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
+msgid "Gateway"
+msgstr "Πύλη δικτύου"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Μετρικό"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Πρόθεμα"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Επεξεργασία σύνδεσης χωρίς όνομα"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Ό_νομα σύνδεσης:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Σφάλμα αρχικοποίησης επεξεργασίας"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Απέτυχε η προσθήκη σύνδεσης"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2359,174 +2285,212 @@ msgstr ""
 "Ο επεξεργαστής σύνδεσης δεν μπόρεσε να βρει κάποιους απαιτούμενους πόρους "
 "(δε βρέθηκε το αρχείο .ui)."
 
-#: ../src/connection-editor/nm-connection-editor.c:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "Α_ποθήκευση"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Αποθήκευση αλλαγών που έγιναν σε αυτή τη σύνδεση."
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Απαιτείται πιστοποίηση για την αποθήκευση αυτής της σύνδεσης για όλους τους "
 "χρήστες του συστήματος."
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Αδύνατη η δημιουργία σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Αδύνατη η επεξεργασία της σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Άγνωστο σφάλμα κατά τη δημιουργία διαλόγου επεξεργαστή σύνδεσης."
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Σφάλμα αρχικοποίησης επεξεργασίας"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Απέτυχε η προσθήκη σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "Σφάλμα αποθήκευσης της σύνδεσης"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Η ιδιότητα '%s' / '%s' δεν είναι έγκυρη: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "Ό_νομα σύνδεσης:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "Ε_ξαγωγή..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "ποτέ"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "τώρα"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d λεπτό πριν"
 msgstr[1] "%d λεπτά πριν"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ώρα πριν"
 msgstr[1] "%d ώρες πριν"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ημέρα πριν"
 msgstr[1] "%d ημέρες πριν"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d μήνα πριν"
 msgstr[1] "%d μήνες πριν"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d έτος πριν"
 msgstr[1] "%d έτη πριν"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Τελευταία χρήση"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Επεξεργασία της επιλεγμένης σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Απαιτείται πιστοποίηση για την επεξεργασία της επιλεγμένης σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Διαγραφή της επιλεγμένης σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Απαιτείται πιστοποίηση για τη διαγραφή της επιλεγμένης σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Δεν έχουν εγκατασταθεί πρόσθετα VPN."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Δε γνωρίζω πως μπορούν να πραγματοποιηθούν συνδέσεις τύπου '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Σφάλμα δημιουργίας σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Σφάλμα επεξεργασίας σύνδεσης"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Δε βρέθηκε σύνδεση με UUID '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Ασφάλεια 802.1X"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "Αδυναμία φόρτωσης της ασφάλειας 802.1x της διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Χρήση ασφάλειας 802.1_X για αυτή τη σύνδεση"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Αδύνατη η φόρτωση της διεπαφής χρήστη DCB."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "αδυναμία εύρεσης της συσκευής Bluetooth."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Σύνδεση δεσμού %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Δίκτυο Ethernet"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Δίκτυο Wi-Fi "
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Αδυναμία φόρτωσης του δεσμού διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Πρωτεύον:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Σύνδεση δεσμού %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Αδυναμία φόρτωσης γέφυρας διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Σύνδεση γέφυρας %d"
@@ -2534,58 +2498,74 @@ msgstr "Σύνδεση γέφυρας %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Θύρα γέφυρας"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Αδυναμία φόρτωσης της θύρας γέφυρας διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Αδύνατη η φόρτωση της διεπαφής χρήστη DCB."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη DSL."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Σύνδεση DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 που εισήχθη εδώ. Παράδειγμα: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Αδυναμία φόρτωσης Ethernet διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Κλωνοποιημένη διεύθυνση MAC:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2596,125 +2576,168 @@ msgstr ""
 "προεπιλεγμένης ζώνης στο τείχος προστασίας. Είναι χρήσιμο μόνο εάν το τείχος "
 "προστασίας είναι ενεργό."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "Δεν εκτελείται το FirewallD."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Αδυναμία φόρτωσης της γενικής διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Αδυναμία φόρτωσης της InfiniBand διεπαφής χρήστη."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Σύνδεση InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Αυτόματα (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Μόνο αυτόματες διευθύνσεις (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "Αυτόματα (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "Μόνο αυτόματες διευθύνσεις (PPP)"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "Αυτόματα, μόνο διευθύνσεις"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Αυτόματα (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Μόνο αυτόματες διευθύνσεις (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Αυτόματα (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Μόνο αυτόματες διευθύνσεις (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Μόνο τοπική σύνδεση"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Επιπλέον διακομιστές _DNS:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Επιπλέον τομείς ανα_ζήτησης:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Επεξεργασία των διαδρομών IPv4 για την %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Ρυθμίσεις IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη IPv4."
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "Αυτόματα, μόνο διευθύνσεις"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Αγνόηση"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Αυτόματα, μόνο DHCP"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Επεξεργασία των διαδρομών IPv6 για την %s"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Ρυθμίσεις IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη IPv6."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Διπλασιασμός υποτελών"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "Οι υποτελείς '%s' και '%s' εφαρμόζουν και οι δύο στη συσκευή '%s'"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2723,25 +2746,25 @@ msgstr ""
 "Οι υποτελείς '%s' και '%s' εφαρμόζουν σε διαφορετικές εικονικές θύρες ('%s' "
 "και '%s') της ίδιας φυσικής συσκευής."
 
-#: ../src/connection-editor/page-master.c:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s υποτελής %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη κινητής ευρυζωνικής σύνδεσης."
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Μη υποστηριζόμενος τύπος κινητής ευρυζωνικής σύνδεσης."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Επιλογή τύπου παρόχου κινητής ευρυζωνικής σύνδεσης"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2749,85 +2772,85 @@ msgstr ""
 "Επιλέξτε την τεχνολογία που χρησιμοποιεί ο πάροχός σας. Αν δεν είστε "
 "σίγουροι, απευθυνθείτε στον πάροχό σας."
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Ο πάροχός μου χρησιμοποιεί τεχνολογίες _GSM (π.χ. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Ο πάροχός μου χρησιμοποιεί τεχνολογίες C_DMA (π.χ. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "κανένα"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Ρυθμίσεις PPP"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη PPP."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Επιλέξτε το αρχείο που θέλετε να εισάγετε"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Σφάλμα: το αρχείο δεν περιέχει μια έγκυρη διαμόρφωση JSON"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη ομάδας."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Σύνδεση ομάδας %d"
@@ -2835,47 +2858,56 @@ msgstr "Σύνδεση ομάδας %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Θύρα ομάδας"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (μέσα από \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Δεν υπάρχει σύνδεση δικτύου"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη vlan."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Σύνδεση VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη VPN."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Δε βρέθηκε η υπηρεσία πρόσθετου VPN για το '%s'."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Σύνδεση VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2885,11 +2917,11 @@ msgstr ""
 "\n"
 "Σφάλμα: δεν υπάρχει τύπος υπηρεσίας VPN."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Επιλογή τύπου σύνδεσης VPN"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2899,7 +2931,7 @@ msgstr ""
 "Αν ο τύπος σύνδεσης VPN που επιθυμείτε να δημιουργήσετε δεν εμφανίζεται στη "
 "λίστα, ίσως δεν είναι εγκατεστημένο το κατάλληλο πρόσθετο VPN."
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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"
@@ -2907,73 +2939,93 @@ msgstr ""
 "Αυτή η επιλογή κλειδώνει αυτήν τη σύνδεση στο σημείο πρόσβασης Wi-Fi (AP) "
 "που καθορίζεται από το BSSID που εισήχθη εδώ. Παράδειγμα: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"Αυτή η επιλογή κλειδώνει αυτή τη σύνδεση στη συσκευή δικτύου που καθορίζεται "
+"από τη μόνιμη διεύθυνση MAC που εισήχθη εδώ. Παράδειγμα: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Οποιαδήποτε συσκευή"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Σύνδεση Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Συνθηματική φράση WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Δυναμικό WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Προσωπικό WPA & WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Εταιρικό WPA & WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Ασφάλεια Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη ασφάλειας Wi-Fi."
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "Αδυναμία φόρτωσης της διεπαφής χρήστη WiMAX."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Σύνδεση WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Αδύνατη η εισαγωγή της σύνδεσης VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2986,25 +3038,30 @@ msgstr ""
 "\n"
 "Σφάλμα: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Άγνωστο σφάλμα"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Ένα αρχείο με το όνομα \"%s\" υπάρχει ήδη."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Αντικατάσταση"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Αδύνατη η εξαγωγή της σύνδεσης VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3015,11 +3072,11 @@ msgstr ""
 "\n"
 "Σφάλμα: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Εξαγωγή σύνδεσης VPN..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -3027,101 +3084,11 @@ msgstr ""
 "Η μικροεφαρμογή NetworkManager δεν μπόρεσε να βρει κάποιους απαιτούμενους "
 "πόρους (δε βρέθηκε το αρχείο .ui)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Η διαμόρφωση Bluetooth δεν είναι εφικτή (αποτυχία σύνδεσης στον D-Bus: (%s) "
-"%s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Η ρύθμιση Bluetooth είναι αδύνατη (σφάλμα εύρεσης του NetworkManager: (%s) "
-"%s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Χρήση του κινητού σας τηλεφώνου ως συσκευής δικτύου (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Πρόσβαση στο διαδίκτυο μέσω του κινητού σας τηλεφώνου (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Σφάλμα: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Αδυναμία δημιουργίας σύνδεσης DUN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "Το τηλέφωνο σας είναι έτοιμο για χρήση!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Ο βοηθός κινητού ακυρώθηκε"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Άγνωστη συσκευή τηλεφώνου (όχι GSM ή CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "άγνωστος τύπος μόντεμ."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "αποτυχία σύνδεσης με το τηλέφωνο."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "σφάλμα λήψης διαύλου σύνδεσης"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "απρόσμενη αποσύνδεση από το τηλέφωνο."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "λήξη χρόνου κατά τον εντοπισμό των λεπτομερειών του τηλεφώνου."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "Γίνεται εντοπισμός της ρύθμισης του τηλεφώνου..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Θα πρέπει πρώτα να ενεργοποιηθεί ο προεπιλεγμένος προσαρμογέας Bluetooth "
-"πριν την ρύθμιση μιας τηλεφωνικής σύνδεσης δικτύου."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Αδυναμία δημιουργίας σύνδεσης PAN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "Δίκτυο %s"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Ξεκλείδωμα"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Αυτόματο ξεκλείδωμα αυτής της συσκευής"
 
@@ -3129,31 +3096,36 @@ msgstr "Αυτόματο ξεκλείδωμα αυτής της συσκευής
 msgid "Connection Information"
 msgstr "Πληροφορίες σύνδεσης"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Ενεργές συνδέσεις δικτύου"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Η συσκευή σας:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Ο πάροχός σας:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Η συνδρομή σας:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3167,23 +3139,28 @@ msgstr ""
 "να τροποποιήσετε τις ρυθμίσεις της κινητής ευρυζωνικής σύνδεσης, επιλέξτε "
 "\"Συνδέσεις δικτύου\" από το μενού Σύστημα >> Προτιμήσεις."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Επιβεβαίωση των ρυθμίσεων της κινητής ευρυζωνικής σύνδεσης"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Εκτός λίστας"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Επιλέξτε τη συνδρομή σας:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3196,67 +3173,83 @@ msgstr ""
 "Αν δεν είστε σίγουροι για τον τύπο συνδρομής σας, ζητήστε το APN της "
 "συνδρομής σας από τον πάροχο."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Επιλέξτε τη συνδρομή σας"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Η συνδρομή μου δεν αναφέρεται..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Επιλέξτε τον πάροχό σας από τη _λίστα:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Πάροχος"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Πάροχος:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Επιλέξτε τον πάροχό σας"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "Λίστα χωρών ή περιοχών:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Χώρα ή περιοχή"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Η χώρα μου δεν είναι στη λίστα"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Εγκατεστημένη συσκευή GSM"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Εγκατεστημένη συσκευή CDMA"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3264,90 +3257,109 @@ msgstr ""
 "Ο βοηθός αυτός σας επιτρέπει να συνδεθείτε εύκολα σε ένα κινητό ευρυζωνικό "
 "(3G) δίκτυο."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Θα χρειαστείτε τις ακόλουθες πληροφορίες:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Το όνομα του παρόχου της σύνδεσης σας"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Το όνομα της συνδρομής σας"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Δημιουργία σύνδεσης για την _ακόλουθη συσκευή:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Οποιαδήποτε συσκευή"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Ρύθμιση κινητής ευρυζωνικής σύνδεσης"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Νέα κινητή ευρυζωνική σύνδεση"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Ενσύρματη"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "Πλέγμα OLPC"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Δευτερεύων κωδικός πρόσβασης:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Δευτερεύων κωδικός πρόσβασης:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+msgid "Sh_ow passwords"
+msgstr "Εμ_φάνιση κωδικών πρόσβασης"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Νέο..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Κανένα"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "Δ_ημιουργία"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3355,35 +3367,35 @@ msgstr ""
 "Απαιτούνται κωδικοί πρόσβασης ή κλειδιά κρυπτογράφησης για πρόσβαση στο "
 "δίκτυο Wi-Fi '%s'."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Απαιτείται πιστοποίηση δικτύου Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Απαιτείται πιστοποίηση από το δίκτυο Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Δημιουργία νέου δικτύου Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Νέο δίκτυο Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Εισάγετε το όνομα του δικτύου Wi-Fi που επιθυμείτε να δημιουργήσετε."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Σύνδεση σε κρυφό δίκτυο Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Κρυφό δίκτυο Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3391,31 +3403,55 @@ msgstr ""
 "Εισάγετε το όνομα και τις ρυθμίσεις ασφαλείας του κρυφού δικτύου Wi-Fi στο "
 "οποίο επιθυμείτε να συνδεθείτε."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Δευτερεύων κωδικός πρόσβασης:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "Εμ_φάνιση κωδικών πρόσβασης"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Ασ_φάλεια δικτύου Wi-Fi:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Σύν_δεση:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "_Προσαρμογέας Wi-Fi:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "Πλέγμα OLPC"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Χρήση:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3423,7 +3459,7 @@ msgstr ""
 "Αυτό το πρόγραμμα είναι μέρος του NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3431,138 +3467,151 @@ msgstr ""
 "Δεν προορίζεται για χρήση μέσω γραμμής εντολών και εκτελείται στην επιφάνεια "
 "εργασίας του GNOME."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "μη ενεργοποιημένο"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "δεν έχει γίνει εγγραφή"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Οικιακό δίκτυο (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Οικιακό δίκτυο"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "γίνεται αναζήτηση"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "άρνηση εγγραφής"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (περιαγωγή)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Δίκτυο περιαγωγής (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Δίκτυο περιαγωγής"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "Κωδικός PIN για την κάρτα SIM '%s' στο '%s'"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Απαιτείται κωδικός PIN"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Η κινητή ευρυζωνική συσκευή χρειάζεται τον κωδικό PIN"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Η κινητή ευρυζωνική σύνδεση '%s' είναι ενεργή: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "περιαγωγή"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "σύνδεση %s"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Αποθήκευση του κωδικού πρόσβασης μόνο για αυτόν τον _χρήστη"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "Αποθήκευση του κωδικού πρόσβασης για ό_λους τους χρήστες"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Πιστοποιητικά DER ή PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Επιλέξτε ένα αρχείο PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Αρχεία PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
@@ -3598,15 +3647,32 @@ msgstr "_Εσωτερική πιστοποίηση:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Να επιτρέπεται η αυτόματη _παροχή PAC"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Επιλέξτε ένα πιστοποιητικό της αρχής έκδοσης πιστοποιητικών..."
 
@@ -3634,15 +3700,46 @@ msgstr "Δεν α_παιτείται κανένα πιστοποιητικό CA"
 msgid "PEAP _version:"
 msgstr "Έκ_δοση PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Ε_ρώτηση για κωδικό πρόσβασης κάθε φορά"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Πιστοποιητικό C_A:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Δεν είναι ασφαλή τα μη κρυπτογραφημένα ιδιωτικά κλειδιά"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3658,11 +3755,11 @@ msgstr ""
 "(Μπορείτε να προστατεύσετε με κωδικό πρόσβασης το ιδιωτικό σας κλειδί με το "
 "openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Επιλέξτε το προσωπικό σας πιστοποιητικό..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Επιλέξτε το ιδιωτικό σας κλειδί..."
 
@@ -3682,23 +3779,36 @@ msgstr "Ιδιωτικό κ_λειδί:"
 msgid "_Private key password:"
 msgstr "Κωδικός πρόσβασης _ιδιωτικού κλειδιού:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "ΓΡΗΓΟΡΑ"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Διοχετευμένο TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Προστατευμένο EAP (PEAP)"
 
@@ -3708,6 +3818,44 @@ msgstr "Προστατευμένο EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Πιστοποίηση:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (προεπιλογή)"
@@ -3732,6 +3880,293 @@ msgstr "Εμ_φάνιση κλειδιού"
 msgid "WEP inde_x:"
 msgstr "Δείκτης _WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Τύπος:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Ενεργοποίηση κινητής ευρυζωνικής WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "_Βοήθεια"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Συνδεθήκατε στο συζευγμένο δίκτυο."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Προετοιμασία σύνδεσης δεσμού '%s'..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Ρύθμιση της σύνδεσης δεσμού '%s'..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Απαιτείται πιστοποίηση του χρήστη για σύνδεση δεσμού '%s'..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Ζητείται η διεύθυνση για το '%s'..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Η σύνδεση δεσμού '%s' είναι ενεργή"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Συνδεθήκατε στο γεφυρωμένο δίκτυο."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Προετοιμασία σύνδεσης γέφυρας '%s'..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Ρύθμιση της σύνδεσης γέφυρας '%s'..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Απαιτείται πιστοποίηση του χρήστη για σύνδεση γέφυρας '%s'..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Η σύνδεση γέφυρας '%s' είναι ενεργή"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Νέα κινητή ευρυζωνική σύνδεση (CDMA)..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Συνδεθήκατε στο δίκτυο CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "Δίκτυο CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Νέα κινητή ευρυζωνική σύνδεση (GSM)..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Συνδεθήκατε στο δίκτυο GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "Δίκτυο GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "Αυτόματο InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Δίκτυα InfiniBand (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Δίκτυο InfiniBand (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Δίκτυα InfiniBand"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "Δίκτυο InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Συνδεθήκατε στο δίκτυο InfiniBand."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Προετοιμασία σύνδεσης InfiniBand '%s'..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Ρύθμιση της σύνδεσης InfiniBand '%s'..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "Απαιτείται πιστοποίηση του χρήστη για τη σύνδεση InfiniBand '%s'..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "Η σύνδεση InfiniBand '%s' είναι ενεργή"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Συνδεθήκατε στο δίκτυο ομάδας."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Προετοιμασία σύνδεσης ομάδας '%s'..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Ρύθμιση σύνδεσης ομάδας '%s'..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Απαιτείται πιστοποίηση του χρήστη για τη σύνδεση ομάδας '%s'..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Η σύνδεση ομάδας '%s' είναι ενεργή"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Συνδεθήκατε στο VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Προετοιμασία της σύνδεσης VLAN '%s'..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Ρύθμιση της σύνδεσης VLAN '%s'..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Απαιτείται πιστοποίηση του χρήστη για τη σύνδεση VLAN '%s'..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "Η σύνδεση VLAN '%s' είναι ενεργή"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Κινητή ευρυζωνική WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Κινητή ευρυζωνική WiMAX"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "Η ασύρματη δικτύωση WiMAX είναι απενεργοποιημένη"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "Η ασύρματη δικτύωση WiMAX είναι απενεργοποιημένη από το διακόπτη"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Συνδεθήκατε στο δίκτυο WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "άγνωστο"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "άγνωστο"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Κατάσταση:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Διεύθυνση _MAC συσκευής:"
+
+#~ msgid "Any"
+#~ msgstr "Οποιαδήποτε"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Να προτιμάται το 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Να προτιμάται το 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Να προτιμάται το 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Να χρησιμοποιείται μόνο το 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "Ει_σαγωγή διαμόρφωσης ομάδας από αρχείο..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "Υποδομή"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Σφάλμα αποθήκευσης της σύνδεσης"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Η ιδιότητα '%s' / '%s' δεν είναι έγκυρη: %d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Αυτόματα (PPP)"
+
+#~ 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)."
+#~ msgstr ""
+#~ "Η διαμόρφωση Bluetooth δεν είναι εφικτή (αποτυχία σύνδεσης στον D-Bus: "
+#~ "(%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Η ρύθμιση Bluetooth είναι αδύνατη (σφάλμα εύρεσης του NetworkManager: "
+#~ "(%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Χρήση του κινητού σας τηλεφώνου ως συσκευής δικτύου (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Πρόσβαση στο διαδίκτυο μέσω του κινητού σας τηλεφώνου (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Σφάλμα: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Αδυναμία δημιουργίας σύνδεσης DUN: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Το τηλέφωνο σας είναι έτοιμο για χρήση!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Ο βοηθός κινητού ακυρώθηκε"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Άγνωστη συσκευή τηλεφώνου (όχι GSM ή CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "άγνωστος τύπος μόντεμ."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "αποτυχία σύνδεσης με το τηλέφωνο."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "σφάλμα λήψης διαύλου σύνδεσης"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "απρόσμενη αποσύνδεση από το τηλέφωνο."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "λήξη χρόνου κατά τον εντοπισμό των λεπτομερειών του τηλεφώνου."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Γίνεται εντοπισμός της ρύθμισης του τηλεφώνου..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Θα πρέπει πρώτα να ενεργοποιηθεί ο προεπιλεγμένος προσαρμογέας Bluetooth "
+#~ "πριν την ρύθμιση μιας τηλεφωνικής σύνδεσης δικτύου."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Αδυναμία δημιουργίας σύνδεσης PAN: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Δίκτυο %s"
+
 #~ msgid "Primary DNS:"
 #~ msgstr "Πρωτεύον DNS:"
 
@@ -3835,9 +4270,6 @@ msgstr "Δείκτης _WEP:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "Δε γνωρίζω πως μπορεί να γίνει η επεξεργασία συνδέσεων τύπου «%s»"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "αδυναμία εύρεσης της συσκευής Bluetooth."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr ""
 #~ "Η διαμόρφωση Bluetooth δεν είναι εφικτή (αποτυχία δημιουργίας "
@@ -3852,9 +4284,6 @@ msgstr "Δείκτης _WEP:"
 #~ msgid "United Kingdom"
 #~ msgstr "Ηνωμένο Βασίλειο"
 
-#~ msgid "Network Manager"
-#~ msgstr "Εφαρμογή NetworkManager"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "Άλλο ασύρματο δίκτυο..."
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 85215f25..4c505c87 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,858 +8,4157 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-31 21:00-0500\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923
-#, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "Passphrase for wireless network %s"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#, fuzzy
+msgid "Network"
+msgstr "_Wired Network"
 
-#: ../gnome/applet/applet-dbus.c:244
-#, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr "Connection to the wireless network '%s' failed."
+#: ../nm-applet.desktop.in.h:2
+#, fuzzy
+msgid "Manage your network connections"
+msgstr "No network connection"
 
-#: ../gnome/applet/applet-dbus.c:249
-msgid "Connection to the wired network failed."
-msgstr "Connection to the wired network failed."
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#, fuzzy
+msgid "Network Connections"
+msgstr "No network connection"
 
-#: ../gnome/applet/applet.c:179
-msgid "Error displaying connection information:"
-msgstr "Error displaying connection information:"
+#: ../nm-connection-editor.desktop.in.h:2
+#, fuzzy
+msgid "Manage and change your network connection settings"
+msgstr "Manage Virtual Private Network Connections"
 
-#: ../gnome/applet/applet.c:196
-msgid "Could not find some required resources (the glade file)!"
-msgstr "Could not find some required resources (the glade file)!"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+msgid "Disable connected notifications"
+msgstr ""
 
-#: ../gnome/applet/applet.c:207
-msgid "No active connections!"
-msgstr "No active connections!"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
 
-#: ../gnome/applet/applet.c:224
-#, c-format
-msgid "Wired Ethernet (%s)"
-msgstr "Wired Ethernet (%s)"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+msgid "Disable disconnected notifications"
+msgstr ""
 
-#: ../gnome/applet/applet.c:226
-#, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "Wireless Ethernet (%s)"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
 
-#: ../gnome/applet/applet.c:323 ../gnome/applet/applet.c:348
-msgid "NetworkManager Applet"
-msgstr "NetworkManager Applet"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
 
-#: ../gnome/applet/applet.c:325 ../gnome/applet/applet.c:350
-msgid "Copyright © 2004-2005 Red Hat, Inc."
-msgstr "Copyright © 2004-2005 Red Hat, Inc."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr ""
 
-#: ../gnome/applet/applet.c:326 ../gnome/applet/applet.c:351
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
-"Notification area applet for managing your network devices and connections."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
-"Notification area applet for managing your network devices and connections."
 
-#: ../gnome/applet/applet.c:329 ../gnome/applet/applet.c:356
-msgid "translator-credits"
-msgstr "Adam Weinberger <adamw@gnome.org>"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr ""
 
-#: ../gnome/applet/applet.c:441
-msgid "VPN Error"
-msgstr "VPN Error"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
 
-#: ../gnome/applet/applet.c:445
-msgid "VPN Login Failure"
-msgstr "VPN Login Failure"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
+msgid "Disable WiFi Create"
+msgstr ""
 
-#: ../gnome/applet/applet.c:446
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr "Could not start the VPN connection '%s' due to a login failure."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
 
-#: ../gnome/applet/applet.c:450
-msgid "VPN Start Failure"
-msgstr "VPN Start Failure"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../gnome/applet/applet.c:451
-#, c-format
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+msgid "Ignore CA certificate"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "NetworkManager Applet"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "NetworkManager Applet"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
 msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
 msgstr ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
 
-#: ../gnome/applet/applet.c:455 ../gnome/applet/applet.c:465
-msgid "VPN Connect Failure"
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "C_onnect"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#, fuzzy
+msgid "_Network name:"
+msgstr "_Network Name:"
+
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr ""
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "No active connections!"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr ""
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
 msgstr "VPN Connect Failure"
 
-#: ../gnome/applet/applet.c:456
-#, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr "Could not start the VPN connection '%s' due to a connection error."
+#: ../src/applet.c:399
+msgid "Device disconnect failed"
+msgstr ""
 
-#: ../gnome/applet/applet.c:460
-msgid "VPN Configuration Error"
-msgstr "VPN Configuration Error"
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "VPN Connect Failure"
 
-#: ../gnome/applet/applet.c:461
-#, c-format
-msgid "The VPN connection '%s' was not correctly configured."
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "Connection to the wired network failed."
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+#, fuzzy
+msgid "Don't show this message again"
+msgstr "_Do not remind me again"
+
+#: ../src/applet.c:844
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
 msgstr "The VPN connection '%s' was not correctly configured."
 
-#: ../gnome/applet/applet.c:466
+#: ../src/applet.c:847
 #, c-format
 msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+
+#: ../src/applet.c:850
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
+
+#: ../src/applet.c:853
+#, 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:856
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
 msgstr ""
 "Could not start the VPN connection '%s' because the VPN server did not "
 "return an adequate network configuration."
 
-#: ../gnome/applet/applet.c:474
+#: ../src/applet.c:859
 #, c-format
-msgid "The VPN service said: \"%s\""
-msgstr "The VPN service said: \"%s\""
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
 
-#: ../gnome/applet/applet.c:543
+#: ../src/applet.c:862
 #, c-format
-msgid "VPN connection '%s' said:"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+
+#: ../src/applet.c:865
+#, 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:872
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
 msgstr "VPN connection '%s' said:"
 
-#: ../gnome/applet/applet.c:545
+#: ../src/applet.c:888
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr "The VPN connection '%s' was not correctly configured."
+
+#: ../src/applet.c:891
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr "The VPN connection '%s' was not correctly configured."
+
+#: ../src/applet.c:897
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr "The VPN connection '%s' was not correctly configured."
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../gnome/applet/applet.c:762 ../gnome/applet/applet.c:2516
-#: ../gnome/applet/other-network-dialog.c:453
-#: ../gnome/applet/passphrase-dialog.c:227
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+#, fuzzy
+msgid "VPN Connection Failed"
+msgstr "VPN Connect Failure"
+
+#: ../src/applet.c:990
+#, c-format
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
 msgstr ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
 
-#: ../gnome/applet/applet.c:774
+#: ../src/applet.c:993
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr "VPN connection '%s' said:"
+
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr ""
+
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr ""
+
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#, fuzzy
+msgid "disconnected"
+msgstr "_Disconnect VPN..."
+
+#: ../src/applet.c:1308
+#, fuzzy
+msgid "Disconnect"
+msgstr "_Disconnect VPN..."
+
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr ""
+
+#: ../src/applet.c:1395
+#, fuzzy
+msgid "No network devices available"
+msgstr "No network devices have been found"
+
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "_VPN Connections"
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "_Configure VPN..."
+
+#: ../src/applet.c:1508
+#, fuzzy
+msgid "_Disconnect VPN"
+msgstr "_Disconnect VPN..."
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager is not running..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "Networking disabled"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "Enable _Networking"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "Enable _Wireless"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr ""
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "Connection _Information"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+#, fuzzy
+msgid "Edit Connections..."
+msgstr "Edit VPN Connection"
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_About"
+
+#: ../src/applet.c:2179
+#, fuzzy, c-format
+msgid "You are now connected to '%s'."
+msgstr "VPN connection to '%s'"
+
+#: ../src/applet.c:2222
+#, fuzzy
+msgid "Disconnected"
+msgstr "_Disconnect VPN..."
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#: ../src/applet.c:2474
+#, fuzzy, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Wired network connection"
+
+#: ../src/applet.c:2477
 #, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr "The network device \"%s (%s)\" does not support wireless scanning."
+msgid "User authentication required for network connection '%s'..."
+msgstr ""
 
-#: ../gnome/applet/applet.c:782
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, fuzzy, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Requesting a network address from the wireless network '%s'..."
+
+#: ../src/applet.c:2483
+#, fuzzy, c-format
+msgid "Network connection '%s' active"
+msgstr "VPN connection '%s' said:"
+
+#: ../src/applet.c:2557
+#, fuzzy, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Cannot start VPN connection '%s'"
+
+#: ../src/applet.c:2560
 #, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr "The network device \"%s (%s)\" does not support link detection."
+msgid "User authentication required for VPN connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2563
+#, fuzzy, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Requesting a network address from the wireless network '%s'..."
 
-#: ../gnome/applet/applet.c:929
+#: ../src/applet.c:2566
+#, fuzzy, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN connection '%s' said:"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "No network connection"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "NetworkManager Applet"
+
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr ""
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr "Preparing device %s for the wired network..."
+msgid "Mobile Broadband (%s)"
+msgstr ""
+
+#: ../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
+msgid "Mobile Broadband"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr ""
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr ""
 
-#: ../gnome/applet/applet.c:931
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr ""
+
+#: ../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
 #, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "Preparing device %s for the wireless network '%s'..."
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr ""
 
-#: ../gnome/applet/applet.c:939
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr "Configuring device %s for the wired network..."
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr ""
 
-#: ../gnome/applet/applet.c:941
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "Attempting to join the wireless network '%s'..."
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr ""
 
-#: ../gnome/applet/applet.c:949
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "Waiting for Network Key for the wireless network '%s'..."
+msgid "Mobile broadband connection '%s' active"
+msgstr ""
 
-#: ../gnome/applet/applet.c:957 ../gnome/applet/applet.c:967
-msgid "Requesting a network address from the wired network..."
-msgstr "Requesting a network address from the wired network..."
+#: ../src/applet-device-ethernet.c:30
+msgid "Auto Ethernet"
+msgstr ""
 
-#: ../gnome/applet/applet.c:959 ../gnome/applet/applet.c:969
-#, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "Requesting a network address from the wireless network '%s'..."
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
+msgstr "Wired Network (%s)"
 
-#: ../gnome/applet/applet.c:977
-msgid "Finishing connection to the wired network..."
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
+msgstr "Wired Network (%s)"
+
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
+msgstr "_Wired Network"
+
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
+msgstr "_Wired Network"
+
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "Finishing connection to the wired network..."
 
-#: ../gnome/applet/applet.c:979
+#: ../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
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
+msgstr "Wireless network connection to '%s' (%d%%)"
+
+#: ../src/applet-device-ethernet.c:167
 #, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "Finishing connection to the wireless network '%s'..."
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr ""
 
-#: ../gnome/applet/applet.c:1096
-msgid "NetworkManager is not running"
-msgstr "NetworkManager is not running"
+#: ../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'..."
 
-#: ../gnome/applet/applet.c:1109 ../gnome/applet/applet.c:1843
-msgid "Networking disabled"
+#: ../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
+#, fuzzy
+msgid "DSL authentication"
+msgstr "Authentication:"
+
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "_Connect to Other Wireless Network..."
+
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
+msgstr "Create _New Wireless Network..."
+
+#: ../src/applet-device-wifi.c:431
+#, fuzzy
+msgid "(none)"
+msgstr "none"
+
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Wired Network (%s)"
+
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Wired Network (%s)"
+
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "_Wired Network"
+msgstr[1] "_Wired Network"
+
+#: ../src/applet-device-wifi.c:934
+msgid "Wi-Fi is disabled"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:996
+#, fuzzy
+msgid "More networks"
+msgstr "_Wired Network"
+
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "Networking disabled"
 
-#: ../gnome/applet/applet.c:1114
-msgid "No network connection"
-msgstr "No network connection"
+#: ../src/applet-device-wifi.c:1181
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr ""
 
-#: ../gnome/applet/applet.c:1119
-msgid "Wired network connection"
+#: ../src/applet-device-wifi.c:1364
+#, 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:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Wired network connection"
 
-#: ../gnome/applet/applet.c:1123
-msgid "Connected to an Ad-Hoc wireless network"
-msgstr "Connected to an Ad-Hoc wireless network"
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Wired network connection"
 
-#: ../gnome/applet/applet.c:1125
+#: ../src/applet-device-wifi.c:1405
 #, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1408
+#, 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:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wireless network connection to '%s' (%d%%)"
 
-#: ../gnome/applet/applet.c:1147
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Wired network connection"
+
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "No active connections!"
+
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "Add a new VPN connection"
+
+#: ../src/applet-dialogs.c:41
+msgid "Error displaying connection information:"
+msgstr "Error displaying connection information:"
+
+#: ../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
+msgid "LEAP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:74
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
+msgid "WPA/WPA2"
+msgstr ""
+
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+msgid "More addresses"
+msgstr ""
+
+#: ../src/applet-dialogs.c:226
+msgid "WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr "None"
+
+#: ../src/applet-dialogs.c:260
 #, c-format
-msgid "VPN connection to '%s'"
-msgstr "VPN connection to '%s'"
+msgid "%s (default)"
+msgstr ""
 
-#: ../gnome/applet/applet.c:1155
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
-msgid "VPN connecting to '%s'"
-msgstr "VPN connecting to '%s'"
+msgid "%u Mb/s"
+msgstr ""
 
-#: ../gnome/applet/applet.c:1568
-msgid "_Connect to Other Wireless Network..."
-msgstr "_Connect to Other Wireless Network..."
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+msgctxt "Speed"
+msgid "Unknown"
+msgstr ""
 
-#: ../gnome/applet/applet.c:1589
-msgid "Create _New Wireless Network..."
-msgstr "Create _New Wireless Network..."
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr ""
 
-#: ../gnome/applet/applet.c:1710
-msgid "_VPN Connections"
-msgstr "_VPN Connections"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP Address:"
 
-#: ../gnome/applet/applet.c:1745
-msgid "_Configure VPN..."
-msgstr "_Configure VPN..."
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Broadcast Address:"
 
-#: ../gnome/applet/applet.c:1749
-msgid "_Disconnect VPN..."
-msgstr "_Disconnect VPN..."
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Subnet Mask:"
 
-#: ../gnome/applet/applet.c:1771
-msgid "_Dial Up Connections"
-msgstr "_Dial-Up Connections"
+#: ../src/applet-dialogs.c:492
+#, fuzzy, c-format
+msgid "Ethernet (%s)"
+msgstr "Wired Ethernet (%s)"
 
-#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../gnome/applet/applet.c:1782
+#: ../src/applet-dialogs.c:495
 #, c-format
-msgid "Connect to %s..."
-msgstr "Connect to %s..."
+msgid "802.11 WiFi (%s)"
+msgstr ""
 
-#: ../gnome/applet/applet.c:1788
+#: ../src/applet-dialogs.c:502
 #, c-format
-msgid "Disconnect from %s..."
-msgstr "Disconnect from %s..."
+msgid "GSM (%s)"
+msgstr ""
 
-#: ../gnome/applet/applet.c:1837
-msgid "No network devices have been found"
-msgstr "No network devices have been found"
+#: ../src/applet-dialogs.c:504
+#, c-format
+msgid "CDMA (%s)"
+msgstr ""
 
-#: ../gnome/applet/applet.c:2029
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager is not running..."
+#. --- General ---
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
+msgid "General"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../gnome/applet/applet.c:2185
-msgid "Enable _Networking"
-msgstr "Enable _Networking"
+#: ../src/applet-dialogs.c:516
+msgid "Interface:"
+msgstr "Interface:"
 
-#. 'Enable Wireless' item
-#: ../gnome/applet/applet.c:2191
-msgid "Enable _Wireless"
-msgstr "Enable _Wireless"
+#: ../src/applet-dialogs.c:536
+msgid "Hardware Address:"
+msgstr "Hardware Address:"
 
-#. 'Connection Information' item
-#: ../gnome/applet/applet.c:2197
-msgid "Connection _Information"
-msgstr "Connection _Information"
+#. Driver
+#: ../src/applet-dialogs.c:550
+msgid "Driver:"
+msgstr "Driver:"
 
-#. Help item
-#: ../gnome/applet/applet.c:2208
-msgid "_Help"
-msgstr "_Help"
+#: ../src/applet-dialogs.c:585
+msgid "Speed:"
+msgstr ""
 
-#. About item
-#: ../gnome/applet/applet.c:2217
-msgid "_About"
-msgstr "_About"
+#: ../src/applet-dialogs.c:600
+#, fuzzy
+msgid "Security:"
+msgstr "_Wireless Security:"
 
-#: ../gnome/applet/applet.c:2635
-msgid ""
-"The NetworkManager applet could not find some required resources.  It cannot "
-"continue.\n"
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+msgid "IPv4"
 msgstr ""
-"The NetworkManager applet could not find some required resources.  It cannot "
-"continue.\n"
 
-#: ../gnome/applet/wireless-security-option.c:157
-msgid "Open System"
-msgstr "Open System"
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Default Route:"
 
-#: ../gnome/applet/wireless-security-option.c:160
-msgid "Shared Key"
-msgstr "Shared Key"
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+msgid "IPv6"
+msgstr ""
 
-#: ../gnome/applet/wireless-security-option.c:209
-msgid "Automatic (Default)"
-msgstr "Automatic (Default)"
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+msgid "Ignored"
+msgstr ""
 
-#: ../gnome/applet/wireless-security-option.c:217
-msgid "TKIP"
-msgstr "TKIP"
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "Type:"
 
-#: ../gnome/applet/wireless-security-option.c:225
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../src/applet-dialogs.c:822
+msgid "VPN Gateway:"
+msgstr ""
 
-#: ../gnome/applet/wso-none.c:53
-msgid "None"
-msgstr "None"
+#: ../src/applet-dialogs.c:828
+#, fuzzy
+msgid "VPN Username:"
+msgstr "User Name:"
 
-#: ../gnome/applet/wso-wep-ascii.c:127
-msgid "WEP 40/128-bit ASCII"
-msgstr "WEP 40/128-bit ASCII"
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
 
-#: ../gnome/applet/wso-wep-hex.c:124
-msgid "WEP 40/128-bit hex"
-msgstr "WEP 40/128-bit hex"
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "VPN Connections"
 
-#: ../gnome/applet/wso-wep-passphrase.c:124
-msgid "WEP Passphrase"
-msgstr "WEP Passphrase"
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr ""
 
-#: ../gnome/applet/eggtrayicon.c:128
-msgid "Orientation"
-msgstr "Orientation"
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:957
+#, fuzzy
+msgid "No valid active connections found!"
+msgstr "No active connections!"
 
-#: ../gnome/applet/eggtrayicon.c:129
-msgid "The orientation of the tray."
-msgstr "The orientation of the tray."
+#: ../src/applet-dialogs.c:985
+msgid ""
+"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2005-2008 Novell, Inc.\n"
+"and many other community contributors and translators"
+msgstr ""
 
-#: ../gnome/applet/menu-items.c:87
-#, c-format
-msgid "Wired Network (%s)"
-msgstr "Wired Network (%s)"
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr ""
+"Notification area applet for managing your network devices and connections."
 
-#: ../gnome/applet/menu-items.c:90
-msgid "_Wired Network"
-msgstr "_Wired Network"
+#: ../src/applet-dialogs.c:990
+#, fuzzy
+msgid "NetworkManager Website"
+msgstr "NetworkManager Applet"
 
-#: ../gnome/applet/menu-items.c:161
+#: ../src/applet-dialogs.c:1005
+msgid "Missing resources"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1030
+msgid "Mobile broadband network password"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1039
 #, c-format
-msgid "Wireless Network (%s)"
-msgid_plural "Wireless Networks (%s)"
-msgstr[0] "Wireless Network (%s)"
-msgstr[1] "Wireless Networks (%s)"
+msgid "A password is required to connect to '%s'."
+msgstr ""
 
-#: ../gnome/applet/menu-items.c:163
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Wireless Network"
-msgstr[1] "Wireless Networks"
+#: ../src/applet-dialogs.c:1054
+msgid "Password:"
+msgstr "Password:"
 
-#: ../gnome/applet/menu-items.c:330
-msgid " (invalid Unicode)"
-msgstr " (invalid Unicode)"
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr ""
 
-#: ../gnome/applet/other-network-dialog.c:352
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr ""
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"By default, the wireless network's name is set to your computer's name, %s, "
-"with no encryption enabled"
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
 msgstr ""
-"By default, the wireless network's name is set to your computer's name, %s, "
-"with no encryption enabled"
 
-#: ../gnome/applet/other-network-dialog.c:358
-msgid "Create new wireless network"
-msgstr "Create new wireless network"
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr ""
 
-#: ../gnome/applet/other-network-dialog.c:359
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
+#, c-format
 msgid ""
-"Enter the name and security settings of the wireless network you wish to "
-"create."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"Enter the name and security settings of the wireless network you wish to "
-"create."
 
-#: ../gnome/applet/other-network-dialog.c:363
-msgid "Create New Wireless Network"
-msgstr "Create New Wireless Network"
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr ""
 
-#: ../gnome/applet/other-network-dialog.c:368
-msgid "Existing wireless network"
-msgstr "Existing wireless network"
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr ""
 
-#: ../gnome/applet/other-network-dialog.c:369
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr "Enter the name of the wireless network to which you wish to connect."
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr ""
 
-#: ../gnome/applet/other-network-dialog.c:371
-msgid "Connect to Other Wireless Network"
-msgstr "Connect to Other Wireless Network"
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+msgid "Show PIN/PUK codes"
+msgstr ""
 
-#: ../gnome/applet/passphrase-dialog.c:214
-msgid "Error connecting to wireless network"
-msgstr "Error connecting to wireless network"
+#: ../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 ""
 
-#: ../gnome/applet/passphrase-dialog.c:215
+#: ../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
 msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
 
-#: ../gnome/applet/vpn-password-dialog.c:152
-#: ../gnome/applet/vpn-password-dialog.c:189
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "Cannot start VPN connection '%s'"
+#: ../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
+msgid "_Add"
+msgstr ""
 
-#: ../gnome/applet/vpn-password-dialog.c:155
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
+#. 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
+msgid "_Delete"
 msgstr ""
-"Could not find the authentication dialogue for VPN connection type '%s'. "
-"Contact your system administrator."
 
-#: ../gnome/applet/vpn-password-dialog.c:192
-#, c-format
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
 msgid ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"There was a problem launching the authentication dialogue for VPN connection "
-"type '%s'. Contact your system administrator."
 
-#: ../gnome/applet/applet.glade.h:1
+#: ../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 " "
 
-#: ../gnome/applet/applet.glade.h:2
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+msgid "Create…"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 
-#: ../gnome/applet/applet.glade.h:4
-#, no-c-format
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "Create VPN Connection"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
+"Select the type of connection you wish to create.\n"
 "\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"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."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
 
-#: ../gnome/applet/applet.glade.h:8
-#, no-c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "Broadcast Address:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "No network connection"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "Interface:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
-"\n"
-"%s  It will not be completely functional."
+"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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "Primary DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+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.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "No active connections!"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Enable _Networking"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+#, fuzzy
+msgid "automatic"
+msgstr "WPA Automatic"
+
+#: ../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
+msgid "default"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "IP Address:"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "IP Address:"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+msgid "device"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:591
+#, 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
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
-"\n"
-"%s  It will not be completely functional."
 
-#: ../gnome/applet/applet.glade.h:12
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
-"span>\n"
-"\n"
-"You have chosen to log in to the wireless network '%s'.  If you are sure "
-"that this wireless network is secure, click the checkbox below and "
-"NetworkManager will not require confirmation on subsequent log ins."
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
-"span>\n"
-"\n"
-"You have chosen to log in to the wireless network '%s'.  If you are sure "
-"that this wireless network is secure, click the checkbox below and "
-"NetworkManager will not require confirmation on subsequent logins."
 
-#: ../gnome/applet/applet.glade.h:15
-msgid "Authentication:"
-msgstr "Authentication:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:16
-msgid "Broadcast Address:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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
+#, fuzzy
+msgid "_Username:"
+msgstr "User Name:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#, 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
+#, 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-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
+#, fuzzy
+msgid "Automatic"
+msgstr "WPA Automatic"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr ""
+
+#: ../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
+msgid "_Device:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+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 ""
+"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-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Default Route:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
 msgstr "Broadcast Address:"
 
-#: ../gnome/applet/applet.glade.h:17
-msgid "C_onnect"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+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.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
 msgstr "C_onnect"
 
-#: ../gnome/applet/applet.glade.h:18
-msgid "Connection Information"
-msgstr "Connection Information"
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:19
-msgid "Default Route:"
-msgstr "Default Route:"
+#: ../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 ""
 
-#: ../gnome/applet/applet.glade.h:20
-msgid "Destination Address:"
-msgstr "Destination Address:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:21
-msgid "Driver:"
-msgstr "Driver:"
+#: ../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
+msgid "Shared to other computers"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:22
-msgid "Hardware Address:"
-msgstr "Hardware Address:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "_Method:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:23
-msgid "IP Address:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#, fuzzy
+msgid "Addresses"
 msgstr "IP Address:"
 
-#: ../gnome/applet/applet.glade.h:24
-msgid "Interface:"
-msgstr "Interface:"
-
-#: ../gnome/applet/applet.glade.h:25
-msgid "Key:"
-msgstr "Key:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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 ""
 
-#: ../gnome/applet/applet.glade.h:26
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
-"None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr ""
+
+#: ../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
+msgid "S_earch domains:"
 msgstr ""
-"None\n"
-"WEP Passphrase\n"
-"WEP 40/128-bit hex\n"
-"WEP 40/128-bit ASCII\n"
 
-#: ../gnome/applet/applet.glade.h:31
+#: ../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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
-"Open System\n"
-"Shared Key"
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses."
 msgstr ""
-"Open System\n"
-"Shared Key"
 
-#: ../gnome/applet/applet.glade.h:33
-msgid "Other Wireless Network..."
-msgstr "Other Wireless Network..."
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:34
-msgid "Passphrase:"
-msgstr "Passphrase:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+msgid ""
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:35
-msgid "Password:"
-msgstr "Password:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:36
-msgid "Primary DNS:"
-msgstr "Primary DNS:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:37
-msgid "Secondary DNS:"
-msgstr "Secondary DNS:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:38
-msgid "Subnet Mask:"
-msgstr "Subnet Mask:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:39
-msgid "Type:"
-msgstr "Type:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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 ""
 
-#: ../gnome/applet/applet.glade.h:40
-msgid "User Name:"
-msgstr "User Name:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:41
-msgid "Wireless Network Key Required"
-msgstr "Wireless Network Key Required"
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:42
-msgid "Wireless _adapter:"
-msgstr "Wireless _adapter:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+msgid ""
+"When connecting to IPv4-capable networks, allows the connection to complete "
+"if IPv6 configuration fails but IPv4 configuration succeeds."
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:43
-msgid "_Always Trust this Wireless Network"
-msgstr "_Always Trust this Wireless Network"
+#: ../src/connection-editor/ce-page-mobile.ui.h:1
+msgid "Basic"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:44
-msgid "_Don't remind me again"
-msgstr "_Do not remind me again"
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "Nu_mber:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:45
-msgid "_Login to Network"
-msgstr "_Login to Network"
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Advanced"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "_APN:"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:46
-msgid "_Network Name:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#, fuzzy
+msgid "N_etwork ID:"
 msgstr "_Network Name:"
 
-#: ../gnome/applet/applet.glade.h:47
-msgid "_Wireless Security:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Sho_w passwords"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#, 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.h:3
+msgid "Configure _Methods…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+msgid "Compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
+msgid "_Require 128-bit encryption"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+msgid "Use _stateful MPPE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Allow _BSD data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
+msgid "Allow _Deflate data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Use TCP _header compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid "Send PPP _echo packets"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "No active connections!"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+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.h:3
+msgid "Cloned MAC _address:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
+msgid "Device name + number"
+msgstr ""
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
 msgstr "_Wireless Security:"
 
-#: ../gnome/applet/applet.glade.h:48
-msgid "leap_subwindow"
-msgstr "leap_subwindow"
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:49
-msgid "wep_key_subwindow"
-msgstr "wep_key_subwindow"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:50
-msgid "wep_passphrase_subwindow"
-msgstr "wep_passphrase_subwindow"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../gnome/applet/applet.glade.h:51
-msgid "wpa_psk_subwindow"
-msgstr "wpa_psk_subwindow"
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr ""
 
-#: ../gnome/applet/wso-wpa-psk.c:168
-msgid "WPA2 Personal"
-msgstr "WPA2 Personal"
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr ""
 
-#: ../gnome/applet/wso-wpa-psk.c:170
-msgid "WPA Personal"
-msgstr "WPA Personal"
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:358
-msgid "Cannot add VPN connection"
-msgstr "Cannot add VPN connection"
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Allowed Authentication Methods"
+msgstr "Authentication:"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:360
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
-"No suitable VPN software was found on your system. Contact your system "
-"administrator."
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
 msgstr ""
-"No suitable VPN software was found on your system. Contact your system "
-"administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:412
-msgid "Cannot import VPN connection"
-msgstr "Cannot import VPN connection"
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:414
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../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 ""
+
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "Hardware Address:"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+msgid "Import a saved VPN configuration..."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:332
+#, fuzzy
+msgid "Could not create new connection"
+msgstr "Add a new VPN connection"
+
+#: ../src/connection-editor/connection-helpers.c:469
+#, fuzzy
+msgid "Connection delete failed"
+msgstr "Connection to the wired network failed."
+
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Address"
+msgstr "IP Address:"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr ""
+
+#: ../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
+msgid "Gateway"
+msgstr ""
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr ""
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+#, fuzzy
+msgid "Editing un-named connection"
+msgstr "Edit VPN Connection"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Error displaying connection information:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+msgid "Editor initializing..."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Connection to the wired network failed."
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+#, fuzzy
 msgid ""
-"Cannot find suitable software for VPN connection type '%s' to import the "
-"file '%s'. Contact your system administrator."
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "_Save"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "Create VPN Connection"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not edit connection"
+msgstr "No network connection"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+#, 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
+#, fuzzy
+msgid "Connection _name:"
+msgstr "Connection _Information"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "E_xport"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr ""
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:160
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:178
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:182
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:684
+#, fuzzy
+msgid "Edit the selected connection"
+msgstr "Edit the selected VPN connection"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+#, fuzzy
+msgid "Authenticate to edit the selected connection"
+msgstr "Delete the selected VPN connection"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+#, fuzzy
+msgid "Delete the selected connection"
+msgstr "Delete the selected VPN connection"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+#, fuzzy
+msgid "Authenticate to delete the selected connection"
+msgstr "Delete the selected VPN connection"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
 msgstr ""
-"Cannot find suitable software for VPN connection type '%s' to import the "
-"file '%s'. Contact your system administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:554
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
-msgid "Error retrieving VPN connection '%s'"
+msgid "Don't know how to create '%s' connections"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:933
+#, fuzzy
+msgid "Error creating connection"
 msgstr "Error retrieving VPN connection '%s'"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:557
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "Error retrieving VPN connection '%s'"
+
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
-msgid ""
-"Could not find the UI files for VPN connection type '%s'. Contact your "
-"system administrator."
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:111
+msgid "Could not load 802.1x Security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
 msgstr ""
-"Could not find the UI files for VPN connection type '%s'. Contact your "
-"system administrator."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:717
+#: ../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
+msgid "Could not load Bluetooth user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
-msgid "Delete VPN connection \"%s\"?"
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
 msgstr "Delete VPN connection \"%s\"?"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:720
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "_Login to Network"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "_Wired Network"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "Primary DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "No network connection"
+
+#: ../src/connection-editor/page-bridge.c:213
+msgid "Could not load bridge user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+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
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+msgid "Could not load bridge port user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+msgid "Could not load DCB user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:129
+msgid "Could not load DSL user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:214
+#, fuzzy, c-format
+msgid "DSL connection %d"
+msgstr "VPN connection '%s' said:"
+
+#: ../src/connection-editor/page-ethernet.c:74
+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:328
+msgid "Could not load ethernet user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:457
+msgid "Ethernet device"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+msgid "cloned MAC"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+#, fuzzy
+msgid "Default"
+msgstr "Default Route:"
+
+#: ../src/connection-editor/page-general.c:52
+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 is not running..."
+
+#: ../src/connection-editor/page-general.c:350
+msgid "Could not load General user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "Cannot add VPN connection"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
+#, fuzzy
+msgid "Automatic (VPN)"
+msgstr "Automatic (Default)"
+
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
+msgid "Automatic (VPN) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
+#, fuzzy
+msgid "Automatic (PPPoE)"
+msgstr "Automatic (Default)"
+
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
+msgid "Automatic (PPPoE) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:135
+#, fuzzy
+msgid "Automatic (DHCP)"
+msgstr "Automatic (Default)"
+
+#: ../src/connection-editor/page-ip4.c:136
+msgid "Automatic (DHCP) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
+msgid "Link-Local Only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+msgid "Additional DNS ser_vers:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+msgid "Additional s_earch domains:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:965
+#, c-format
+msgid "Editing IPv4 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1160
+msgid "Could not load IPv4 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
+msgid "Ignore"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:172
+#, fuzzy
+msgid "Automatic, DHCP only"
+msgstr "Automatic (Default)"
+
+#: ../src/connection-editor/page-ip6.c:964
+#, c-format
+msgid "Editing IPv6 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1157
+msgid "Could not load IPv6 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
-"All information about the VPN connection \"%s\" will be lost and you may "
-"need your system administrator to provide information to create a new "
-"connection."
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
 msgstr ""
-"All information about the VPN connection \"%s\" will be lost and you may "
-"need your system administrator to provide information to create a new "
-"connection."
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:926
-msgid "Unable to load"
-msgstr "Unable to load"
+#: ../src/connection-editor/page-master.c:385
+#, c-format
+msgid "%s slave %d"
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.c:928
-msgid "Cannot find some needed resources (the glade file)!"
-msgstr "Cannot find some needed resources (the glade file)!"
+#: ../src/connection-editor/page-mobile.c:310
+msgid "Could not load mobile broadband user interface."
+msgstr ""
 
-#. Edit dialog
-#: ../gnome/vpn-properties/nm-vpn-properties.c:1043
-msgid "Edit VPN Connection"
-msgstr "Edit VPN Connection"
+#: ../src/connection-editor/page-mobile.c:327
+msgid "Unsupported mobile broadband connection type."
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1
-msgid "Add a new VPN connection"
-msgstr "Add a new VPN connection"
+#. Fall back to just asking for GSM vs. CDMA
+#: ../src/connection-editor/page-mobile.c:529
+msgid "Select Mobile Broadband Provider Type"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:561
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:568
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+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:258
+msgid "PAP"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
+msgid "CHAP"
+msgstr ""
+
+#: ../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
+msgid "MSCHAPv2"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
+msgid "MSCHAP"
+msgstr ""
+
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:136
+msgid "none"
+msgstr "none"
+
+#: ../src/connection-editor/page-ppp.c:196
+#, c-format
+msgid "Editing PPP authentication methods for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:281
+msgid "Could not load PPP user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+msgid "Could not load team user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+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:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "No network connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2
-msgid "Choose which type of VPN connection you wish to create."
-msgstr "Choose the type of VPN connection you wish to create."
+#: ../src/connection-editor/page-vlan.c:596
+msgid "Could not load vlan user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "VPN connection to '%s'"
+
+#: ../src/connection-editor/page-vpn.c:103
+msgid "Could not load VPN user interface."
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3
-msgid "Connect to:"
-msgstr "Connect to:"
+#: ../src/connection-editor/page-vpn.c:118
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
+#, fuzzy, c-format
+msgid "VPN connection %d"
+msgstr "VPN connection to '%s'"
+
+#: ../src/connection-editor/page-vpn.c:229
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4
-msgid "Create VPN Connection"
+#: ../src/connection-editor/page-vpn.c:254
+#, fuzzy
+msgid "Choose a VPN Connection Type"
 msgstr "Create VPN Connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5
-msgid "Create VPN Connection - 1 of 2"
-msgstr "Create VPN Connection - 1 of 2"
+#: ../src/connection-editor/page-vpn.c:255
+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 ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6
-msgid "Create VPN Connection - 2 of 2"
-msgstr "Create VPN Connection - 2 of 2"
+#: ../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 ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7
-msgid "Delete the selected VPN connection"
-msgstr "Delete the selected VPN connection"
+#: ../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 ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8
-msgid "E_xport"
-msgstr "E_xport"
+#: ../src/connection-editor/page-wifi.c:197
+#, c-format
+msgid "%u (%u MHz)"
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:9
-msgid "Edit the selected VPN connection"
-msgstr "Edit the selected VPN connection"
+#: ../src/connection-editor/page-wifi.c:450
+msgid "Could not load Wi-Fi user interface."
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:10
-msgid "Export the VPN settings to a file"
-msgstr "Export the VPN settings to a file"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:11
-msgid "Export the selected VPN connection to a file"
-msgstr "Export the selected VPN connection to a file"
+#: ../src/connection-editor/page-wifi.c:577
+msgid "Wi-Fi device"
+msgstr ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:12
-msgid "Finish Creating VPN Connection"
-msgstr "Finish Creating VPN Connection"
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "VPN connection '%s' said:"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:13
-msgid "Manage Virtual Private Network Connections"
-msgstr "Manage Virtual Private Network Connections"
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "WEP Passphrase"
+
+#: ../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)"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#, fuzzy
+msgid "WPA & WPA2 Personal"
+msgstr "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
+msgid "WPA & WPA2 Enterprise"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:413
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
+msgstr "_Wireless Security:"
+
+#: ../src/connection-editor/page-wifi-security.c:426
+msgid "Could not load Wi-Fi security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:512
+#, c-format
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:138
+msgid "Cannot import VPN connection"
+msgstr "Cannot import VPN connection"
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:14
+#: ../src/connection-editor/vpn-helpers.c:140
+#, c-format
 msgid ""
-"This assistant will guide you through the creation of a connection to a "
-"Virtual Private Network (VPN).\n"
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
 "\n"
-"It will require some information, such as IP addresses and secrets.  Please "
-"see your system administrator to obtain this information."
+"Error: %s."
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:141
+msgid "unknown error"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:215
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:217
+msgid "_Replace"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:219
+#, c-format
+msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
-"This assistant will guide you through creating a connection to a Virtual "
-"Private Network (VPN).\n"
+
+#: ../src/connection-editor/vpn-helpers.c:255
+#, fuzzy
+msgid "Cannot export VPN connection"
+msgstr "Cannot import VPN connection"
+
+#: ../src/connection-editor/vpn-helpers.c:257
+#, fuzzy, c-format
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
 "\n"
-"It will require some information, such as IP addresses and secrets.  Please "
-"see your system administrator to obtain this information."
+"Error: %s."
+msgstr "The VPN connection '%s' was not correctly configured."
+
+#: ../src/connection-editor/vpn-helpers.c:292
+#, fuzzy
+msgid "Export VPN connection..."
+msgstr "Edit VPN Connection"
+
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
+#, fuzzy
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"The NetworkManager Applet could not find some required resources (the glade "
+"file was not found)."
+
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr ""
+
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr ""
+
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Connection Information"
+
+#: ../src/info.ui.h:3
+#, fuzzy
+msgid "Active Network Connections"
+msgstr "Wired network connection"
+
+#: ../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 ""
 
-#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:17
-msgid "VPN Connections"
+#: ../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-wizard.c:325
+#: ../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 ""
+
+#: ../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
+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
+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 ""
+
+#: ../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
+msgid "Installed GSM device"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../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
+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:"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../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
+msgid "Your broadband billing plan name"
+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 ""
+
+#: ../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 ""
+
+#: ../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
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr ""
+
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+msgid "The password is not required"
+msgstr ""
+
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../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
+#, fuzzy
+msgid "_Ternary 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
+#, 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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
+msgid "New..."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "None"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+msgid "C_reate"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Wireless Network Key Required"
+
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Create New Wireless Network"
+
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+msgid "New Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, 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:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Connect to Other Wireless Network"
+
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Enter the name and security settings of the wireless network you wish to "
+"create."
+
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Wireless Security:"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#, fuzzy
+msgid "C_onnection:"
+msgstr "C_onnect"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Wireless _adapter:"
+
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr ""
+
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+
+#: ../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
+msgid "EVDO"
+msgstr ""
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:68
+msgid "HSPA+"
+msgstr ""
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr ""
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr ""
+
+#: ../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
+msgid "Home network"
+msgstr "_Wired Network"
+
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr ""
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr ""
+
+#: ../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
+msgid "Roaming network"
+msgstr "_Login to Network"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr ""
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr ""
+
+#: ../src/mobile-helpers.c:619
+#, fuzzy, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Wireless network connection to '%s' (%d%%)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
 msgstr "VPN Connections"
 
-#: ../src/nm-ap-security-wep.c:47
-msgid "40-bit WEP"
-msgstr "40-bit WEP"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/nm-ap-security-wep.c:49
-msgid "104-bit WEP"
-msgstr "104-bit WEP"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/nm-ap-security-wpa-psk.c:50
-msgid "WPA TKIP"
-msgstr "WPA TKIP"
+#: ../src/wireless-security/eap-method.c:452
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
 
-#: ../src/nm-ap-security-wpa-psk.c:52
-msgid "WPA CCMP"
-msgstr "WPA CCMP"
+#: ../src/wireless-security/eap-method.c:455
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr ""
 
-#: ../src/nm-ap-security-wpa-psk.c:54
-msgid "WPA Automatic"
-msgstr "WPA Automatic"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr ""
 
-#: ../src/nm-ap-security-wpa-psk.c:59
-msgid "WPA2 TKIP"
-msgstr "WPA2 TKIP"
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
+msgid "GTC"
+msgstr ""
 
-#: ../src/nm-ap-security-wpa-psk.c:61
-msgid "WPA2 CCMP"
-msgstr "WPA2 CCMP"
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
 
-#: ../src/nm-ap-security-wpa-psk.c:63
-msgid "WPA2 Automatic"
-msgstr "WPA2 Automatic"
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
 
-#: ../src/nm-ap-security.c:310
-msgid "none"
-msgstr "none"
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+msgid "Anonymous"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "Authentication:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+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
+#, fuzzy
+msgid "_Inner authentication:"
+msgstr "Authentication:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+msgid "MD5"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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
+msgid "No CA certificate is _required"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+msgid "PEAP _version:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
+msgid "Unencrypted private keys are insecure"
+msgstr ""
 
-#: ../src/nm-netlink-monitor.c:154
+#: ../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)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:475
+msgid "Choose your personal certificate..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:487
+msgid "Choose your private key..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "Private _key:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_Private key password:"
+msgstr ""
+
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
+msgid "TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
+msgid "Tunneled TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:493
+msgid "Protected EAP (PEAP)"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Au_thentication:"
+msgstr "Authentication:"
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
 #, c-format
 msgid ""
-"unable to create netlink socket for monitoring wired ethernet devices - %s"
+"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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
+msgid "Open System"
+msgstr "Open System"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "Shared Key"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+#, fuzzy
+msgid "_Key:"
+msgstr "Key:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
 msgstr ""
-"Unable to create netlink socket for monitoring wired ethernet devices - %s"
 
-#: ../src/nm-netlink-monitor.c:172
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x:"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
-"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+"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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
-"Unable to bind to netlink socket for monitoring wired ethernet devices - %s"
 
-#: ../src/nm-netlink-monitor.c:405
-msgid "operation took too long"
-msgstr "Operation took too long"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#, fuzzy
+msgid "_Type:"
+msgstr "Type:"
+
+#~ msgid "Passphrase for wireless network %s"
+#~ msgstr "Passphrase for wireless network %s"
+
+#~ msgid "Connection to the wireless network '%s' failed."
+#~ msgstr "Connection to the wireless network '%s' failed."
+
+#~ msgid "Could not find some required resources (the glade file)!"
+#~ msgstr "Could not find some required resources (the glade file)!"
+
+#~ msgid "Wireless Ethernet (%s)"
+#~ msgstr "Wireless Ethernet (%s)"
+
+#~ 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"
+
+#~ msgid "VPN Login Failure"
+#~ msgstr "VPN Login Failure"
+
+#~ msgid "Could not start the VPN connection '%s' due to a login failure."
+#~ msgstr "Could not start the VPN connection '%s' due to a login failure."
+
+#~ msgid "VPN Start Failure"
+#~ msgstr "VPN Start Failure"
+
+#~ msgid ""
+#~ "Could not start the VPN connection '%s' due to a failure launching the "
+#~ "VPN program."
+#~ msgstr ""
+#~ "Could not start the VPN connection '%s' due to a failure launching the "
+#~ "VPN program."
+
+#~ msgid "VPN Configuration Error"
+#~ msgstr "VPN Configuration Error"
+
+#~ msgid "The VPN service said: \"%s\""
+#~ msgstr "The VPN service said: \"%s\""
+
+#~ msgid "The network device \"%s (%s)\" does not support wireless scanning."
+#~ msgstr "The network device \"%s (%s)\" does not support wireless scanning."
+
+#~ msgid "The network device \"%s (%s)\" does not support link detection."
+#~ msgstr "The network device \"%s (%s)\" does not support link detection."
+
+#~ msgid "Preparing device %s for the wired network..."
+#~ msgstr "Preparing device %s for the wired network..."
+
+#~ msgid "Configuring device %s for the wired network..."
+#~ msgstr "Configuring device %s for the wired network..."
+
+#~ msgid "Attempting to join the wireless network '%s'..."
+#~ msgstr "Attempting to join the wireless network '%s'..."
+
+#~ msgid "Waiting for Network Key for the wireless network '%s'..."
+#~ msgstr "Waiting for Network Key for the wireless network '%s'..."
+
+#~ msgid "Requesting a network address from the wired network..."
+#~ msgstr "Requesting a network address from the wired network..."
+
+#~ msgid "NetworkManager is not running"
+#~ msgstr "NetworkManager is not running"
+
+#~ msgid "Connected to an Ad-Hoc wireless network"
+#~ msgstr "Connected to an Ad-Hoc wireless network"
+
+#~ msgid "VPN connecting to '%s'"
+#~ msgstr "VPN connecting to '%s'"
+
+#~ msgid "_Dial Up Connections"
+#~ msgstr "_Dial-Up Connections"
+
+#~ msgid "Connect to %s..."
+#~ msgstr "Connect to %s..."
+
+#~ msgid "Disconnect from %s..."
+#~ msgstr "Disconnect from %s..."
+
+#~ msgid "_Help"
+#~ msgstr "_Help"
+
+#~ msgid ""
+#~ "The NetworkManager applet could not find some required resources.  It "
+#~ "cannot continue.\n"
+#~ msgstr ""
+#~ "The NetworkManager applet could not find some required resources.  It "
+#~ "cannot continue.\n"
+
+#~ msgid "TKIP"
+#~ msgstr "TKIP"
+
+#~ msgid "AES-CCMP"
+#~ msgstr "AES-CCMP"
+
+#~ msgid "WEP 40/128-bit hex"
+#~ msgstr "WEP 40/128-bit hex"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientation"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "The orientation of the tray."
+
+#~ msgid "Wireless Network (%s)"
+#~ msgid_plural "Wireless Networks (%s)"
+#~ msgstr[0] "Wireless Network (%s)"
+#~ msgstr[1] "Wireless Networks (%s)"
+
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "Wireless Network"
+#~ msgstr[1] "Wireless Networks"
+
+#~ msgid " (invalid Unicode)"
+#~ msgstr " (invalid Unicode)"
+
+#~ msgid ""
+#~ "By default, the wireless network's name is set to your computer's name, "
+#~ "%s, with no encryption enabled"
+#~ msgstr ""
+#~ "By default, the wireless network's name is set to your computer's name, "
+#~ "%s, with no encryption enabled"
+
+#~ msgid "Create new wireless network"
+#~ msgstr "Create new wireless network"
+
+#~ msgid "Existing wireless network"
+#~ msgstr "Existing wireless network"
+
+#~ msgid ""
+#~ "The requested wireless network requires security capabilities unsupported "
+#~ "by your hardware."
+#~ msgstr ""
+#~ "The requested wireless network requires security capabilities unsupported "
+#~ "by your hardware."
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "Could not find the authentication dialogue for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "There was a problem launching the authentication dialogue for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+#~ "Network</span>\n"
+#~ "\n"
+#~ "A passphrase or encryption key is required to access the wireless network "
+#~ "'%s'."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+#~ "Network</span>\n"
+#~ "\n"
+#~ "A passphrase or encryption key is required to access the wireless network "
+#~ "'%s'."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</"
+#~ "span>\n"
+#~ "\n"
+#~ "%s  It will not be completely functional."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</"
+#~ "span>\n"
+#~ "\n"
+#~ "%s  It will not be completely functional."
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
+#~ "Confirmation</span>\n"
+#~ "\n"
+#~ "You have chosen to log in to the wireless network '%s'.  If you are sure "
+#~ "that this wireless network is secure, click the checkbox below and "
+#~ "NetworkManager will not require confirmation on subsequent log ins."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
+#~ "Confirmation</span>\n"
+#~ "\n"
+#~ "You have chosen to log in to the wireless network '%s'.  If you are sure "
+#~ "that this wireless network is secure, click the checkbox below and "
+#~ "NetworkManager will not require confirmation on subsequent logins."
+
+#~ msgid "Destination Address:"
+#~ msgstr "Destination Address:"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+#~ msgstr ""
+#~ "None\n"
+#~ "WEP Passphrase\n"
+#~ "WEP 40/128-bit hex\n"
+#~ "WEP 40/128-bit ASCII\n"
+
+#~ msgid ""
+#~ "Open System\n"
+#~ "Shared Key"
+#~ msgstr ""
+#~ "Open System\n"
+#~ "Shared Key"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "Other Wireless Network..."
+
+#~ msgid "Passphrase:"
+#~ msgstr "Passphrase:"
+
+#~ msgid "_Always Trust this Wireless Network"
+#~ msgstr "_Always Trust this Wireless Network"
+
+#~ msgid "leap_subwindow"
+#~ msgstr "leap_subwindow"
+
+#~ msgid "wep_key_subwindow"
+#~ msgstr "wep_key_subwindow"
+
+#~ msgid "wep_passphrase_subwindow"
+#~ msgstr "wep_passphrase_subwindow"
+
+#~ msgid "wpa_psk_subwindow"
+#~ msgstr "wpa_psk_subwindow"
+
+#~ msgid "WPA Personal"
+#~ msgstr "WPA Personal"
+
+#~ msgid ""
+#~ "No suitable VPN software was found on your system. Contact your system "
+#~ "administrator."
+#~ msgstr ""
+#~ "No suitable VPN software was found on your system. Contact your system "
+#~ "administrator."
+
+#~ msgid ""
+#~ "Cannot find suitable software for VPN connection type '%s' to import the "
+#~ "file '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "Cannot find suitable software for VPN connection type '%s' to import the "
+#~ "file '%s'. Contact your system administrator."
+
+#~ msgid ""
+#~ "Could not find the UI files for VPN connection type '%s'. Contact your "
+#~ "system administrator."
+#~ msgstr ""
+#~ "Could not find the UI files for VPN connection type '%s'. Contact your "
+#~ "system administrator."
+
+#~ msgid ""
+#~ "All information about the VPN connection \"%s\" will be lost and you may "
+#~ "need your system administrator to provide information to create a new "
+#~ "connection."
+#~ msgstr ""
+#~ "All information about the VPN connection \"%s\" will be lost and you may "
+#~ "need your system administrator to provide information to create a new "
+#~ "connection."
+
+#~ msgid "Unable to load"
+#~ msgstr "Unable to load"
+
+#~ msgid "Cannot find some needed resources (the glade file)!"
+#~ msgstr "Cannot find some needed resources (the glade file)!"
+
+#~ msgid "Choose which type of VPN connection you wish to create."
+#~ msgstr "Choose the type of VPN connection you wish to create."
+
+#~ msgid "Connect to:"
+#~ msgstr "Connect to:"
+
+#~ msgid "Create VPN Connection - 1 of 2"
+#~ msgstr "Create VPN Connection - 1 of 2"
+
+#~ msgid "Create VPN Connection - 2 of 2"
+#~ msgstr "Create VPN Connection - 2 of 2"
+
+#~ msgid "Export the VPN settings to a file"
+#~ msgstr "Export the VPN settings to a file"
+
+#~ msgid "Export the selected VPN connection to a file"
+#~ msgstr "Export the selected VPN connection to a file"
+
+#~ msgid "Finish Creating VPN Connection"
+#~ msgstr "Finish Creating VPN Connection"
+
+#~ msgid ""
+#~ "This assistant will guide you through the creation of a connection to a "
+#~ "Virtual Private Network (VPN).\n"
+#~ "\n"
+#~ "It will require some information, such as IP addresses and secrets.  "
+#~ "Please see your system administrator to obtain this information."
+#~ msgstr ""
+#~ "This assistant will guide you through creating a connection to a Virtual "
+#~ "Private Network (VPN).\n"
+#~ "\n"
+#~ "It will require some information, such as IP addresses and secrets.  "
+#~ "Please see your system administrator to obtain this information."
+
+#~ msgid "40-bit WEP"
+#~ msgstr "40-bit WEP"
+
+#~ msgid "104-bit WEP"
+#~ msgstr "104-bit WEP"
+
+#~ msgid "WPA TKIP"
+#~ msgstr "WPA TKIP"
+
+#~ msgid "WPA CCMP"
+#~ msgstr "WPA CCMP"
+
+#~ msgid "WPA2 TKIP"
+#~ msgstr "WPA2 TKIP"
+
+#~ msgid "WPA2 CCMP"
+#~ msgstr "WPA2 CCMP"
 
-#: ../src/nm-netlink-monitor.c:502
-msgid "received data from wrong type of sender"
-msgstr "Received data from wrong type of sender"
+#~ msgid "WPA2 Automatic"
+#~ msgstr "WPA2 Automatic"
 
-#: ../src/nm-netlink-monitor.c:515
-msgid "received data from unexpected sender"
-msgstr "Received data from unexpected sender"
+#~ msgid ""
+#~ "unable to create netlink socket for monitoring wired ethernet devices - %s"
+#~ msgstr ""
+#~ "Unable to create netlink socket for monitoring wired ethernet devices - %s"
+
+#~ msgid ""
+#~ "unable to bind to netlink socket for monitoring wired ethernet devices - "
+#~ "%s"
+#~ msgstr ""
+#~ "Unable to bind to netlink socket for monitoring wired ethernet devices - "
+#~ "%s"
+
+#~ msgid "operation took too long"
+#~ msgstr "Operation took too long"
+
+#~ msgid "received data from wrong type of sender"
+#~ msgstr "Received data from wrong type of sender"
+
+#~ msgid "received data from unexpected sender"
+#~ msgstr "Received data from unexpected sender"
 
-#: ../src/nm-netlink-monitor.c:646
-msgid "too much data was sent over socket and some of it was lost"
-msgstr "Too much data was sent over socket and some of it was lost"
+#~ msgid "too much data was sent over socket and some of it was lost"
+#~ msgstr "Too much data was sent over socket and some of it was lost"
 
-#: ../src/nm-netlink-monitor.c:735
-msgid "error occurred while waiting for data on socket"
-msgstr "error occurred while waiting for data on socket"
+#~ msgid "error occurred while waiting for data on socket"
+#~ msgstr "error occurred while waiting for data on socket"
diff --git a/po/en_GB.po b/po/en_GB.po
index 6277e5a6..ead52c8f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-26 18:07+0000\n"
+"POT-Creation-Date: 2016-04-05 14:02+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,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Network"
 
@@ -97,10 +97,18 @@ msgstr ""
 "Set to true to disable creation of adhoc networks when using the applet."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "Ignore CA certificate"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -108,7 +116,7 @@ msgstr ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -116,46 +124,90 @@ msgstr ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Network Manager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Network Manager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X authentication"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "C_onnect"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Network name:"
 
-#: ../src/applet.c:541
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Failed to add/activate connection"
 
-#: ../src/applet.c:543 ../src/applet.c:587 ../src/applet.c:613
-#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ../src/applet.c:546 ../src/applet.c:616 ../src/applet-device-wifi.c:1379
-#: ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Connection failure"
 
-#: ../src/applet.c:585
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Device disconnect failed"
 
-#: ../src/applet.c:590
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Disconnect failure"
 
-#: ../src/applet.c:611
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Connection activation failed"
 
-#: ../src/applet.c:982 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Don't show this message again"
 
-#: ../src/applet.c:1071
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -166,7 +218,7 @@ msgstr ""
 "The VPN connection '%s' failed because the network connection was "
 "interrupted."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -175,7 +227,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 
-#: ../src/applet.c:1077
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -186,7 +238,7 @@ msgstr ""
 "The VPN connection '%s' failed because the VPN service returned invalid "
 "configuration."
 
-#: ../src/applet.c:1080
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -195,7 +247,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the connection attempt timed out."
 
-#: ../src/applet.c:1083
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -204,7 +256,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service did not start in time."
 
-#: ../src/applet.c:1086
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -213,7 +265,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because the VPN service failed to start."
 
-#: ../src/applet.c:1089
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -222,7 +274,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because there were no valid VPN secrets."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -231,7 +283,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed because of invalid VPN secrets."
 
-#: ../src/applet.c:1099
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -240,7 +292,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' failed."
 
-#: ../src/applet.c:1117
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -251,7 +303,7 @@ msgstr ""
 "The VPN connection '%s' disconnected because the network connection was "
 "interrupted."
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -260,7 +312,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' disconnected because the VPN service stopped."
 
-#: ../src/applet.c:1126
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -269,7 +321,7 @@ msgstr ""
 "\n"
 "The VPN connection '%s' disconnected."
 
-#: ../src/applet.c:1156
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -280,19 +332,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1158
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN connection has been successfully established.\n"
 
-#: ../src/applet.c:1160
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN Login Message"
 
-#: ../src/applet.c:1166 ../src/applet.c:1174 ../src/applet.c:1224
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN Connection Failed"
 
-#: ../src/applet.c:1231
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -305,7 +357,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1234
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -318,668 +370,554 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1549
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "device not ready (firmware missing)"
 
-#: ../src/applet.c:1551
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "device not ready"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1561 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "disconnected"
 
-#: ../src/applet.c:1577
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Disconnect"
 
-#: ../src/applet.c:1591
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "device not managed"
 
-#: ../src/applet.c:1635
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "No network devices available"
 
-#: ../src/applet.c:1723
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN Connections"
 
-#: ../src/applet.c:1780
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Configure VPN…"
 
-#: ../src/applet.c:1784
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Disconnect VPN"
 
-#: ../src/applet.c:1878
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager is not running…"
 
-#: ../src/applet.c:1883 ../src/applet.c:2735
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Networking disabled"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2104
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Enable _Networking"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2113
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Enable _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2122
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Enable _Mobile Broadband"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2131
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Enable WiMA_X Mobile Broadband"
-
 #. Toggle notifications item
-#: ../src/applet.c:2142
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Enable N_otifications"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2153
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Connection _Information"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2163
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Edit Connections…"
 
-#. Help item
-#: ../src/applet.c:2177
-msgid "_Help"
-msgstr "_Help"
-
-#. About item
-#: ../src/applet.c:2186
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_About"
 
-#: ../src/applet.c:2364
+#
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "You are now connected to '%s'."
+
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: ../src/applet.c:2365
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "The network connection has been disconnected."
 
-#: ../src/applet.c:2598
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Preparing network connection '%s'…"
 
-#: ../src/applet.c:2601
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "User authentication required for network connection '%s'…"
 
 #
-#: ../src/applet.c:2604 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:594
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Requesting a network address for '%s'…"
 
-#: ../src/applet.c:2607
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Network connection '%s' active"
 
-#: ../src/applet.c:2690
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Starting VPN connection '%s'…"
 
-#: ../src/applet.c:2693
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "User authentication required for VPN connection '%s'…"
 
 #
-#: ../src/applet.c:2696
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Requesting a VPN address for '%s'…"
 
-#: ../src/applet.c:2699
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN connection '%s' active"
 
-#: ../src/applet.c:2740
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "No network connection"
 
-#: ../src/applet.c:3441
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Applet"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:772
-#: ../src/applet-device-gsm.c:359 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr "Wrong PUK code; please contact your provider."
+
+#: ../src/applet-device-broadband.c:201
+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:252
+msgid "Sending unlock code..."
+msgstr "Sending unlock code…"
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Mobile Broadband (%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
+msgid "Mobile Broadband"
+msgstr "Mobile Broadband"
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Available"
 
-#
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:816
-#: ../src/applet-device-gsm.c:401 ../src/applet-device-wimax.c:419
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "You are now connected to '%s'."
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr "New Mobile Broadband connection…"
 
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:820
-#: ../src/applet-device-gsm.c:405 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Connection Established"
 
-#: ../src/applet-device-bt.c:200
+#: ../src/applet-device-broadband.c:816
+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:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr "Mobile Broadband network."
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "You are now registered on the home network."
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "You are now registered on a roaming network."
+
+#: ../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:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Preparing mobile broadband connection '%s'…"
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Configuring mobile broadband connection '%s'…"
 
-#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:591
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:239 ../src/mobile-helpers.c:611
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobile broadband connection '%s' active"
 
-#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:718
-#: ../src/applet-device-gsm.c:305 ../src/applet-dialogs.c:424
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Mobile Broadband (%s)"
-
-#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:720
-#: ../src/applet-device-gsm.c:307
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
-#: ../src/libnm-gtk/nm-ui-utils.c:333
-msgid "Mobile Broadband"
-msgstr "Mobile Broadband"
-
-#. Default connection item
-#: ../src/applet-device-cdma.c:316
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "New Mobile Broadband (CDMA) connection…"
-
-#: ../src/applet-device-cdma.c:350
-msgid "You are now connected to the CDMA network."
-msgstr "You are now connected to the CDMA network."
-
-#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
-msgid "CDMA network."
-msgstr "CDMA network."
-
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:958
-#: ../src/applet-device-gsm.c:678
-msgid "You are now registered on the home network."
-msgstr "You are now registered on the home network."
-
-#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:964
-#: ../src/applet-device-gsm.c:684
-msgid "You are now registered on a roaming network."
-msgstr "You are now registered on a roaming network."
-
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Auto Ethernet"
 
-#: ../src/applet-device-ethernet.c:202
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet Networks (%s)"
 
-#: ../src/applet-device-ethernet.c:204
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet Network (%s)"
 
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet Networks"
 
-#: ../src/applet-device-ethernet.c:209
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet Network"
 
-#: ../src/applet-device-ethernet.c:271
+#: ../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:297
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Preparing ethernet network connection '%s'…"
 
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Configuring ethernet network connection '%s'…"
 
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:167
 #, 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:306
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Requesting an ethernet network address for '%s'…"
 
-#: ../src/applet-device-ethernet.c:310
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Ethernet network connection '%s' active"
 
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL authentication"
 
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:520
-msgid "Wrong PUK code; please contact your provider."
-msgstr "Wrong PUK code; please contact your provider."
-
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:497
-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:257 ../src/applet-device-gsm.c:547
-msgid "Sending unlock code..."
-msgstr "Sending unlock code…"
-
-#. Default connection item
-#: ../src/applet-device-broadband.c:785
-msgid "New Mobile Broadband connection..."
-msgstr "New Mobile Broadband connection…"
-
-#: ../src/applet-device-broadband.c:821
-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:957 ../src/applet-device-broadband.c:963
-msgid "Mobile Broadband network."
-msgstr "Mobile Broadband network."
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:372
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "New Mobile Broadband (GSM) connection…"
-
-#: ../src/applet-device-gsm.c:406
-msgid "You are now connected to the GSM network."
-msgstr "You are now connected to the GSM network."
-
-#: ../src/applet-device-gsm.c:677 ../src/applet-device-gsm.c:683
-msgid "GSM network."
-msgstr "GSM network."
-
-#: ../src/applet-device-wifi.c:98
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Connect to Hidden Wi-Fi Network…"
 
-#: ../src/applet-device-wifi.c:149
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Create _New Wi-Fi Network…"
 
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(none)"
 
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi Networks (%s)"
 
-#: ../src/applet-device-wifi.c:789
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi Network (%s)"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi Network"
 msgstr[1] "Wi-Fi Networks"
 
-#: ../src/applet-device-wifi.c:824
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi is disabled"
 
-#: ../src/applet-device-wifi.c:825
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi is disabled by hardware switch"
 
-#: ../src/applet-device-wifi.c:886
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "More networks"
 
 #
-#: ../src/applet-device-wifi.c:1065
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi Networks Available"
 
-#: ../src/applet-device-wifi.c:1066
+#: ../src/applet-device-wifi.c:1181
 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:1260
+#: ../src/applet-device-wifi.c:1364
 #, 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:1291
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Preparing Wi-Fi network connection '%s'…"
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Configuring Wi-Fi network connection '%s'…"
 
 #
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1405
 #, 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:1300
+#: ../src/applet-device-wifi.c:1408
 #, 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:1321
+#: ../src/applet-device-wifi.c:1419
 #, 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:1326
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi network connection '%s' active"
 
-#: ../src/applet-device-wifi.c:1374
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Failed to activate connection"
 
-#: ../src/applet-device-wifi.c:1393
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Failed to add new connection"
 
-#: ../src/applet-device-wimax.c:227
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX Mobile Broadband (%s)"
-
-#: ../src/applet-device-wimax.c:229
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX Mobile Broadband"
-
-#: ../src/applet-device-wimax.c:255
-msgid "WiMAX is disabled"
-msgstr "WiMAX is disabled"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX is disabled by hardware switch"
-
-#: ../src/applet-device-wimax.c:424
-msgid "You are now connected to the WiMAX network."
-msgstr "You are now connected to the WiMAX network."
-
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:606
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Mobile broadband connection '%s' active: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:609
-msgid "roaming"
-msgstr "roaming"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Error displaying connection information:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamic WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Addresses"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "None"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (default)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/applet-dialogs.c:361
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP Address:"
 
-#: ../src/applet-dialogs.c:363
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "unknown"
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Broadcast Address:"
 
-#: ../src/applet-dialogs.c:375
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "unknown"
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Subnet Mask:"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
-#: ../src/connection-editor/page-general.c:345
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "General"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Hardware Address:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Speed:"
 
 #
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Security:"
 
-#: ../src/applet-dialogs.c:512
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:525
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "IP Address:"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "Broadcast Address:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "Subnet Mask:"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Default Route:"
 
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "Primary DNS:"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "Secondary DNS:"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "Ternary DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignored"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN Type:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN Gateway:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN Username:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN Banner:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Base Connection:"
 
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Unknown"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "No valid active connections found!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -987,43 +925,43 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:988
 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:944
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager Website"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Missing resources"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Mobile broadband network password"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "A password is required to connect to '%s'."
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/applet-dialogs.c:1310
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN unlock required"
 
-#: ../src/applet-dialogs.c:1311
+#: ../src/applet-dialogs.c:1337
 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:1313
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1033,25 +971,25 @@ msgstr ""
 "used."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1315
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN code:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1319
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Show PIN code"
 
-#: ../src/applet-dialogs.c:1321
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK unlock required"
 
-#: ../src/applet-dialogs.c:1322
+#: ../src/applet-dialogs.c:1348
 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:1324
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1061,29 +999,36 @@ msgstr ""
 "used."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK code:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "New PIN code:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Re-enter new PIN code:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Show PIN/PUK codes"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1091,18 +1036,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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Delete"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_nore automatically obtained routes"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1110,9 +1078,8 @@ msgstr ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1120,11 +1087,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+msgid "Create…"
+msgstr "Create…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "Choose a Connection Type"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1136,10 +1107,6 @@ 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-new-connection.ui.h:6
-msgid "Create…"
-msgstr "Create…"
-
 #: ../src/connection-editor/ce-page-bond.ui.h:1
 msgid "Round-robin"
 msgstr "Round-robin"
@@ -1181,45 +1148,41 @@ msgid "Bonded _connections:"
 msgstr "Bonded _connections:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "M_ode:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
-msgid "_Edit"
-msgstr "_Edit"
-
-#. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "_Delete"
-msgstr "_Delete"
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Edit"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Monitoring _frequency:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: ../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:"
 msgstr "_Interface name:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "_Link Monitoring:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP _targets:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1227,21 +1190,50 @@ 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Link _up delay:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Link _down delay:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "Primary DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "bytes"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "Path _cost:"
 
 #
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Priority:"
 
@@ -1253,40 +1245,290 @@ msgstr "_Hairpin mode:"
 msgid "Bridged _connections:"
 msgstr "Bridged _connections:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "_Forward delay:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Hello time:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Enable _Networking"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Enable _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Max age:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_Ageing time:"
 
-#: ../src/connection-editor/ce-page.c:72
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatic"
 
-#: ../src/connection-editor/ce-page.c:356
+#: ../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
+msgid "default"
+msgstr "default"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Address"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Address"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Any device"
+
+#: ../src/connection-editor/ce-page.c:591
 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
+#, 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
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#, fuzzy
+msgid "Enable"
+msgstr "Enable _Wi-Fi"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#, fuzzy
+msgid "Priority"
+msgstr "_Priority:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#, fuzzy
+msgid "Priority Groups"
+msgstr "_Priority:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Priority:"
+msgstr "_Priority:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Priority Bandwidth:"
+msgstr "_Priority:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:10
+#: ../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
@@ -1299,15 +1541,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 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:11
+#: ../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
@@ -1319,7 +1563,8 @@ msgstr "_Password:"
 #: ../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-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatic"
@@ -1374,18 +1619,18 @@ msgstr "Aut_onegotiate"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "_Device MAC address:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Service:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "C_loned MAC address:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1395,19 +1640,54 @@ 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-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "bytes"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Default"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignore"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Broadcast"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Private key password:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1446,8 +1726,8 @@ msgstr "Automatic with manual DNS settings"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manual"
 
@@ -1458,22 +1738,22 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 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:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_Method:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Addresses"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1483,8 +1763,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:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1492,26 +1772,25 @@ msgstr ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 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:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "DNS ser_vers:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1519,11 +1798,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1531,16 +1810,43 @@ 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:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Routes…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Disabled"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 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:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1549,71 +1855,38 @@ msgstr ""
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Any"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Prefer 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Prefer 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Prefer 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Use only 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Basic"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Nu_mber:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Advanced"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "N_etwork ID:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Type:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Change…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "Sho_w passwords"
 
@@ -1665,29 +1938,71 @@ msgstr "Echo"
 msgid "Send PPP _echo packets"
 msgstr "Send PPP _echo packets"
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+msgid "_Import team configuration from a file..."
+msgstr "Import a saved VPN configuration…"
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Bonded _connections:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "Import a saved VPN configuration…"
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Parent interface:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN interface _name:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Cloned MAC address:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN _id:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Device name + number"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + number"
 
@@ -1705,94 +2020,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastructure"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Transmission po_wer:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Rate:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "C_hannel:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ban_d:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "M_ode:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Allowed Authentication Methods"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1800,101 +2119,78 @@ 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/ip4-routes-dialog.c:762
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip4.c:928
-#: ../src/connection-editor/page-ip6.c:894
-msgid "Address"
-msgstr "Address"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/page-ip4.c:945
-msgid "Netmask"
-msgstr "Netmask"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-#: ../src/connection-editor/page-ip4.c:962
-#: ../src/connection-editor/page-ip6.c:928
-msgid "Gateway"
-msgstr "Gateway"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:813
-#: ../src/connection-editor/ip6-routes-dialog.c:755
-msgid "Metric"
-msgstr "Metric"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip6.c:911
-msgid "Prefix"
-msgstr "Prefix"
-
-#: ../src/connection-editor/new-connection.c:101
-#: ../src/connection-editor/page-ethernet.c:251
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:483 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:134
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:131
-#: ../src/connection-editor/page-infiniband.c:168
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:559
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/new-connection.c:143
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+#: ../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
+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
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:563
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:252
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Import a saved VPN configuration…"
 
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -1902,29 +2198,79 @@ msgstr ""
 "The connection editor dialogue could not be initialised due to an unknown "
 "error."
 
-#: ../src/connection-editor/new-connection.c:380
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Could not create new connection"
 
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Connection delete failed"
 
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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/nm-connection-editor.c:118
+#: ../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
+msgid "Address"
+msgstr "Address"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Netmask"
+
+#: ../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
+msgid "Gateway"
+msgstr "Gateway"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Metric"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Prefix"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Editing %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Editing un-named connection"
 
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Connection _name:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Error initialising editor"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Connection add failed"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -1932,177 +2278,207 @@ msgstr ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Save"
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Save any changes made to this connection."
 
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "_Save..."
-msgstr "_Save…"
-
-#: ../src/connection-editor/nm-connection-editor.c:411
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:427
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Could not create connection"
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Could not edit connection"
 
-#: ../src/connection-editor/nm-connection-editor.c:429
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Unknown error creating connection editor dialogue."
 
-#: ../src/connection-editor/nm-connection-editor.c:536
-msgid "Error saving connection"
-msgstr "Error saving connection"
-
-#: ../src/connection-editor/nm-connection-editor.c:537
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "The property '%s' / '%s' is invalid: %d"
-
-#: ../src/connection-editor/nm-connection-editor.c:631
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Error initialising editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:952
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Connection add failed"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: ../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
 msgid "Connection _name:"
 msgstr "Connection _name:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Export…"
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "never"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "now"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:631
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Name"
 
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Last Used"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Edit the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:687
-msgid "_Edit..."
-msgstr "_Edit…"
-
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Authenticate to edit the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Delete the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:704
-msgid "_Delete..."
-msgstr "_Delete…"
-
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Authenticate to delete the selected connection"
 
-#: ../src/connection-editor/nm-connection-list.c:942
-msgid "Error creating connection"
-msgstr "Error creating connection"
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:943
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:998
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "Error creating connection"
+
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Error editing connection"
 
-#: ../src/connection-editor/nm-connection-list.c:999
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Did not find a connection with UUID '%s'"
 
 #
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x Security"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 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:141
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Use 802.1_X security for this connection"
 
-#: ../src/connection-editor/page-bond.c:422
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Could not load ethernet user interface."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "could not find the Bluetooth device."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Bond connection %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Ethernet Network"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Wi-Fi Network"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Could not load bond user interface."
 
-#: ../src/connection-editor/page-bond.c:561
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "Primary DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bond connection %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Could not load bridge user interface."
 
@@ -2114,50 +2490,75 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Bridge Port"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Could not load bridge port user interface."
 
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "Could not load DSL user interface."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Could not load DSL user interface."
 
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL connection %d"
 
-#: ../src/connection-editor/page-ethernet.c:90
-#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:113
-#: ../src/connection-editor/page-wimax.c:70
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "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:253
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Could not load ethernet user interface."
 
-#: ../src/connection-editor/page-ethernet.c:396
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "C_loned MAC address:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:59
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Default"
 
-#: ../src/connection-editor/page-general.c:60
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2167,138 +2568,193 @@ 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:61
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD is not running."
 
-#: ../src/connection-editor/page-general.c:348
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Could not load General user interface."
 
-#: ../src/connection-editor/page-infiniband.c:171
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Could not load InfiniBand user interface."
 
-#: ../src/connection-editor/page-infiniband.c:263
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand connection %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatic (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatic (VPN) addresses only"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Automatic (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Automatic (PPP) addresses only"
+msgid "Automatic, addresses only"
+msgstr "Automatic, addresses only"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatic (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatic (PPPoE) addresses only"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatic (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatic (DHCP) addresses only"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Link-Local Only"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Disabled"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Additional DNS ser_vers:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Additional s_earch domains:"
 
-#: ../src/connection-editor/page-ip4.c:860
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editing IPv4 routes for %s"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 Settings"
 
-#: ../src/connection-editor/page-ip4.c:1013
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Could not load IPv4 user interface."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "Automatic, addresses only"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatic, DHCP only"
 
-#: ../src/connection-editor/page-ip6.c:826
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editing IPv6 routes for %s"
 
-#: ../src/connection-editor/page-ip6.c:975
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 Settings"
 
-#: ../src/connection-editor/page-ip6.c:977
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Could not load IPv6 user interface."
 
-#: ../src/connection-editor/page-master.c:284
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Could not load mobile broadband user interface."
 
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:327
 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:658
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Select Mobile Broadband Provider Type"
 
-#: ../src/connection-editor/page-mobile.c:693
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2306,93 +2762,144 @@ msgstr ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 
-#: ../src/connection-editor/page-mobile.c:698
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:705
+#: ../src/connection-editor/page-mobile.c:568
 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:715 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "none"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP Settings"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Could not load PPP user interface."
 
-#: ../src/connection-editor/page-vlan.c:482
+#: ../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 "Select file to import"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "Could not load vlan user interface."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+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:151
+#, fuzzy
+msgid "Team Port"
+msgstr "Bridge Port"
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+msgid "Could not load team port user interface."
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "No network connection"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Could not load vlan user interface."
 
-#: ../src/connection-editor/page-vlan.c:678
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN connection %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Could not load VPN user interface."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Could not find VPN plugin service for '%s'."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN connection %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2402,11 +2909,11 @@ msgstr ""
 "\n"
 "Error: no VPN service type."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Choose a VPN Connection Type"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2416,7 +2923,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:98
+#: ../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"
@@ -2424,84 +2931,92 @@ 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:190
-#: ../src/connection-editor/page-wifi.c:194
-#: ../src/connection-editor/page-wifi.c:215
-#, c-format
-msgid "default"
-msgstr "default"
+#: ../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)\""
+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:219
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:485
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Could not load Wi-Fi user interface."
 
-#: ../src/connection-editor/page-wifi.c:663
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Any device"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi connection %d"
 
-#: ../src/connection-editor/page-wifi-security.c:265
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "None"
-
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:396
+#: ../src/connection-editor/page-wifi-security.c:413
 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:407
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi Security"
 
-#: ../src/connection-editor/page-wifi-security.c:409
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Could not load Wi-Fi security user interface."
 
-#: ../src/connection-editor/page-wimax.c:137
-msgid "Could not load WiMAX user interface."
-msgstr "Could not load WiMAX user interface."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:233
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX connection %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Cannot import VPN connection"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2514,29 +3029,30 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "Select file to import"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Unknown error"
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "A file named \"%s\" already exists."
 
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Replace"
 
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:332
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Cannot export VPN connection"
 
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2547,11 +3063,11 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Export VPN connection…"
 
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../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)."
@@ -2559,132 +3075,49 @@ msgstr ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:445
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Use your mobile phone as a network device (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:454
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Access the Internet using your mobile phone (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:336
-#, c-format
-msgid "Error: %s"
-msgstr "Error: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:443
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Failed to create DUN connection: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:445
-#: ../src/gnome-bluetooth/nma-bt-device.c:985
-msgid "Your phone is now ready to use!"
-msgstr "Your phone is now ready to use!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:468
-msgid "Mobile wizard was canceled"
-msgstr "Mobile wizard was cancelled"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:477
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Unknown phone device type (not GSM or CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:513
-msgid "unknown modem type."
-msgstr "unknown modem type."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:733
-#: ../src/gnome-bluetooth/nma-bt-device.c:739
-msgid "failed to connect to the phone."
-msgstr "failed to connect to the phone."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:770
-msgid "unexpectedly disconnected from the phone."
-msgstr "unexpectedly disconnected from the phone."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:780
-msgid "timed out detecting phone details."
-msgstr "timed out detecting phone details."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:816
-msgid "Detecting phone configuration..."
-msgstr "Detecting phone configuration…"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:869
-msgid "ModemManager is not running"
-msgstr "ModemManager is not running"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:946
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:983
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Failed to create PAN connection: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:1004
-#, c-format
-msgid "%s Network"
-msgstr "%s Network"
-
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "Automatically unlock this device"
-
 #: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Unlock"
 
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "Automatically unlock this device"
+
 #: ../src/info.ui.h:1
 msgid "Connection Information"
 msgstr "Connection Information"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Active Network Connections"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:208
+#: ../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/libnm-gtk/nm-mobile-wizard.c:215
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Your Device:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:226
+#: ../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/libnm-gtk/nm-mobile-wizard.c:237
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Your Plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: ../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 "
@@ -2698,23 +3131,28 @@ msgstr ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:274
+#: ../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/libnm-gtk/nm-mobile-wizard.c:338
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Unlisted"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:493
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Select your plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:517
+#: ../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/libnm-gtk/nm-mobile-wizard.c:541
+#: ../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"
@@ -2726,67 +3164,83 @@ msgstr ""
 "\n"
 "If you are unsure of your plan please ask your provider for your plan's APN."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:548
+#: ../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/libnm-gtk/nm-mobile-wizard.c:597
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "My plan is not listed…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provider"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: ../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 "I can't find my provider and I wish to enter it _manually:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:803
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Provider:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:827
+#: ../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/libnm-gtk/nm-mobile-wizard.c:833
+#: ../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/libnm-gtk/nm-mobile-wizard.c:844
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Choose your Provider"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Country or region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1173
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Choose your Provider's Country or Region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Installed GSM device"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installed CDMA device"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../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."
@@ -2794,122 +3248,146 @@ msgstr ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "mobile (3G) network."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "You will need the following information:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Your broadband provider's name"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Your broadband billing plan name"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../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 "(in some cases) Your broadband billing plan APN (Access Point Name)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../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 "Create a connection for _this mobile broadband device:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Any device"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Set up a Mobile Broadband Connection"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "New Mobile Broadband Connection"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
-msgid "Wired"
-msgstr "Wired"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:343
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:405
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Password:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Password:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "Sho_w passwords"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "New…"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "None"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_reate"
 
 #
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, 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/libnm-gtk/nm-wifi-dialog.c:1138
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi Network Authentication Required"
 
 #
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Authentication required by Wi-Fi network"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Create New Wi-Fi Network"
 
 #
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "New Wi-Fi network"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connect to Hidden Wi-Fi Network"
 
 #
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Hidden Wi-Fi network"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -2918,24 +3396,56 @@ msgstr ""
 "connect to."
 
 #
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi _security:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Co_nnection:"
 
 #
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi _adapter:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Usage:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -2943,7 +3453,7 @@ msgstr ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -2951,147 +3461,152 @@ msgstr ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "not enabled"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "not registered"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Home network (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Home network"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "searching"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registration denied"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Roaming network (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Roaming network"
 
-#: ../src/mobile-helpers.c:317
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN code for SIM card '%s' on '%s'"
 
-#: ../src/mobile-helpers.c:450
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN code required"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN code is needed for the mobile broadband device"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Mobile broadband connection '%s' active: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "roaming"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s connection"
 
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "No Certificate Authority certificate chosen"
-
-#: ../src/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
 
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "Choose CA Certificate"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:648
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Choose a PAC file…"
 
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC files (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "All files"
 
@@ -3118,8 +3633,8 @@ msgid "PAC _file:"
 msgstr "PAC _file:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "_Inner authentication:"
 
@@ -3127,14 +3642,32 @@ msgstr "_Inner authentication:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Allow automatic PAC pro_visioning"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "Choose a Certificate Authority certificate…"
 
@@ -3152,19 +3685,57 @@ msgstr "Version 1"
 msgid "C_A certificate:"
 msgstr "C_A certificate:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "Ignore CA certificate"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "PEAP _version:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "As_k for this password every time"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A certificate:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Unencrypted private keys are insecure"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../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 "
@@ -3178,11 +3749,11 @@ msgstr ""
 "\n"
 "(You can password-protect your private key with openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Choose your personal certificate…"
 
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Choose your private key…"
 
@@ -3194,27 +3765,44 @@ msgstr "I_dentity:"
 msgid "_User certificate:"
 msgstr "_User certificate:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Private _key:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "_Private key password:"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunnelled TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
@@ -3224,29 +3812,55 @@ msgstr "Protected EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Au_thentication:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "Open System"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "Shared Key"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:4
-msgid "2"
-msgstr "2"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "3"
+msgid "Open System"
+msgstr "Open System"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "4"
+msgid "Shared Key"
+msgstr "Shared Key"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -3260,6 +3874,227 @@ msgstr "Sho_w key"
 msgid "WEP inde_x:"
 msgstr "WEP inde_x:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Type:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Enable WiMA_X Mobile Broadband"
+
+#~ msgid "_Help"
+#~ msgstr "_Help"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "New Mobile Broadband (CDMA) connection…"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "You are now connected to the CDMA network."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA network."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "New Mobile Broadband (GSM) connection…"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "You are now connected to the GSM network."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM network."
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX Mobile Broadband (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX Mobile Broadband"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX is disabled"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX is disabled by hardware switch"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "You are now connected to the WiMAX network."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "unknown"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "unknown"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "Secondary DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "Ternary DNS:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Mode:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_Device MAC address:"
+
+#~ msgid "Any"
+#~ msgstr "Any"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Prefer 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Prefer 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Prefer 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Use only 4G (LTE)"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastructure"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "_Save..."
+#~ msgstr "_Save…"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Error saving connection"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "The property '%s' / '%s' is invalid: %d"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Edit…"
+
+#~ msgid "_Delete..."
+#~ msgstr "_Delete…"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Automatic (PPP)"
+
+#~ 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)."
+#~ msgstr ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Use your mobile phone as a network device (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Access the Internet using your mobile phone (DUN)"
+
+#~ 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!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Mobile wizard was cancelled"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Unknown phone device type (not GSM or CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "unknown modem type."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "failed to connect to the phone."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "unexpectedly disconnected from the phone."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "timed out detecting phone details."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Detecting phone configuration…"
+
+#~ msgid "ModemManager is not running"
+#~ msgstr "ModemManager is not running"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Failed to create PAN connection: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s Network"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "No Certificate Authority certificate chosen"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "Choose CA Certificate"
+
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "Wireless Networks (%s)"
 
@@ -3324,9 +4159,6 @@ msgstr "WEP inde_x:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "Don't know how to edit '%s' connections"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "could not find the Bluetooth device."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr ""
 #~ "Bluetooth configuration not possible (failed to create D-Bus proxy)."
@@ -3354,9 +4186,6 @@ msgstr "WEP inde_x:"
 #~ msgid "United Kingdom"
 #~ msgstr "United Kingdom"
 
-#~ msgid "Network Manager"
-#~ msgstr "Network Manager"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "Other Wireless Networks…"
 
diff --git a/po/eo.po b/po/eo.po
index 97b2231c..a30b75d0 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -12,9 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-03-20 11:06+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-03-20 13:59+0100\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
 "Language-Team: Esperanto <gnome-l10n-eo@lists.launchpad.net>\n"
@@ -27,7 +26,7 @@ msgstr ""
 "X-Generator: Launchpad (build 14907)\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Reto"
 
@@ -49,8 +48,6 @@ msgid "Disable connected notifications"
 msgstr "Elŝalti atentigojn pri konektoj"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
-#| msgid ""
-#| "Set this to TRUE to disable notifications when connecting to a network."
 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."
@@ -60,23 +57,16 @@ msgid "Disable disconnected notifications"
 msgstr "Elŝalti atentigojn pri malkonektoj"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
 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
-#| msgid "Disable connected notifications"
 msgid "Disable VPN notifications"
 msgstr "Elŝalti VPN-atentigojn"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:6
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -89,9 +79,6 @@ msgid "Suppress networks available notifications"
 msgstr "Nuligi atentigon pri disponeblaj retoj"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
-#| msgid ""
-#| "Set this to TRUE to disable notifications when wireless networks are "
-#| "available."
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
@@ -111,8 +98,6 @@ msgid "Disable WiFi Create"
 msgstr "Elŝalti kreon de sendrataj konektoj"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
-#| msgid ""
-#| "Set to TRUE to disable creation of adhoc networks when using the applet."
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
@@ -128,7 +113,6 @@ msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:15
-#| msgid "Choose CA Certificate"
 msgid "Ignore CA certificate"
 msgstr "Ignori CA-atestilon"
 
@@ -144,53 +128,90 @@ msgid ""
 "authentication."
 msgstr ""
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
-#| msgid "Wired 802.1X authentication"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Reta mastrumilo"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Reta mastrumilo"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-aŭtentigo"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "K_onekti"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "Ret_nomo:"
 
-#: ../src/applet.c:574
-#| msgid "Failed to create PAN connection: %s"
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Provizore"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Malsukcesis aldoni/aktivigi konekton"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
-#| msgid "Unknown"
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Nekonata eraro"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
-#| msgid "Connection add failed"
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Konekto malsukcesis"
 
-#: ../src/applet.c:618
-#| msgid "disconnected"
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr ""
 
-#: ../src/applet.c:623
-#| msgid "Disconnected"
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Malkonekto malsukcesis"
 
-#: ../src/applet.c:644
-#| msgid "Connection add failed"
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Konekto-aktivigo malsukcesis"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Ne remontri tiun mesaĝon"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -200,7 +221,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto '%s' ĉar retkonekto estis interrompita."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -209,7 +230,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto '%s' ĉar VPN-servo haltigis neatendite."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -219,7 +240,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto '%s' ĉar VPN-servo revenigis nevalidan agordon."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -228,7 +249,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto '%s' ĉar la konekta provo eltempiĝis."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -237,7 +258,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto '%s' ĉar la VPN-servo ne komencis tempe."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -246,7 +267,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto '%s' ĉar la VPN-servo malsukcesis je la komenco."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -255,7 +276,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto '%s' ĉar ne estis validaj VPN-sekretaĵoj."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -264,7 +285,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto '%s' ĉar estis nevalidaj VPN-sekretaĵoj."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -273,7 +294,7 @@ msgstr ""
 "\n"
 "Malsukcesis VPN-konekto '%s' ."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -283,7 +304,7 @@ msgstr ""
 "\n"
 "Malkonektiĝis VPN-konekto '%s' ĉar retkonekto estis interrompita."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -292,7 +313,7 @@ msgstr ""
 "\n"
 "Malkonektiĝis VPN-konekto '%s' ĉar la VPN-servo haltigis."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -301,7 +322,7 @@ msgstr ""
 "\n"
 "Malkonektiĝis VPN-konekto '%s' ."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -309,19 +330,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN-ensalutmesaĝo"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Malsukcesis VPN-konekto"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -334,7 +355,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -347,891 +368,555 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "aparato ne pretas (mikroprogramaro mankas)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "Aparato ne preta"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "nekonektite"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Malkonekti"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "Aparato ne administrita"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Neniuj retaparatoj disponeblaj"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN-konektoj"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Agordi na VPN..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Malkonekti VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager ne estas rulanta..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2940
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Retkonektado elŝaltitas"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Enŝalti _reton"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
-#| msgid "Enable _Wireless"
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Enŝalti _sendratan reton"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Enŝalti _moveblan larĝkapacitan konekton"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Enŝalti WiMAX-larĝkapacitan konekton"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Enŝalti atentig_ojn"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Konektaj _informoj"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Redakti konektojn..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "_Helpo"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Pri"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Vi estas konektita al '%s'."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Malkonektita"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "La retkonekto estas malkonektigita."
 
-#: ../src/applet.c:2802
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Agordanta retkonekton '%s'..."
 
-#: ../src/applet.c:2805
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Retkonekto '%s' necesas uzantan aŭtentigon..."
 
-#: ../src/applet.c:2808 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Petanta retan adreson por '%s'..."
 
-#: ../src/applet.c:2811
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Retkonekto '%s' aktiva"
 
-#: ../src/applet.c:2894
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Komencanta VPN-konekton '%s'..."
 
-#: ../src/applet.c:2897
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
 
-#: ../src/applet.c:2900
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Petanta VPN-adreson por '%s'..."
 
-#: ../src/applet.c:2903
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-konekto '%s' aktiva"
 
-#: ../src/applet.c:2945
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Neniu retkonekto"
 
-#: ../src/applet.c:3615
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Apleto por NetworkManager"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:769 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Disponeble"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:796 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Konekto estas starigita"
-
-#: ../src/applet-device-bond.c:90
-#| msgid "You are now connected to the wired network."
-msgid "You are now connected to the bonded network."
-msgstr "Vi estas nun konektite al la drata reto."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing bond connection '%s'..."
-msgstr "Agordante dratan konekton '%s'..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-#| msgid "Configuring mobile broadband connection '%s'..."
-msgid "Configuring bond connection '%s'..."
-msgstr "Agordas dratan konekton '%s'..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Drata retkonekto '%s' bezonas uzantan aŭtentigon..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-#| msgid "Requesting a VPN address for '%s'..."
-msgid "Requesting address for '%s'..."
-msgstr "Petanta adreson por '%s'..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Bond connection '%s' active"
-msgstr "Drata konekto '%s' aktiva"
-
-#: ../src/applet-device-bridge.c:90
-#| msgid "You are now connected to the wired network."
-msgid "You are now connected to the bridged network."
-msgstr "Vi estas nun konektite al la pontita reto."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing bridge connection '%s'..."
-msgstr "Agordanta pont-konekton '%s'..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-#| msgid "Configuring wired network connection '%s'..."
-msgid "Configuring bridge connection '%s'..."
-msgstr "Agordanta pont-konekton '%s'…"
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Pont-retkonekto '%s' bezonas uzantan aŭtentigon..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Bridge connection '%s' active"
-msgstr "Pont-konekto '%s' aktiva"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Malĝusta PUK-kodo; bonvolu kontakti vian retprovizanton."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Sendas malŝlosan kodon..."
 
-#: ../src/applet-device-broadband.c:715 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:421
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Poŝtelefona larĝkapacita reto (%s)"
 
-#: ../src/applet-device-broadband.c:717 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Poŝtelefona larĝkapacita reto"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Disponeble"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:782
+#: ../src/applet-device-broadband.c:801
 #, fuzzy
-#| msgid "New Mobile Broadband Connection"
 msgid "New Mobile Broadband connection..."
 msgstr "Nova poŝtelefona larĝkapacita konekto"
 
-#: ../src/applet-device-broadband.c:797
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Konekto estas starigita"
+
+#: ../src/applet-device-broadband.c:816
 #, fuzzy
-#| msgid "You are now connected to the mobile broadband network."
 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:932 ../src/applet-device-broadband.c:938
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 #, fuzzy
-#| msgid "Mobile broadband network password"
 msgid "Mobile Broadband network."
 msgstr "Pasvorto de la movebla larĝkapacita konekto"
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Vi estas nun registrita en la hejma reto."
 
-#: ../src/applet-device-broadband.c:939 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Vi estas nun registrita en la retmigra reto."
 
-#: ../src/applet-device-bt.c:103
+#: ../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:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Pretigas poŝtelefonan larĝkapacitan konekton '%s'..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Agordas poŝtelefonan larĝkapacitan konekton '%s'..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Poŝtelefona larĝkapacita konekto '%s' aktivas"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Nova poŝtelefona larĝkapacita (CDMA) konekto..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Vi estas konektita al la CDMA-reto."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "CDMA-reto."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Aŭtomata eterreto"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
-#| msgid "Wired Networks (%s)"
 msgid "Ethernet Networks (%s)"
 msgstr "Drataj retoj (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
-#| msgid "Wired Network (%s)"
 msgid "Ethernet Network (%s)"
 msgstr "Drata reto (%s)"
 
-#: ../src/applet-device-ethernet.c:101
-#| msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Drataj retoj"
 
-#: ../src/applet-device-ethernet.c:103
-#| msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Drata reto"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 #, fuzzy
-#| msgid "You are now connected to the wired network."
 msgid "You are now connected to the ethernet network."
 msgstr "Vi estas nun konektite al la drata reto."
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, fuzzy, c-format
-#| msgid "Preparing wired network connection '%s'..."
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Preparanta drat-retan konekton '%s'…"
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, fuzzy, c-format
-#| msgid "Configuring wired network connection '%s'..."
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Agordanta drat-retan konekton '%s'…"
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, fuzzy, c-format
-#| msgid "User authentication required for wired network connection '%s'..."
 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:180
+#: ../src/applet-device-ethernet.c:170
 #, fuzzy, c-format
-#| msgid "Requesting a wired network address for '%s'..."
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Petanta drat-retan adreson por '%s'..."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, fuzzy, c-format
-#| msgid "Wired network connection '%s' active"
 msgid "Ethernet network connection '%s' active"
 msgstr "Drat-reta konekto '%s' aktiva"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-aŭtentigo"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Nova port-larĝkapacita (GSM) konekto..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Vi estas nun konektite al la GSM-reto."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "GSM-reto."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr ""
-
-#: ../src/applet-device-infiniband.c:92
-#, fuzzy, c-format
-#| msgid "Wired Networks (%s)"
-msgid "InfiniBand Networks (%s)"
-msgstr "Drata reto (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, fuzzy, c-format
-#| msgid "Wired Network (%s)"
-msgid "InfiniBand Network (%s)"
-msgstr "Drata reto (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-#, fuzzy
-#| msgid "Wired Networks"
-msgid "InfiniBand Networks"
-msgstr "Drataj retoj"
-
-#: ../src/applet-device-infiniband.c:99
-#, fuzzy
-#| msgid "Wired Network"
-msgid "InfiniBand Network"
-msgstr "Drata reto"
-
-#: ../src/applet-device-infiniband.c:143
-#, fuzzy
-#| msgid "You are now connected to the wired network."
-msgid "You are now connected to the InfiniBand network."
-msgstr "Vi estas nun konektite al la drata reto."
-
-#: ../src/applet-device-infiniband.c:167
-#, fuzzy, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Agordanta retkonekton '%s'..."
-
-#: ../src/applet-device-infiniband.c:170
-#, fuzzy, c-format
-#| msgid "Configuring mobile broadband connection '%s'..."
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Agordas poŝtelefonan larĝkapacitan konekton '%s'..."
-
-#: ../src/applet-device-infiniband.c:173
-#, fuzzy, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
-
-#: ../src/applet-device-infiniband.c:180
-#, fuzzy, c-format
-#| msgid "VPN connection '%s' active"
-msgid "InfiniBand connection '%s' active"
-msgstr "VPN-konekto '%s' aktiva"
-
-#: ../src/applet-device-team.c:86
-#, fuzzy
-#| msgid "You are now connected to the wired network."
-msgid "You are now connected to the teamed network."
-msgstr "Vi estas nun konektite al la drata reto."
-
-#: ../src/applet-device-team.c:110
-#, fuzzy, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing team connection '%s'..."
-msgstr "Agordanta retkonekton '%s'..."
-
-#: ../src/applet-device-team.c:113
-#, fuzzy, c-format
-#| msgid "Configuring wired network connection '%s'..."
-msgid "Configuring team connection '%s'..."
-msgstr "Agordanta drat-retan konekton '%s'…"
-
-#: ../src/applet-device-team.c:116
-#, fuzzy, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for team connection '%s'..."
-msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
-
-#: ../src/applet-device-team.c:123
-#, fuzzy, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Team connection '%s' active"
-msgstr "VPN-konekto '%s' aktiva"
-
-#: ../src/applet-device-vlan.c:204
-#, fuzzy
-#| msgid "You are now connected to the CDMA network."
-msgid "You are now connected to the VLAN."
-msgstr "Vi estas konektita al la CDMA-reto."
-
-#: ../src/applet-device-vlan.c:228
-#, fuzzy, c-format
-#| msgid "Starting VPN connection '%s'..."
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Komencanta VPN-konekton '%s'..."
-
-#: ../src/applet-device-vlan.c:231
-#, fuzzy, c-format
-#| msgid "Starting VPN connection '%s'..."
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Komencanta VPN-konekton '%s'..."
-
-#: ../src/applet-device-vlan.c:234
-#, fuzzy, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
-
-#: ../src/applet-device-vlan.c:241
-#, fuzzy, c-format
-#| msgid "VPN connection '%s' active"
-msgid "VLAN connection '%s' active"
-msgstr "VPN-konekto '%s' aktiva"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 #, fuzzy
-#| msgid "_Connect to Hidden Wireless Network..."
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Konektiĝi al kaŝita sendrata reto..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 #, fuzzy
-#| msgid "Create _New Wireless Network..."
 msgid "Create _New Wi-Fi Network..."
 msgstr "Krei _novan sendratan reton…"
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(neniu)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
-#| msgid "Wired Networks (%s)"
 msgid "Wi-Fi Networks (%s)"
 msgstr "Sendrataj retoj (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
-#| msgid "Wired Network (%s)"
 msgid "Wi-Fi Network (%s)"
 msgstr "Sendrata reto (%s)"
 
-#: ../src/applet-device-wifi.c:773
-#| msgid "Wired Network"
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Sendrata reto"
 msgstr[1] "Sendrataj retoj"
 
-#: ../src/applet-device-wifi.c:802
-#| msgid "WiMAX is disabled"
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Sendrata reto estas elŝaltite"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 #, fuzzy
-#| msgid "WiMAX is disabled by hardware switch"
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "WiMAX estas elŝaltite per aparatara ŝaltilo"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Pliaj retoj"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 #, fuzzy
-#| msgid "Wireless Networks Available"
 msgid "Wi-Fi Networks Available"
 msgstr "Sendrataj retoj estas disponeblaj"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 #, fuzzy
-#| msgid "Use the network menu to connect to a wireless network"
 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:1242
+#: ../src/applet-device-wifi.c:1364
 #, fuzzy, c-format
-#| msgid "You are now connected to the wireless network '%s'."
 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:1273
+#: ../src/applet-device-wifi.c:1399
 #, fuzzy, c-format
-#| msgid "Preparing network connection '%s'..."
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Agordanta retkonekton '%s'..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, fuzzy, c-format
-#| msgid "Configuring wired network connection '%s'..."
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Agordanta drat-retan konekton '%s'…"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, fuzzy, c-format
-#| msgid "User authentication required for wireless network '%s'..."
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Sendrata reto '%s' necesas legitimadon de la uzanto..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, fuzzy, c-format
-#| msgid "Requesting a network address for '%s'..."
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Petanta retan adreson por '%s'..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, fuzzy, c-format
-#| msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Sendrat-reta konekto '%s' aktiva: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, fuzzy, c-format
-#| msgid "Wired network connection '%s' active"
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Drat-reta konekto '%s' aktiva"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 #, fuzzy
-#| msgid "Failed to create PAN connection: %s"
 msgid "Failed to activate connection"
 msgstr "Malsukcesis krei PAN-konekton: %s"
 
-#: ../src/applet-device-wifi.c:1345
-#| msgid "Could not edit new connection"
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Malsukcesis aldoni novan konekton"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX-portebla larĝkapacita reto (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX-portebla larĝkapacita reto"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX estas elŝaltite"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX estas elŝaltite per aparatara ŝaltilo"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Vi estas nun konektite al la WiMAX-reto."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Poŝtelefona larĝkapacita konekto '%s' aktivas: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "retmigrado"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Eraro montrante konekt-informojn:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:918
-#: ../src/wireless-security/wireless-security.c:441
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dinamika WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adresoj"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
-#| msgctxt "Wifi/wired security"
-#| msgid "None"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Neniu"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
-#| msgid "1 (Default)"
 msgid "%s (default)"
 msgstr "%s (defaŭlte)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Nekonate"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP-adreso:"
 
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "nekonate"
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Elsenda adreso:"
 
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "nekonate"
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Nekonate"
 
-#: ../src/applet-dialogs.c:407
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Subreta masko:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Eterreto (%s)"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "Sendrata reto laŭ 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:423
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Ĝenerale"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interfaco:"
 
-#: ../src/applet-dialogs.c:449
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Aparatara adreso:"
 
 #. Driver
-#: ../src/applet-dialogs.c:457
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Pelilo:"
 
-#: ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Rapido:"
 
-#: ../src/applet-dialogs.c:496
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Sekureco:"
 
-#: ../src/applet-dialogs.c:509
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:522
-msgid "BSID:"
-msgstr "_BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
-msgid "IP Address:"
-msgstr "IP-adreso:"
-
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Nekonate"
-
-#: ../src/applet-dialogs.c:566
-msgid "Broadcast Address:"
-msgstr "Elsenda adreso:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:575
-msgid "Subnet Mask:"
-msgstr "Subreta masko:"
-
-#: ../src/applet-dialogs.c:577
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Nekonate"
-
-#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Defaŭlta kurso:"
 
-#: ../src/applet-dialogs.c:597
-msgid "Primary DNS:"
-msgstr "Unuaranga DNS:"
-
-#: ../src/applet-dialogs.c:606
-msgid "Secondary DNS:"
-msgstr "Duaranga DNS:"
-
-#: ../src/applet-dialogs.c:616
-msgid "Ternary DNS:"
-msgstr "Triaranga DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:631
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorite"
 
-#: ../src/applet-dialogs.c:793
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN-Tipo:"
 
-#: ../src/applet-dialogs.c:800
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN-kluzo:"
 
-#: ../src/applet-dialogs.c:806
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN-uzantonomo:"
 
-#: ../src/applet-dialogs.c:812
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN-rubando:"
 
-#: ../src/applet-dialogs.c:818
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Baza konekto:"
 
-#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nekonata"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:883
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Ne validaj aktiv-konektoj trovitaj"
 
-#: ../src/applet-dialogs.c:911
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1239,43 +924,43 @@ msgstr ""
 "Kopirajto © 2005-2008 Novell, Inc.\n"
 "kaj multaj aliaj komunumaj kontribuantoj kaj tradukantoj"
 
-#: ../src/applet-dialogs.c:914
+#: ../src/applet-dialogs.c:988
 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:916
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Retpaĝaro de NetworkManager"
 
-#: ../src/applet-dialogs.c:931
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Mankantaj risurcoj"
 
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Pasvorto de la movebla larĝkapacita konekto"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Pasvorto bezonatas por konektiĝi al '%s'."
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../src/applet-dialogs.c:1261
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM-PIN postulas malŝloson"
 
-#: ../src/applet-dialogs.c:1262
+#: ../src/applet-dialogs.c:1337
 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:1264
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1285,25 +970,25 @@ msgstr ""
 "povas esti uzata."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1266
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN-kodo:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1270
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Montri PIN-kodon"
 
-#: ../src/applet-dialogs.c:1272
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Malŝloso de SIM-PUK postulata"
 
-#: ../src/applet-dialogs.c:1273
+#: ../src/applet-dialogs.c:1348
 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:1275
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1313,29 +998,36 @@ msgstr ""
 "povos esti uzata."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1277
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK-kodo:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1280
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Nova PIN-kodo:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1282
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Reenigi novan PIN-kodon:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1287
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Montri PIN/PUK-kodojn"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1343,18 +1035,41 @@ msgstr ""
 "IP-adresoj identigas vian komputilon surrete. Alklaku la butonon \"Aldoni\" "
 "por aldoni IP-adreson."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Forigi"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_nori aŭtomate ricevitajn itinerojn"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1362,9 +1077,8 @@ msgstr ""
 "Se enŝaltite, ĉi tiu konekto neniam estos uzata kiel la defaŭltan "
 "retkonekton."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1372,21 +1086,16 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Krei…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
-#| msgid "Choose a VPN Connection Type"
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "Elekti konekttipon"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 #, fuzzy
-#| msgid ""
-#| "Select the type of VPN you wish to use for the new connection.  If the "
-#| "type of VPN connection you wish to create does not appear in the list, "
-#| "you may not have the correct VPN plugin installed."
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1410,7 +1119,6 @@ msgid "XOR"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-bond.ui.h:4
-#| msgid "Broadcast Address:"
 msgid "Broadcast"
 msgstr ""
 
@@ -1431,91 +1139,96 @@ msgid "MII (recommended)"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-bond.ui.h:9
-#| msgid "EAP"
 msgid "ARP"
 msgstr "ARP"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:10
-#| msgid "Base Connection:"
 msgid "Bonded _connections:"
 msgstr "Drataj _konektoj"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-#| msgid "M_ode:"
-msgid "_Mode:"
-msgstr "Reĝi_mo:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "Reĝim_o:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "R_edakti"
-
-#. Delete
 #: ../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:703
-msgid "_Delete"
-msgstr "_Forigi"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "R_edakti"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
-#| msgid "Interface:"
+#: ../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:"
 msgstr "_Interfaco-nomo:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-#| msgid "Primary DNS:"
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Unuarang:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "bajtoj"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
-#| msgid "S_ecurity:"
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Prioritato:"
 
@@ -1524,54 +1237,97 @@ msgid "_Hairpin mode:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:1
-#| msgid "Base Connection:"
 msgid "Bridged _connections:"
 msgstr "Pont_konektoj:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Enŝalti _reton"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "aŭtomata"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "defaŭlte"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adreso"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adreso"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Iu aparato"
+
+#: ../src/connection-editor/ce-page.c:591
 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
 #, fuzzy
-#| msgid "Use 802.1_X security for this connection"
 msgid "Use Data Center Bridging (DCB) for this connection"
 msgstr "Uzi 802.1_X-sekurecon por ĉi tiu konekto"
 
@@ -1666,99 +1422,96 @@ msgstr ""
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-#| msgid "2"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-#| msgid "3"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-#| msgid "4"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1771,7 +1524,7 @@ msgstr "_Servo:"
 
 #: ../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:4
+#: ../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
@@ -1779,8 +1532,9 @@ msgid "Sho_w password"
 msgstr "_Montri pasvorton"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1792,7 +1546,8 @@ msgstr "_Pasvorto:"
 #: ../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-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Aŭtomate"
@@ -1847,18 +1602,18 @@ msgstr "Aŭt_omate intertrakti"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "_Aparatara MAC-adreso:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Servo:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "K_lonita MAC-adreso:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1868,19 +1623,54 @@ 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-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "bajtoj"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Defaŭlte"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignori"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Elsenda adreso:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Pasvorto por privata ŝlosilo:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1888,7 +1678,6 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-general.ui.h:2
 #, fuzzy
-#| msgid "You are now connected to the wired network."
 msgid "All _users may connect to this network"
 msgstr "Vi estas nun konektite al la drata reto."
 
@@ -1911,7 +1700,6 @@ msgstr ""
 
 #. IP-over-InfiniBand "connected mode"
 #: ../src/connection-editor/ce-page-infiniband.ui.h:8
-#| msgid "C_onnect"
 msgid "Connected"
 msgstr "Konektite"
 
@@ -1922,8 +1710,8 @@ msgstr "Aŭtamata per permanaj DNS-agordoj"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Permane"
 
@@ -1934,22 +1722,22 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 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:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_Metodo:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Adresoj"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1959,8 +1747,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:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1968,25 +1756,25 @@ 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
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 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:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS-serviloj:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1995,11 +1783,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -2007,16 +1795,26 @@ 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:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "Alidi_rektoj…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Elŝaltite"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 #, fuzzy
-#| msgid ""
-#| "IP addresses of domain name servers used to resolve host names. Use "
-#| "commas to separate multiple domain name server addresses."
 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,11 +1824,15 @@ msgstr ""
 "gastigaj komputiloj. Uzu komojn por disigi plurajn adresojn de serviloj por "
 "retregionaj nomoj."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2039,73 +1841,38 @@ msgstr ""
 "retoj la IPv6-agordo malsukcesas sed la IPv4-agordo sukcesas."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Iu ajn"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Preferi na 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Preferi na 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-#, fuzzy
-#| msgid "Prefer 3G (UMTS/HSPA)"
-msgid "Prefer 4G (LTE)"
-msgstr "Preferi na 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Baza"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Nu_mero:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Altnivele"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "R_eta identigilo:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Tipo:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Ŝanĝi..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "_Montri pasvortojn"
 
@@ -2168,41 +1935,60 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-team.ui.h:1
 #, fuzzy
-#| msgid "Base Connection:"
 msgid "_Teamed connections:"
 msgstr "Baza konekto:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr ""
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "Elporti VPN-konekton..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 #, fuzzy
-#| msgid "Interface:"
 msgid "_Parent interface:"
 msgstr "Interfaco:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
-msgstr ""
+#, fuzzy
+msgid "VLAN inter_face name:"
+msgstr "_Interfaco-nomo:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
 #, fuzzy
-#| msgid "C_loned MAC address:"
-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:"
 msgstr ""
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
-msgid "Device name + number"
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
 #: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
+msgid "Device name + number"
+msgstr ""
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr ""
 
@@ -2219,207 +2005,179 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastrukturo"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Provizore"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Senda po_vumo:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Rapido:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Kanalo:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ben_do:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "Reĝim_o:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Permesitaj aŭtentokontrol-metodoj"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Protokolo de aŭtentigo de pasvorto"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
 msgstr ""
 "En la plej multaj kazoj, la PPP-serviloj subtenos ĉiujn metodojn de "
-"aŭtentigkontrolo.  Se konektoj malsukcesas, provu elŝalti la subtenon por kelkaj "
-"metodoj."
+"aŭtentigkontrolo.  Se konektoj malsukcesas, provu elŝalti la subtenon por "
+"kelkaj metodoj."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:887
-msgid "Address"
-msgstr "Adreso"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "Retmasko"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:921
-msgid "Gateway"
-msgstr "Kluzo"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "Metra"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:904
-msgid "Prefix"
-msgstr "Prefikso"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
-#| msgid "Auto Ethernet"
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Eterreto"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr ""
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
-#| msgid "Hardware Address:"
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Aparataro"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 #, fuzzy
-#| msgid "Export VPN connection..."
 msgid "Import a saved VPN configuration..."
 msgstr "Elporti VPN-konekton..."
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2427,29 +2185,79 @@ msgstr ""
 "La dialogujo por la konekto-redaktilo ne estis pravalorizebla pro nekonata "
 "eraro."
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Ne eblis krei novan konekton."
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Forigo de konekto malsukcesis."
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "Adreso"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Retmasko"
+
+#: ../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
+msgid "Gateway"
+msgstr "Kluzo"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Metra"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Prefikso"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Redaktante %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Redaktante sennoman konekton"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Nomo de konekto:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Eraro dum pravalorizado de redaktilo"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Aldono de konekto malsukcesis"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2457,18 +2265,14 @@ msgstr ""
 "La konektoredaktilo ne povis trovi kelkajn neprajn risurcojn (la .ui-dosiero "
 "ne estis  trovita)."
 
-#: ../src/connection-editor/nm-connection-editor.c:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "Kon_servi"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 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:420
-msgid "_Save..."
-msgstr "Kon_servi..."
-
 #: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
@@ -2476,7 +2280,6 @@ msgstr ""
 
 #: ../src/connection-editor/nm-connection-editor.c:437
 #, fuzzy
-#| msgid "Could not create new connection"
 msgid "Could not create connection"
 msgstr "Ne eblis krei novan konekton."
 
@@ -2486,400 +2289,467 @@ msgstr "Ne eblis agordi konekton."
 
 #: ../src/connection-editor/nm-connection-editor.c:439
 #, fuzzy
-#| msgid "Error creating connection editor dialog."
 msgid "Unknown error creating connection editor dialog."
 msgstr "Eraro dum kreo de dialogujo por konekto-redaktilo."
 
-#: ../src/connection-editor/nm-connection-editor.c:573
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Eraro dum pravalorizado de redaktilo"
 
-#: ../src/connection-editor/nm-connection-editor.c:906
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Aldono de konekto malsukcesis"
 
-#: ../src/connection-editor/nm-connection-editor.c:946
-msgid "Error saving connection"
-msgstr "Eraro dum konservo de konekto"
-
-#: ../src/connection-editor/nm-connection-editor.c:947
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "La atributo  '%s' / '%s' estas nevalida: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "_Nomo de konekto:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#| msgid "E_xport"
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "E_lporti..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "neniam"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "nun"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Laste uzita"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Redaki elektitan konekton"
 
-#: ../src/connection-editor/nm-connection-list.c:688
-msgid "_Edit..."
-msgstr "R_edakti..."
-
-#: ../src/connection-editor/nm-connection-list.c:689
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Aŭtentigi por redakti la elektitan konekton"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Forigi la elektitan konekton"
 
-#: ../src/connection-editor/nm-connection-list.c:705
-msgid "_Delete..."
-msgstr "_Forigi..."
-
-#: ../src/connection-editor/nm-connection-list.c:706
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Vi devas aŭtentigi por forigi la elektitan konekton"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:939
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Eraro dum kreo de konekto"
 
-#: ../src/connection-editor/nm-connection-list.c:995
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Eraro dum redakto de konekto"
 
-#: ../src/connection-editor/nm-connection-list.c:996
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Ne trovis konekton kun UUID '%s':w"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x-sekureco"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 #, fuzzy
-#| msgid "Could not load WiFi security user interface."
 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:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Uzi 802.1_X-sekurecon por ĉi tiu konekto"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Ne eblas ŝargi uzantinterfacon de DSL."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "Ne eblis trovi la Bludento-aparaton."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Pont-konekto %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Drata reto"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Sendrata reto"
+
+#: ../src/connection-editor/page-bond.c:447
 #, fuzzy
-#| msgid "Could not load wired user interface."
 msgid "Could not load bond user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-bond.c:594
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Unuarang:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
-#| msgid "Wired connection %d"
 msgid "Bond connection %d"
 msgstr "Pont-konekto %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 #, fuzzy
-#| msgid "Could not load wired user interface."
 msgid "Could not load bridge user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, fuzzy, c-format
-#| msgid "Wired connection %d"
 msgid "Bridge connection %d"
 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 #, fuzzy
-#| msgid "Could not load wired user interface."
 msgid "Could not load bridge port user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-dcb.c:607
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:609
+#: ../src/connection-editor/page-dcb.c:605
 #, fuzzy
-#| msgid "Could not load DSL user interface."
 msgid "Could not load DCB user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon de DSL."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon de DSL."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-konekto «%d»"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "Ĉi tiu opcio limigas ĉi tiun konekton al la reta aparato specifita per ĝia "
 "permanenta MAC-adreso enigita tien ĉi. Ekzemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 #, fuzzy
-#| msgid "Could not load wired user interface."
 msgid "Could not load ethernet user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Eterreto"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "K_lonita MAC-adreso:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
-#| msgid "Wired connection %d"
 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:55
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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:57
+#: ../src/connection-editor/page-general.c:53
 #, fuzzy
-#| msgid "NetworkManager is not running..."
 msgid "FirewallD is not running."
 msgstr "NetworkManager ne estas rulanta..."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 #, fuzzy
-#| msgid "Could not load wired user interface."
 msgid "Could not load General user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 #, fuzzy
-#| msgid "Could not load WiFi user interface."
 msgid "Could not load InfiniBand user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por sendrataj konektoj."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, fuzzy, c-format
-#| msgid "Wired connection %d"
 msgid "InfiniBand connection %d"
 msgstr "Drata konekto %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Aŭtomata (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Nur aŭtomataj adresoj (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Aŭtomata (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Nur aŭtomataj adresoj (PPP)"
+msgid "Automatic, addresses only"
+msgstr "Aŭtomate, nur adresoj"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Aŭtomata (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Nur aŭtomataj adresoj (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Aŭtomata (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 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:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Nur \"Ligi-Loke\""
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Elŝaltite"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 #, fuzzy
-#| msgid "DNS ser_vers:"
 msgid "Additional DNS ser_vers:"
 msgstr "_DNS-serviloj:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 #, fuzzy
-#| msgid "S_earch domains:"
 msgid "Additional s_earch domains:"
 msgstr "S_erĉi domajnojn:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Redaktanta IPv4-kurson por %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Agordoj por IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Ne eblas ŝargi IPv4-uzantinterfacon."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "Aŭtomate, nur adresoj"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignori"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Aŭtomate, nur DHCP"
 
-#: ../src/connection-editor/page-ip6.c:819
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Redaktanta IPv6-kursoj por %s"
 
-#: ../src/connection-editor/page-ip6.c:969
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Agordoj por IPv6"
 
-#: ../src/connection-editor/page-ip6.c:971
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Ne eblas ŝargi IPv6-uzantinterfacon."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, 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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 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:370
+#: ../src/connection-editor/page-mobile.c:327
 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:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Elektu specon de poŝtelefona larĝkapacita provizanto"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2887,141 +2757,145 @@ 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:652
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 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:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:248
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:298
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:264
-#: ../src/wireless-security/eap-method-ttls.c:281
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "neniu"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Agordoj por PPP"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Ne eblis ŝargi PPP-uzantinterfacon."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:234
+#: ../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 "Elekti enportendan dosieron"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 #, fuzzy
-#| msgid "Could not load wired user interface."
 msgid "Could not load team user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por drataj konektoj."
 
-#: ../src/connection-editor/page-team.c:346
+#: ../src/connection-editor/page-team.c:377
 #, fuzzy, c-format
-#| msgid "Wired connection %d"
 msgid "Team connection %d"
 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:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 #, fuzzy
-#| msgid "Could not load wired user interface."
 msgid "Could not load team port user interface."
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Neniu retkonekto"
+
+#: ../src/connection-editor/page-vlan.c:596
 #, fuzzy
-#| msgid "Could not load IPv4 user interface."
 msgid "Could not load vlan user interface."
 msgstr "Ne eblas ŝargi IPv4-uzantinterfacon."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, fuzzy, c-format
-#| msgid "VPN connection %d"
 msgid "VLAN connection %d"
 msgstr "VPN-konekto %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Ne eblis ŝargi VPN-uzantointerfacon."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Ne eblis trovi VPN-kromprograman servon por '%s'."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-konekto %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -3031,11 +2905,11 @@ msgstr ""
 "\n"
 "Eraro: neniu speco de VPN-servo"
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Elekti VPN-konekttipon"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -3045,11 +2919,8 @@ msgstr ""
 "dezirata VPN-speco ne disponeblas en la listo, eble vi ne instalis la ĝustan "
 "VPN-kromprogramon."
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../src/connection-editor/page-wifi.c:77
 #, fuzzy
-#| msgid ""
-#| "This option locks this connection to the wireless access point (AP) "
-#| "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
 "by the BSSID entered here.  Example: 00:11:22:33:44:55"
@@ -3057,84 +2928,96 @@ 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:201
+#: ../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)\""
+msgstr ""
+"Ĉi tiu opcio limigas ĉi tiun konekton al la reta aparato specifita per ĝia "
+"permanenta MAC-adreso enigita tien ĉi. Ekzemplo: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 #, fuzzy
-#| msgid "Could not load WiFi user interface."
 msgid "Could not load Wi-Fi user interface."
 msgstr "Ne eblas ŝargi uzantinterfacon por sendrataj konektoj."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Iu aparato"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, fuzzy, c-format
-#| msgid "Wired connection %d"
 msgid "Wi-Fi connection %d"
 msgstr "Drata konekto %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:892
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:901
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../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)"
 msgstr "Dinamika WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:945
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../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:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:959
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../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:391
+#: ../src/connection-editor/page-wifi-security.c:413
 #, fuzzy
-#| msgid "Could not load WiFi security user interface; missing WiFi setting."
 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:402
-#| msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Sekureco de sendrataj konektoj"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 #, fuzzy
-#| msgid "Could not load WiFi security user interface."
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Ne eblis ŝargi uzantinterfacon por la sekureco de sendrataj konektoj."
 
-#: ../src/connection-editor/page-wimax.c:128
-#, fuzzy
-#| msgid "Could not load WiFi user interface."
-msgid "Could not load WiMAX user interface."
-msgstr "Ne eblas ŝargi uzantinterfacon por sendrataj konektoj."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
-#, fuzzy, c-format
-#| msgid "Wired connection %d"
-msgid "WiMAX connection %d"
-msgstr "Drata konekto %d"
+#: ../src/connection-editor/page-wifi-security.c:512
+#, c-format
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Ne eblas enporti VPN-konekton"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3147,25 +3030,30 @@ msgstr ""
 "\n"
 "Eraro: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:284
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Nekonata eraro"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Dosiero nomita «%s» jam ekzistas."
 
-#: ../src/connection-editor/vpn-helpers.c:286
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Anstataŭigi"
 
-#: ../src/connection-editor/vpn-helpers.c:288
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:324
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Ne eblas elporti VPN-konekton"
 
-#: ../src/connection-editor/vpn-helpers.c:326
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3176,11 +3064,11 @@ msgstr ""
 "\n"
 "Eraro: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:361
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Elporti VPN-konekton..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -3188,103 +3076,11 @@ msgstr ""
 "La Retadministrilo-apleto ne povis trovi kelkajn neprajn risurcojn (la .ui-"
 "dosiero ne estis  trovita)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, fuzzy, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "Agordado de Bludento ne eblas (malsukcesis konekti al D-buso: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, fuzzy, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "Agordado de Bludento ne eblas (ne povis trovi NetworkManager: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Uzi vian poŝtelefonon kiel retaparato (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Eniri la reton per via poŝtelefono (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Eraro: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Malsukcesis krei DUN-konekton: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:947
-msgid "Your phone is now ready to use!"
-msgstr "Via telefono estas nun uzpreta!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Asistanto por poŝtelefonoj nuliĝis"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Nekonata telefonaparata speco (ne GSM nek CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr ""
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:721
-#: ../src/gnome-bluetooth/nma-bt-device.c:727
-msgid "failed to connect to the phone."
-msgstr "malsukcesis konekti al la telefono."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:758
-msgid "unexpectedly disconnected from the phone."
-msgstr "neatendite malkonektiĝis de la telefono."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:768
-msgid "timed out detecting phone details."
-msgstr "eltempiĝis dum detektado de telefonaj detaloj."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:779
-msgid "Detecting phone configuration..."
-msgstr "Detektas telefonan agordaron..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:811
-#, fuzzy
-#| msgid "Error editing connection"
-msgid "error getting bus connection"
-msgstr "Eraro dum redakto de konekto"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:908
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"La defaŭlta Bludento-adaptilo devas esti enŝaltita antaŭ ol vi povas starigi "
-"pertelefonan retkonekton."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:945
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Malsukcesis krei PAN-konekton: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:966
-#, c-format
-msgid "%s Network"
-msgstr "%s Reto"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Malŝlosi"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Aŭtomate malŝlosi ĉi tiun aparaton"
 
@@ -3292,32 +3088,37 @@ msgstr "Aŭtomate malŝlosi ĉi tiun aparaton"
 msgid "Connection Information"
 msgstr "Konektinformoj"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Aktivaj retkonektoj"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Via aparato:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Via faktura reĝimo:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3331,23 +3132,28 @@ msgstr ""
 "por poŝtelefona larĝkapacita konekto, elektu \"Retkonektoj\"-n el la menuo "
 "Sistemo >> Agordoj."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:266
+#: ../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/libnm-gtk/nm-mobile-wizard.c:330
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nelistigite"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:461
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Elekti vian planon:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:485
+#: ../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/libnm-gtk/nm-mobile-wizard.c:505
+#: ../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"
@@ -3360,67 +3166,83 @@ msgstr ""
 "Se vi ne certas kiun planon elekti, bonvolu demandi vian provizanton por la "
 "APN de via plano."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:512
+#: ../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/libnm-gtk/nm-mobile-wizard.c:561
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Mia plano estas nelistigite..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:714
+#: ../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/libnm-gtk/nm-mobile-wizard.c:727
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provizanto"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:752
+#: ../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 "Mi ne povas trovi mian provizanton kaj mi deziras enigi ĝin _mane:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:765
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Provizanto:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:782
+#: ../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/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:795
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Elekti vian provizanton"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1060
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Lando aŭ regiono"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1120
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Elekti la landon aŭ regionon de via provizanto"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1174
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Instalis GSM-aparaton"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Instalis CDMA-aparaton"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
+#: ../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."
@@ -3428,139 +3250,144 @@ msgstr ""
 "Ĉi tiu asistanto helpas vin facile agordi poŝtelefonan larĝkapacitan "
 "konekton al portebla (3G) reto."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Vi bezonos la sekvajn informojn:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "La nomon de via larĝkapacita provizanto"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1373
+#: ../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 ""
 "(en kelkaj kazoj) la APN-n (Access Point Name, nomo de retkaptejo) de la "
 "fakturplano"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../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 "Krei konekton por _tiu ĉi larĝkapacita aparato:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Iu aparato"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Agordi poŝtelefonan larĝkapacitan konekton"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nova poŝtelefona larĝkapacita konekto"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Drata"
-
-#: ../src/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr ""
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Ĉiam _postuli la pasvorton"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr ""
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#, fuzzy
+msgid "The password is not required"
+msgstr "Pasvorto bezonatas por konektiĝi al '%s'."
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr ""
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Duaranga pasvorto:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Duaranga pasvorto:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+msgid "Sh_ow passwords"
+msgstr "M_ontri pasvortojn"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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/libnm-gtk/nm-wifi-dialog.c:435
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nova..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:875
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Neniu"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "K_rei"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1130
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy, c-format
-#| msgid ""
-#| "Passwords or encryption keys are required to access the wireless network "
-#| "'%s'."
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Pasvortoj aŭ ĉifroŝlosiloj estas postulataj por atingi la sendratan reton "
 "'%s'."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1132
-#| msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Aŭtentigo por sendrata reto estas postulata"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1134
-#| msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Sendrata reto postulas aŭtentigon"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
-#| msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Krei novan sendratan reton"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
-#| msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nova sendrata reto"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
-#| msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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/libnm-gtk/nm-wifi-dialog.c:1144
-#| msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Konekti al kaŝita sendrata reto"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
-#| msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Kaŝita sendrata reto"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
-#| msgid ""
-#| "Enter the name and security details of the hidden wireless network you "
-#| "wish to connect to."
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3568,36 +3395,55 @@ msgstr ""
 "Entajpu la nomon kaj sekurecdetalojn de la kaŝita sendrata reto al kiu vi "
 "volas konekti."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#, fuzzy
-#| msgid "_Password:"
-msgid "_Secondary Password:"
-msgstr "_Duaranga pasvorto:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-#| msgid "Sho_w passwords"
-msgid "Sh_ow passwords"
-msgstr "M_ontri pasvortojn"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
-#| msgid "Wireless _security:"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Sendrata _sekureco:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Ko_nekto:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-#| msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Sendrata _adaptilo:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Uzo:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3605,7 +3451,7 @@ msgstr ""
 "Tiu ĉi programo estas parto de NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3613,141 +3459,152 @@ 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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
-#| msgid "HSPA"
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr ""
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ne enŝaltite"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "neregistrite"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Hejmreto (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Hejmreto"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "serĉante"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrado malpermesita"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Retmigra reto (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Retmigra reto"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN-kodo por SIM-karto '%s' ĉe '%s'"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN-kodo bezonatas"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Port-larĝkapacita aparato bezonas PIN-kodon"
 
+#: ../src/mobile-helpers.c:619
+#, 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:622
+msgid "roaming"
+msgstr "retmigrado"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
-#| msgid "Base Connection:"
 msgid "%s connection"
 msgstr "%s-konekto"
 
-#: ../src/utils/utils.c:376
-msgid "Store the password only for this _user"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
 
-#: ../src/utils/utils.c:378
-msgid "Store the password for _all users"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
-#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- aŭ PEM-atestiloj (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:298
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:400
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Elekti PAC-dosieron..."
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC-dosieroj (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
@@ -3783,14 +3640,32 @@ msgstr "_Ena aŭtentigo:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permesi aŭtomatan PAC-pro_vizadon"
 
-#: ../src/wireless-security/eap-method-peap.c:281
-#: ../src/wireless-security/wireless-security.c:417
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:377
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:377
+#: ../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 "Elekti atestilon de Atestilaŭtoritato (CA)..."
 
@@ -3811,7 +3686,6 @@ msgstr "C_A-atestilo:"
 #: ../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
-#| msgid "C_A certificate:"
 msgid "No CA certificate is _required"
 msgstr "CA-atestilo ne estas _bezonata"
 
@@ -3819,15 +3693,46 @@ msgstr "CA-atestilo ne estas _bezonata"
 msgid "PEAP _version:"
 msgstr "_Versio de PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Ĉiam _postuli la pasvorton"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A-atestilo:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Neĉifritaj privataj ŝlosiloj estas nesekuraj"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3841,11 +3746,11 @@ msgstr ""
 "\n"
 "(Vi povas pasvort-protekti vian privatan ŝlosilon per openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Elekti vian personan atestilon..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Elekti vian privatan ŝlosilon..."
 
@@ -3865,23 +3770,36 @@ msgstr "Privata ŝ_losilo:"
 msgid "_Private key password:"
 msgstr "_Pasvorto por privata ŝlosilo:"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunelita TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Protektita EAP (PEAP)"
 
@@ -3891,6 +3809,44 @@ msgstr "Protektita EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Aŭ_tentigo:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (defaŭlte)"
@@ -3915,6 +3871,359 @@ msgstr "_Montri ŝlosilon"
 msgid "WEP inde_x:"
 msgstr "WEP-inde_kso:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Enŝalti WiMAX-larĝkapacitan konekton"
+
+#~ msgid "_Help"
+#~ msgstr "_Helpo"
+
+#~| msgid "You are now connected to the wired network."
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Vi estas nun konektite al la drata reto."
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Agordante dratan konekton '%s'..."
+
+#~| msgid "Configuring mobile broadband connection '%s'..."
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Agordas dratan konekton '%s'..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Drata retkonekto '%s' bezonas uzantan aŭtentigon..."
+
+#~| msgid "Requesting a VPN address for '%s'..."
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Petanta adreson por '%s'..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Drata konekto '%s' aktiva"
+
+#~| msgid "You are now connected to the wired network."
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Vi estas nun konektite al la pontita reto."
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Agordanta pont-konekton '%s'..."
+
+#~| msgid "Configuring wired network connection '%s'..."
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Agordanta pont-konekton '%s'…"
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Pont-retkonekto '%s' bezonas uzantan aŭtentigon..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Pont-konekto '%s' aktiva"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Nova poŝtelefona larĝkapacita (CDMA) konekto..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Vi estas konektita al la CDMA-reto."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA-reto."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Nova port-larĝkapacita (GSM) konekto..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Vi estas nun konektite al la GSM-reto."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM-reto."
+
+#, fuzzy
+#~| msgid "Wired Networks (%s)"
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Drata reto (%s)"
+
+#, fuzzy
+#~| msgid "Wired Network (%s)"
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Drata reto (%s)"
+
+#, fuzzy
+#~| msgid "Wired Networks"
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Drataj retoj"
+
+#, fuzzy
+#~| msgid "Wired Network"
+#~ msgid "InfiniBand Network"
+#~ msgstr "Drata reto"
+
+#, fuzzy
+#~| msgid "You are now connected to the wired network."
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Vi estas nun konektite al la drata reto."
+
+#, fuzzy
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Agordanta retkonekton '%s'..."
+
+#, fuzzy
+#~| msgid "Configuring mobile broadband connection '%s'..."
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Agordas poŝtelefonan larĝkapacitan konekton '%s'..."
+
+#, fuzzy
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
+
+#, fuzzy
+#~| msgid "VPN connection '%s' active"
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "VPN-konekto '%s' aktiva"
+
+#, fuzzy
+#~| msgid "You are now connected to the wired network."
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Vi estas nun konektite al la drata reto."
+
+#, fuzzy
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Agordanta retkonekton '%s'..."
+
+#, fuzzy
+#~| msgid "Configuring wired network connection '%s'..."
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Agordanta drat-retan konekton '%s'…"
+
+#, fuzzy
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
+
+#, fuzzy
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Team connection '%s' active"
+#~ msgstr "VPN-konekto '%s' aktiva"
+
+#, fuzzy
+#~| msgid "You are now connected to the CDMA network."
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Vi estas konektita al la CDMA-reto."
+
+#, fuzzy
+#~| msgid "Starting VPN connection '%s'..."
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Komencanta VPN-konekton '%s'..."
+
+#, fuzzy
+#~| msgid "Starting VPN connection '%s'..."
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Komencanta VPN-konekton '%s'..."
+
+#, fuzzy
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "VPN-retkonekto '%s' necesas uzantan aŭtentigon..."
+
+#, fuzzy
+#~| msgid "VPN connection '%s' active"
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VPN-konekto '%s' aktiva"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX-portebla larĝkapacita reto (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX-portebla larĝkapacita reto"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX estas elŝaltite"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX estas elŝaltite per aparatara ŝaltilo"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Vi estas nun konektite al la WiMAX-reto."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "nekonate"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "nekonate"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "_BSID:"
+
+#~ msgid "Primary DNS:"
+#~ msgstr "Unuaranga DNS:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "Duaranga DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "Triaranga DNS:"
+
+#~| msgid "M_ode:"
+#~ msgid "_Mode:"
+#~ msgstr "Reĝi_mo:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_Aparatara MAC-adreso:"
+
+#~ msgid "Any"
+#~ msgstr "Iu ajn"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Preferi na 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Preferi na 2G (GPRS/EDGE)"
+
+#, fuzzy
+#~| msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Preferi na 3G (UMTS/HSPA)"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastrukturo"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "_Save..."
+#~ msgstr "Kon_servi..."
+
+#~ msgid "Error saving connection"
+#~ msgstr "Eraro dum konservo de konekto"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "La atributo  '%s' / '%s' estas nevalida: %d"
+
+#~ msgid "_Edit..."
+#~ msgstr "R_edakti..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Forigi..."
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Aŭtomata (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Nur aŭtomataj adresoj (PPP)"
+
+#, fuzzy
+#~| msgid "Could not load WiFi user interface."
+#~ msgid "Could not load WiMAX user interface."
+#~ msgstr "Ne eblas ŝargi uzantinterfacon por sendrataj konektoj."
+
+#, fuzzy
+#~| msgid "Wired connection %d"
+#~ msgid "WiMAX connection %d"
+#~ msgstr "Drata konekto %d"
+
+#, fuzzy
+#~| msgid ""
+#~| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr "Agordado de Bludento ne eblas (malsukcesis konekti al D-buso: %s)."
+
+#, fuzzy
+#~| msgid ""
+#~| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "Agordado de Bludento ne eblas (ne povis trovi NetworkManager: %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Uzi vian poŝtelefonon kiel retaparato (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Eniri la reton per via poŝtelefono (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Eraro: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Malsukcesis krei DUN-konekton: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Via telefono estas nun uzpreta!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Asistanto por poŝtelefonoj nuliĝis"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Nekonata telefonaparata speco (ne GSM nek CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "malsukcesis konekti al la telefono."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "neatendite malkonektiĝis de la telefono."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "eltempiĝis dum detektado de telefonaj detaloj."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Detektas telefonan agordaron..."
+
+#, fuzzy
+#~| msgid "Error editing connection"
+#~ msgid "error getting bus connection"
+#~ msgstr "Eraro dum redakto de konekto"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "La defaŭlta Bludento-adaptilo devas esti enŝaltita antaŭ ol vi povas "
+#~ "starigi pertelefonan retkonekton."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Malsukcesis krei PAN-konekton: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s Reto"
+
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "Sendrataj retoj (%s)"
 
@@ -3976,11 +4285,9 @@ msgstr "WEP-inde_kso:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "Ne scias kiel redakti konektojn per  '%s'"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "Ne eblis trovi la Bludento-aparaton."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-#~ msgstr "Agordado de Bludento ne eblas (malsukcesis krei D-busan prokurilon)."
+#~ msgstr ""
+#~ "Agordado de Bludento ne eblas (malsukcesis krei D-busan prokurilon)."
 
 #~ msgid "No Certificate Authority certificate chosen"
 #~ msgstr "Neniu atestilo de Atestilaŭtoritato (CA) elektita"
@@ -4006,9 +4313,6 @@ msgstr "WEP-inde_kso:"
 #~ msgid "label"
 #~ msgstr "etikedo"
 
-#~ msgid "Network Manager"
-#~ msgstr "Reta mastrumilo"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "Jam ruliĝas ekzemplero de nm-applet.\n"
 
@@ -4192,8 +4496,8 @@ msgstr "WEP-inde_kso:"
 #~ "some methods.</i>"
 #~ msgstr ""
 #~ "<i>En multaj kazoj, La PPP-serviloj de provizantoj subtenos ĉiujn "
-#~ "metodojn de aŭtentigo. Se konektoj malsukcesas, klopodi, malaktivigante la "
-#~ "subtenon por kelkaj metodoj.</i>"
+#~ "metodojn de aŭtentigo. Se konektoj malsukcesas, klopodi, malaktivigante "
+#~ "la subtenon por kelkaj metodoj.</i>"
 
 #~ msgid "<b>Advanced</b>"
 #~ msgstr "<b>Progresinta</b>"
diff --git a/po/es.po b/po/es.po
index f7a0605c..437ca3c2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,9 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: networkmanager-applet.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-02-01 14:01+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2016-02-04 09:27+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
@@ -27,7 +26,7 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3258
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Red"
 
@@ -162,7 +161,7 @@ msgstr ""
 "El programa nm-connection-editor funciona con NetworkManager para crear y "
 "editar perfiles de NetworkManager."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticación 802.1x"
 
@@ -184,45 +183,45 @@ msgstr "C_onectar"
 msgid "_Network name:"
 msgstr "_Nombre de red:"
 
-#: ../src/ap-menu-item.c:87
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "segura."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Falló al añadir/activar la conexión"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Falló la conexión"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Falló al desconectar el dispositivo"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Falló al desconectar"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Falló al activar la conexión"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "No mostrar este mensaje de nuevo"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -232,7 +231,7 @@ msgstr ""
 "\n"
 "La conexión VPN «%s» ha fallado porque se interrumpió la conexión de red."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -242,7 +241,7 @@ msgstr ""
 "La conexión de red «%s» ha fallado porque el servicio VPN se interrumpió "
 "inesperadamente."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -253,7 +252,7 @@ msgstr ""
 "La conexión VPN «%s» ha fallado porque el servicio VPN devolvió una "
 "configuración no válida."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -262,7 +261,7 @@ msgstr ""
 "\n"
 "La conexión VPN «%s» ha fallado porque expiró el tiempo de conexión."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -271,7 +270,7 @@ msgstr ""
 "\n"
 "La conexión VPN «%s» ha fallado porque el servicio VPN no se inició a tiempo."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -280,7 +279,7 @@ msgstr ""
 "\n"
 "La conexión VPN «%s» ha fallado porque el servició VPN no pudo iniciarse."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -289,7 +288,7 @@ msgstr ""
 "\n"
 "La conexión VPN «%s» falló porque no había secretos VPN válidos."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -298,7 +297,7 @@ msgstr ""
 "\n"
 "La conexión VPN «%s» falló porque los secretos VPN no eran válidos."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -307,7 +306,7 @@ msgstr ""
 "\n"
 "La conexión VPN «%s» ha fallado."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -317,7 +316,7 @@ msgstr ""
 "\n"
 "La conexión VPN «%s» se desconectó porque se interrumpió la conexión de red."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -326,7 +325,7 @@ msgstr ""
 "\n"
 "La conexión VPN «%s» se desconectó porque paró el servicio VPN."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -335,7 +334,7 @@ msgstr ""
 "\n"
 "La conexión VPN «%s» se ha desconectado."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -346,19 +345,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "La conexión VPN se ha establecido con éxito.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Mensaje de acceso VPN"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Falló la conexión VPN"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -371,7 +370,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -384,552 +383,545 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "el dispositivo no está listo (falta el firmware)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "el dispositivo no está listo"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconectado"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "el dispositivo no está gestionado"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "No hay dispositivos de red disponibles"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Conexiones _VPN"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Configurar VPN…"
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Desconectar VPN"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "El Gestor de la red no se está ejecutando…"
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Red desactivada"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Activar _red"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Activar _inalámbrica"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Activar la banda ancha _móvil"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Activar n_otificaciones"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Información de la conexión"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Editar las conexiones…"
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "Ay_uda"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Ahora está conectado a «%s»."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "La conexión de red se ha desconectado."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Preparando la conexión de red «%s»…"
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, 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:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Solicitando una dirección de red para «%s»…"
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Conexión de red «%s» activa"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Iniciando conexión VPN «%s»…"
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, 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:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Solicitando una dirección VPN para «%s»…"
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Conexión VPN «%s» activa"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Sin conexión de red"
 
-#: ../src/applet.c:3384
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Miniaplicación Gestor de la red"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Código PUK erróneo; contacte con el proveedor de su servicio."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Código PIN erróneo; contacte con el proveedor de su servicio."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Enviando código de desbloqueo…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda ancha móvil (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Banda ancha móvil"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Disponible"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Conexión de banda ancha móvil nueva…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Se ha establecido la conexión"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Ahora está conectado a la red de banda ancha móvil."
 
-#: ../src/applet-device-broadband.c:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Red de banda ancha móvil."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Ahora está registrado en la red de casa."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Ahora está registrado en una red de «roaming»."
 
-#: ../src/applet-device-bt.c:93
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Ahora está conectado a la red de banda ancha móvil."
 
-#: ../src/applet-device-bt.c:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Preparando la conexión de banda ancha móvil «%s»…"
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Configurando la conexión de banda ancha móvil «%s»…"
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
 "Se necesita autenticación de usuario para la conexión de banda ancha móvil "
 "«%s»…"
 
-#: ../src/applet-device-bt.c:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "La conexión de banda ancha móvil «%s» está activa"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Cableada automática"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Redes cableadas (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Red cableada (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Redes cableadas"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Red cableada"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Ahora está conectado a la red cableada."
 
-#: ../src/applet-device-ethernet.c:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Preparando la conexión cableada «%s»…"
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Configurando la conexión de red cableada «%s»…"
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Se necesita autenticación de usuario para la red cableada «%s»…"
 
-#: ../src/applet-device-ethernet.c:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Solicitando una dirección de red cableada para «%s»…"
 
-#: ../src/applet-device-ethernet.c:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "La conexión de red cableada «%s» está activa"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticación DSL"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Conectar a una red inalámbrica oculta…"
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Crear una red inalámbrica _nueva…"
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ninguna)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Redes inalámbricas (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Red inalámbrica (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Red inalámbrica"
 msgstr[1] "Redes inalámbricas"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "La red inalámbrica está desactivada"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Red inalámbrica desactivada por el interruptor físico"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Más redes"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Redes inalámbricas disponibles"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Usar el menú de red para conectarse a una red inalámbrica"
 
-#: ../src/applet-device-wifi.c:1237
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Ahora está conectado a la red inalámbrica «%s»."
 
-#: ../src/applet-device-wifi.c:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Preparando la conexión de red inalámbrica «%s»…"
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Configurando la conexión de red inalámbrica «%s»…"
 
-#: ../src/applet-device-wifi.c:1275
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr ""
 "Se necesita autenticación de usuario para la conexión de red inalámbrica "
 "«%s»…"
 
-#: ../src/applet-device-wifi.c:1278
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Solicitando una dirección de red inalámbrica para «%s»…"
 
-#: ../src/applet-device-wifi.c:1289
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "La conexión de red inalámbrica a «%s» está activa: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "La conexión de red inalámbrica «%s» está activa"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Falló al activar la conexión"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Falló al añadir la conexión nueva"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Ha ocurrido un error al mostrar información de la conexión:"
 
-#: ../src/applet-dialogs.c:75
-#: ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP dinámica "
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Más direcciones"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (predeterminada)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconocida"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "Dirección IP:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Dirección de difusión:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Máscara de subred:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Cableada (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "General"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interfaz:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Dirección hardware:"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Controlador:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Seguridad:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Ruta predeterminada:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Tipo de VPN:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Puerta de enlace VPN:"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Nombre del usuario VPN:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Mensaje VPN:"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Conexión base:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconocida"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "No se encontró ninguna conexión activa válida"
 
-#: ../src/applet-dialogs.c:977
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -939,44 +931,44 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "y muchos otros colaboradores y traductores de la comunidad"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Miniaplicación del área de notificación para gestionar sus dispositivos de "
 "red y conexiones."
 
-#: ../src/applet-dialogs.c:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Página web del Gestor de la red"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Recursos faltantes"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Contraseña de la red de banda ancha móvil"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Se necesita una contraseña para conectar con «%s»"
 
-#: ../src/applet-dialogs.c:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Se necesita un código PIN de desbloqueo"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "Se necesita un código PIN de desbloqueo"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -986,25 +978,25 @@ msgstr ""
 "usarlo."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Código PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Mostrar el código PIN"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Se necesita un código PUK"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "Se necesita un código PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1014,22 +1006,22 @@ msgstr ""
 "usarlo."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Código PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Código PIN nuevo:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Introducir de nuevo el código PIN nuevo:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Mostrar códigos PIN/PUK"
 
@@ -1070,7 +1062,7 @@ msgstr "_Añadir"
 #: ../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:701
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Eliminar"
 
@@ -1094,8 +1086,7 @@ msgstr ""
 "predeterminada."
 
 #: ../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/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
@@ -1172,7 +1163,7 @@ 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:5
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -1289,57 +1280,57 @@ msgstr "Edad _máxima:"
 msgid "_Aging time:"
 msgstr "_Tiempo de de caducidad:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automático"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "predeterminado"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "error no especificado"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "Dirección MAC"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "Dirección HW"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%s no válido para %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:486
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s no válido (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "nombre de interfaz no válido para %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "nombre de interfaz no válido (%s)"
 
-#: ../src/connection-editor/ce-page.c:487
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "dispositivo"
 
-#: ../src/connection-editor/ce-page.c:593
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Falló al actualizar los secretos de la conexión debido a un error "
@@ -1560,8 +1551,8 @@ msgstr "_Mostrar 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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1573,8 +1564,8 @@ msgstr "Contrase_ña:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automático"
@@ -1658,36 +1649,40 @@ msgid "De_fault"
 msgstr "_Predeterminado"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorar"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Difusión"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 #, fuzzy
-#| msgid "_Private key password:"
 msgid "_Wake on LAN password:"
 msgstr "Contraseña de clave _privada:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1729,8 +1724,8 @@ msgstr "Automática con configuración manual de DNS"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manual"
 
@@ -1741,8 +1736,8 @@ 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:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Compartida con otros equipos"
 
@@ -1781,15 +1776,15 @@ msgstr "ID del cliente 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:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "Dominios de bú_squeda:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Servidores _DNS:"
 
@@ -1820,7 +1815,7 @@ msgid "_Routes…"
 msgstr "_Rutas…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Desactivado"
 
@@ -1965,12 +1960,10 @@ msgid "_Parent interface:"
 msgstr "Interfaz pa_dre:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-#| msgid "VLAN interface _name:"
 msgid "VLAN inter_face name:"
 msgstr "Nombre de la _interfaz VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#| msgid "_Cloned MAC address:"
 msgid "Cloned MAC _address:"
 msgstr "Dirección MAC _clonada:"
 
@@ -2064,7 +2057,7 @@ msgstr "Ban_da:"
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "No hay autorización de polkit para realizar la acción"
 
@@ -2122,156 +2115,155 @@ msgstr ""
 "métodos de autenticación. Si la conexión falla, intente desactivar el "
 "soporte para algunos métodos."
 
-#: ../src/connection-editor/connection-helpers.c:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Cableada"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Inalámbrica"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:126
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Unir"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Puente"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:597 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Dirección hardware:"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtual"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Importar una configuración VPN guardada…"
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "El editor de la conexión no se pudo iniciar debido a un error desconocido."
 
-#: ../src/connection-editor/connection-helpers.c:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "No se pudo crear la nueva conexión"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Falló al eliminar la conexión"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "¿Está seguro de que quiere eliminar la conexión %s?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Dirección"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Máscara de red"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Puerta de enlace"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Métrica"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefijo"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Editando %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Editando la conexión sin nombre"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Falta el nombre de de la conexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
+#: ../src/connection-editor/nm-connection-editor.c:187
 #, fuzzy
-#| msgid "Error initializing editor"
 msgid "Editor initializing..."
 msgstr "Error al inicializar el editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "No se puede modificar la conexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Ajuste %s no válido: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2279,36 +2271,36 @@ msgstr ""
 "El editor de la conexión no pudo encontrar algunos archivos de recursos (no "
 "se encontró el archivo .iu)."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Guardar cualquier cambio realizado en esta conexión."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autenticar para guardar esta conexión para todos los usuarios en este equipo."
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "No se pudo crear la conexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "No se pudo editar la conexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Error desconocido al crear el diálogo del editor de conexión."
 
-#: ../src/connection-editor/nm-connection-editor.c:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Error al inicializar el editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Falló al añadir la conexión"
 
@@ -2324,162 +2316,161 @@ msgstr "_Nombre de la conexión:"
 msgid "_Export..."
 msgstr "E_xportar…"
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nunca"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "ahora"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hace %d minuto"
 msgstr[1] "hace %d minutos"
 
-#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hace %d hora"
 msgstr[1] "hace %d horas"
 
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hace %d día"
 msgstr[1] "hace %d días"
 
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "hace %d mes"
 msgstr[1] "hace %d meses"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "hace %d año"
 msgstr[1] "hace %d años"
 
-#: ../src/connection-editor/nm-connection-list.c:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Usada por última vez"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Editar la conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentíquese para editar la conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:702
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Eliminar la conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentíquese para eliminar la conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "No hay complementos de VPN instalados."
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Se desconoce cómo crear conexiones «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Error al crear la conexión"
 
-#: ../src/connection-editor/nm-connection-list.c:957
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Error al editar la conexión"
 
-#: ../src/connection-editor/nm-connection-list.c:958
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "No se encontró una conexión con UUID «%s»"
 
-#: ../src/connection-editor/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Seguridad 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "No se pudo cargar la interfaz de usuario de seguridad 802.1x."
 
-#: ../src/connection-editor/page-8021x-security.c:128
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Usar seguridad 802.1_X para esta conexión"
 
-#: ../src/connection-editor/page-bluetooth.c:61
+#: ../src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Dirección MAC del dispositivo Bluetooth: Ejemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:128
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "No se pudo cargar la interfaz de usuario de Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:178
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
-#| msgid "could not find the Bluetooth device."
 msgid "invalid Bluetooth device (%s)"
 msgstr "dispositivo Bluetooth no válido (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:261
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Conexión Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:305
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Tipo de Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:323
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Seleccione el tipo de perfil de conexión Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:328
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "Red de área _personal"
 
-#: ../src/connection-editor/page-bluetooth.c:333
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "Red de _marcado"
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "No se pudo cargar la interfaz de usuario para Bond."
 
-#: ../src/connection-editor/page-bond.c:568
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "primario"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Conexión Bond %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "No se pudo cargar la interfaz puente de usuario."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Conexión puente %d"
@@ -2487,32 +2478,32 @@ msgstr "Conexión puente %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Puerto puente"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "No se pudo cargar el puerto puente de usuario."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "No se pudo cargar la interfaz de usuario para DCB."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "No se pudo cargar la interfaz de usuario para DSL."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexión DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:77
+#: ../src/connection-editor/page-ethernet.c:74
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"em1\", "
@@ -2522,39 +2513,37 @@ msgstr ""
 "nombre de interfaz, por sudirección permanente MAC o por ambas. Por ejemplo: "
 "«em1», «3C:97:0E:42:1A:19», «em1 (3C:97:0E:42:1A:19)»."
 
-#: ../src/connection-editor/page-ethernet.c:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "No se pudo cargar la interfaz de usuario cableada."
 
-#: ../src/connection-editor/page-ethernet.c:447
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Dispositivo Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:744
-#: ../src/connection-editor/page-wifi.c:583
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "MAC clonada"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Conexión cableada %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#. Check access method name, APN and type
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
-#: ../src/libnm-gtk/tests/test-mobile-providers.c:324
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2565,15 +2554,15 @@ msgstr ""
 "establecida en el cortafuegos. Sólo se puede usar si el cortafuegos está "
 "activo."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD no se está ejecutando."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "No se pudo cargar la interfaz de usuario General."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2585,152 +2574,152 @@ 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:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "No se pudo cargar la interfaz de usuario InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 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-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automático (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Sólo direcciones automáticas (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automático, sólo direcciones"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automático (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Sólo direcciones automáticas (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automático (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Sólo direcciones automáticas (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Sólo enlace local"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Servidores _DNS adicionales:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Dominios de bú_squeda adicionales:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editando las rutas IPv4 para %s"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Ajustes de IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "No se pudo cargar la interfaz de usuario para IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "Dirección IPV4 «%s» no válida"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "Máscara de red IPV4 «%s» no válida"
 
-#: ../src/connection-editor/page-ip4.c:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "Puerta de enlace IPV4 «%s» no válida"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "Servido DNS IPV4 «%s» no válido"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automático, DHCP únicamente"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editando las rutas IPv6 para %s"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Ajustes de IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "No se pudo cargar la interfaz de usuario para IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "Dirección IPV6 «%s» no válida"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "Prefijo IPV6 «%s» no válido"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "Puerta de enlace IPV6 «%s» no válida"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "Servido DNS IPV6 «%s» no válido"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Esclavos duplicados"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "Los esclavos «%s» y «%s» se aplican al dispositivo «%s»"
 
-#: ../src/connection-editor/page-master.c:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2739,25 +2728,25 @@ msgstr ""
 "Los esclavos «%s» y «%s» se aplican a puertos virtuales diferentes («%s» y "
 "«%s») del mismo dispositivo físico."
 
-#: ../src/connection-editor/page-master.c:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s esclavo %d"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "No se pudo cargar la interfaz de usuario de banda ancha móvil."
 
-#: ../src/connection-editor/page-mobile.c:330
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "El tipo de conexión de banda ancha móvil no está soportado."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Seleccionar el tipo de proveedor de banda ancha móvil"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2765,85 +2754,85 @@ msgstr ""
 "Seleccionar la tecnología que el proveedor de su banda ancha móvil usa. Si "
 "no está seguro pregúntele a su proveedor."
 
-#: ../src/connection-editor/page-mobile.c:564
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Mi proveedor usa tecnología basada en _GSM (ej. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 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:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ninguno"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Editando los métodos de autenticación PPP para %s"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Ajustes de PPP"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "No se pudo cargar la interfaz de usuario para PPP."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Seleccione el archivo que importar"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Error: el archivo no contiene una configuración JSON válida"
 
-#: ../src/connection-editor/page-team.c:272
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "No se pudo cargar la interfaz de usuario redundada."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Conexión redundada %d"
@@ -2851,56 +2840,56 @@ msgstr "Conexión redundada %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:154
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Dispositivo redundado"
 
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:153
 msgid "Could not load team port user interface."
 msgstr "No se pudo la interfaz de usuario redundada."
 
 #. 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:417
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (mediante «%s»)"
 
-#: ../src/connection-editor/page-vlan.c:429
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
 msgid "New connection..."
 msgstr "Nueva conexión…"
 
-#: ../src/connection-editor/page-vlan.c:599
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "No se pudo cargar la interfaz de usuario VLAN."
 
-#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:800
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Conexión VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "No se pudo cargar la interfaz de usuario para la VPN."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "No se pudo encontrar el complemento de servicio VPN para «%s»."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexión VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2910,11 +2899,11 @@ msgstr ""
 "\n"
 "Error: no existe el tipo de servicio VPN."
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Elegir un tipo de conexión VPN"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2924,7 +2913,7 @@ msgstr ""
 "de conexión VPN que quiere crear no aparece en la lista, puede que no tenga "
 "instalado el complemento de VPN correcto."
 
-#: ../src/connection-editor/page-wifi.c:80
+#: ../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"
@@ -2932,7 +2921,7 @@ msgstr ""
 "Esta opción bloquea esta conexión al punto de acceso inalámbrico (AP) "
 "especificado por el BSSID introducido aquí. Por ejemplo 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:91
+#: ../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\", "
@@ -2942,82 +2931,82 @@ msgstr ""
 "su nombre de interfaz, por su MAC permanente o por ambas. Por ejemplo: "
 "«wlan0», «3C:97:0E:42:1A:19», «wlan0 (3C:97:0E:42:1A:19)»."
 
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "No se pudo cargar la interfaz de usuario inalámbrica."
 
-#: ../src/connection-editor/page-wifi.c:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:579
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Dispositivo inalámbrico"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Conexión inalámbrica %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "WEP dinámica (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA y WPA2 personal"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA y WPA2 enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "No se pudo cargar la interfaz de usuario de seguridad inalámbrica; faltan "
 "los ajustes inalámbricos."
 
-#: ../src/connection-editor/page-wifi-security.c:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Seguridad inalámbrica"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "No se pudo cargar la interfaz de usuario de seguridad inalámbrica."
 
-#: ../src/connection-editor/page-wifi-security.c:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "falta el SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Seguridad no compatible con el modo Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "No se puede importar la conexión VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3030,29 +3019,29 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "Error desconocido"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Ya existe un archivo llamado «%s»."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Reemplazar"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "¿Quiere reemplazar %s con la conexión VPN que está guardando?"
 
-#: ../src/connection-editor/vpn-helpers.c:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "No se puede exportar la conexión VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3063,11 +3052,11 @@ msgstr ""
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exportar conexión VPN…"
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3091,33 +3080,33 @@ msgstr "Información de la conexión"
 msgid "Active Network Connections"
 msgstr "Conexiones de red activas"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
 "Su conexión de banda ancha móvil está configurada con los siguientes ajustes:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.c:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Su dispositivo:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.c:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Su proveedor:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Su plan:"
 
-#: ../src/libnma/nma-mobile-wizard.c:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3131,28 +3120,28 @@ msgstr ""
 "ajustes de conexión de la banda ancha móvil, elija \"«Conexiones de red» "
 "desde el menú Sistema » Preferencias."
 
-#: ../src/libnma/nma-mobile-wizard.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmar los ajustes de la banda ancha móvil"
 
-#: ../src/libnma/nma-mobile-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Sin listar"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Seleccionar su plan:"
 
-#: ../src/libnma/nma-mobile-wizard.c:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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 (nombre del punto de acceso) seleccionado:"
 
-#: ../src/libnma/nma-mobile-wizard.c:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3164,83 +3153,83 @@ msgstr ""
 "\n"
 "Si no está seguro de su plan consulte a su proveedor para su plan APN."
 
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Elegir su plan de precios"
 
-#: ../src/libnma/nma-mobile-wizard.c:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../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:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Seleccionar su proveedor de la _lista:"
 
-#: ../src/libnma/nma-mobile-wizard.c:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Proveedor"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "No puedo encontrar mi proveedor y querría introducirlo _manualmente:"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../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:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 "Mi proveedor usa tecnología GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Mi proveedor usa tecnología CDMA (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.c:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Elegir su proveedor"
 
-#: ../src/libnma/nma-mobile-wizard.c:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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 o regiones:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "País o región"
 
-#: ../src/libnma/nma-mobile-wizard.c:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Mi país no está en la lista"
 
-#: ../src/libnma/nma-mobile-wizard.c:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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.c:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3248,82 +3237,82 @@ msgstr ""
 "Este asistente le ayuda a configurar una conexión de banda ancha móvil con "
 "una red móvil (3G)."
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "El nombre de su proveedor de banda ancha"
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "El nombre de su plan de precios"
 
-#: ../src/libnma/nma-mobile-wizard.c:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 "(En algunos casos) su plan de precios APN (nombre del punto de acceso)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Crear una conexión para es_te dispositivo de banda ancha móvil:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Cualquier dispositivo"
 
-#: ../src/libnma/nma-mobile-wizard.c:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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.c:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Conexión de banda ancha móvil nueva"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Guardar la contraseña sólo para este usuario"
 
-#: ../src/libnma/nma-ui-utils.c:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Guardar la contraseña para todos los usuarios"
 
-#: ../src/libnma/nma-ui-utils.c:55 ../src/libnm-gtk/nm-ui-utils.c:620
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Preguntar esta contraseña cada vez"
 
-#: ../src/libnma/nma-ui-utils.c:56 ../src/libnm-gtk/nm-ui-utils.c:621
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "No se necesita la contraseña"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "Contraseña _secundaria:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "Contraseña _ternaria:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
 msgid "Sh_ow passwords"
 msgstr "M_ostrar las contraseñas"
 
-#: ../src/libnma/nma-wifi-dialog.c:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Pulse para conectar"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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"
@@ -3331,20 +3320,20 @@ msgstr ""
 "Falta la contraseña o la conexión no es válida. En el último caso, debe "
 "editar primero la conexión con nm-connection-editor"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nueva…"
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ninguna"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3352,35 +3341,35 @@ msgstr ""
 "Se necesitan contraseñas o claves de cifrado para acceder a la red "
 "inalámbrica «%s»."
 
-#: ../src/libnma/nma-wifi-dialog.c:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Se requiere autenticación para la red inalámbrica"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "La red inalámbrica necesita autenticación"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Crear una red inalámbrica"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Red inalámbrica nueva"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Introduzca un nombre para la red inalámbrica que quiere crear."
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Conectar con una red inalámbrica oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Red inalámbrica oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3400,23 +3389,23 @@ msgstr "Co_nexión:"
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptador inalámbrico:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Cableado"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3426,17 +3415,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3444,7 +3433,7 @@ msgstr ""
 "Este programa es un componente de NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3452,151 +3441,151 @@ msgstr ""
 "No está pensado para interacción a través de la línea de comandos pero en su "
 "lugar se ejecuta en el entorno de escritorio GNOME."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "No habilitado"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "no está registrado"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Red doméstica (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Red doméstica"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "buscando"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "se denegó el registro"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Red roaming (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Red roaming"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "Código PIN para la tarjeta SIM «%s» en «%s»"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Se necesita un código PIN"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Se necesita un código PIN para el dispositivo de banda ancha móvil"
 
-#: ../src/mobile-helpers.c:610
+#: ../src/mobile-helpers.c:619
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "La conexión de banda ancha móvil «%s» está activa: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Conexión %s"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr "error no definido en la seguridad 802.1x (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "error no especificado al validar el archivo de método eap"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:452
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "Claves privadas DER, PEM, o PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificados DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "falta el archivo PAC de EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Elegir un archivo PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Archivos PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Todos los archivos"
 
@@ -3632,34 +3621,34 @@ msgstr "Autenticación i_nterna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir la provisión PAC _automática"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr "falta el nombre de usuario de EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "falta la contraseña de EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "certificado CA de EAP-LEAP no válido: %s"
 
-#: ../src/wireless-security/eap-method-peap.c:69
+#: ../src/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr ""
 "certificado CA de EAP-PEAP no válido: no se ha especificado ningún "
 "certificado"
 
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Elija un certificado CA…"
 
@@ -3687,47 +3676,47 @@ msgstr "No se necesita ningún ce_rtificado CA"
 msgid "PEAP _version:"
 msgstr "Versión _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "falta el usuario EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "falta la contraseña EAP"
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "falta la identidad EAP"
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "Certificado EAP-TLS CA no válido: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr ""
 "certificado CA de EAP-TLS no válido: no se ha especificado ningún certificado"
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "contraseña de EAP-TLS no válida: falta"
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "clave privada de EAP-TLS no válida: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "certificado de usuario de EAP-TLS no válido: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Las claves privadas sin cifrar son inseguras"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3741,11 +3730,11 @@ msgstr ""
 "\n"
 "(Puede proteger su clave privada con una contraseña con openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Elija su certificado personal…"
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Elija su clave privada…"
 
@@ -3765,38 +3754,38 @@ msgstr "Clave pri_vada:"
 msgid "_Private key password:"
 msgstr "Contraseña de clave _privada:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "certificado CA de usuario de EAP-TTLS no válido: %s"
 
-#: ../src/wireless-security/eap-method-ttls.c:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr ""
 "certificado CA de usuario de EAP-TTLS no válido: no se ha especificado "
 "ningún certificado"
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1x security"
 msgstr "Error desconocido al validar la seguridad 802.1x"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "RÁPIDO"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "TLS a través de túnel"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegido (PEAP)"
 
@@ -3806,11 +3795,11 @@ msgstr "EAP protegido (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Autenticación:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "falta el nombre de usuario leap"
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "falta la contraseña leap"
 
@@ -3875,7 +3864,7 @@ msgstr "_Mostrar la clave"
 msgid "WEP inde_x:"
 msgstr "Ín_dice WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3884,7 +3873,7 @@ msgstr ""
 "wpa-psk no válida: longitud %zu de clave no válida. Debe ser de [8,63] bytes "
 "o 64 dígitos hexadecimales"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk no válida: no se puede interpretar una clave de 64bit como "
@@ -3894,6 +3883,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Tipo:"
 
+#~ msgid "_Help"
+#~ msgstr "Ay_uda"
+
 #~ msgid "bdaddr"
 #~ msgstr "bdaddr"
 
diff --git a/po/et.po b/po/et.po
index f054f1ed..56767623 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12,9 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Network Manager MASTER\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2013-03-12 20:50+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -26,70 +25,91 @@ msgstr ""
 "X-Poedit-Language: Estonia\n"
 "X-Poedit-Country: ESTONIAN\n"
 
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Võrk"
 
+#: ../nm-applet.desktop.in.h:2
 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-connection-editor.desktop.in.h:2
 msgid "Manage and change your network connection settings"
 msgstr "Võrguühenduse sätete haldus"
 
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "Ühendumise saavutamisest ei teatata"
 
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
 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
 msgid "Disable disconnected notifications"
 msgstr "Ühenduse katkemisest ei teatata"
 
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
 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
 msgid "Disable VPN notifications"
 msgstr "VPN teadete keelamine"
 
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
 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
 msgid "Suppress networks available notifications"
 msgstr "Saadaolevatest võrkudest ei teatata"
 
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
 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
 msgid "Stamp"
 msgstr "Tempel"
 
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
 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 WiFi Create"
 msgstr "WiFi loomine keelatud"
 
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
 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
 msgid "Show the applet in notification area"
 msgstr "Rakendit näidatakse teatealas"
 
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
 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
 msgid "Ignore CA certificate"
 msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
 
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -97,6 +117,7 @@ msgstr ""
 "Märgi see, et keelata hoiatused sertifitseerimiskeskuse (CA) sertide kohta "
 "EAP autentimisel."
 
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -104,33 +125,90 @@ msgstr ""
 "Märgi see, et keelata hoiatused sertifitseerimiskeskuse (CA) sertide kohta "
 "EAP autentimise teises faasis."
 
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Võrguhalduri rakend"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Võrguhalduri rakend"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "Ü_hendu"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Võrgu nimi:"
 
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Ühenduse lisamine/aktiveerimine nurjus"
 
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Ühendus nurjus"
 
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Seadmega ühenduse katkestamine nurjus"
 
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Ühenduse katkestamine nurjus"
 
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Ühenduse aktiveerimine nurjus"
 
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Ära seda uuesti näita"
 
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -140,6 +218,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna võrguühendus katkestati."
 
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -148,6 +227,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna VPN-teenus peatus ootamatult."
 
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -157,6 +237,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna VPN-teenus tagastas vigase seadistuse."
 
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -165,6 +246,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna ühendumise katse aegus."
 
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -173,6 +255,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna VPN-teenus ei käivitunud õigeaegselt."
 
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -181,6 +264,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna VPN-teenuse käivitamine nurjus."
 
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -189,6 +273,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus, kuna ei leitud sobivat VPN'i parooli."
 
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -197,6 +282,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus sobimatu VPN'i parooli tõttu."
 
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -205,6 +291,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' nurjus."
 
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -214,6 +301,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' katkes, kuna võrguühendus katkestati."
 
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -222,6 +310,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' katkestati, kuna VPN-teenus peatus."
 
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -230,6 +319,7 @@ msgstr ""
 "\n"
 "VPN-ühendus '%s' katkes."
 
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -240,15 +330,19 @@ msgstr ""
 "\n"
 "%s\n"
 
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN ühenduse loomine edukas.\n"
 
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN'i sisselogimise teade"
 
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN-ühendus nurjus"
 
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -261,6 +355,7 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -273,494 +368,545 @@ msgstr ""
 "\n"
 "%s"
 
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "seade pole valmis (puudub püsivara)"
 
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "seade pole valmis"
 
 #. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ühendamata"
 
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Katkesta ühendus"
 
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "seade pole hallatud"
 
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Võrguseadmeid ei leitud"
 
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN-ühendused"
 
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Seadista VPN..."
 
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Katkesta VPN-ühendus"
 
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Võrguhaldur ei tööta..."
 
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Võrguühendused keelatud"
 
 #. 'Enable Networking' item
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "_Võrguühendused lubatud"
 
 #. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "_Wi-Fi ühendused lubatud"
 
 #. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobiiliühendus lubatud"
 
-#. 'Enable WiMAX Mobile Broadband' item
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMA_X-ühendus lubatud"
-
 #. Toggle notifications item
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "_Teated lubatud"
 
 #. 'Connection Information' item
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Ü_henduse andmed"
 
 #. 'Edit Connections...' item
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Ühenduste muutmine..."
 
-#. Help item
-msgid "_Help"
-msgstr "A_bi"
-
-#. About item
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Programmist lähemalt"
 
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "Oled nüüd ühendatud võrku '%s'."
+
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Ühendus katkestatud"
 
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Võrguühendus katkes."
 
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Võrguühenduse '%s' ettevalmistamine..."
 
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Võrguühenduse '%s' jaoks on vajalik kasutaja autentimine..."
 
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Võrguaadressi pärimine võrgu '%s' jaoks..."
 
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Võrguühendus '%s' on aktiivne"
 
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN-ühenduse '%s' alustamine..."
 
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN-ühenduse '%s' jaoks on vajalik kasutaja autentimine..."
 
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "VPN'i aadressi pärimine võrgu '%s' jaoks..."
 
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-ühendus '%s' on aktiivne"
 
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Võrguühendus puudub"
 
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Võrguhalduri rakend"
 
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr "Vale PUK-kood; võta ühendust oma teenusepakkujaga."
+
+#: ../src/applet-device-broadband.c:201
+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:252
+msgid "Sending unlock code..."
+msgstr "Luku avamise koodi saatmine..."
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Mobiiliühendus (%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
+msgid "Mobile Broadband"
+msgstr "Mobiiliühendus"
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Saadaval"
 
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "Oled nüüd ühendatud võrku '%s'."
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr "Uus mobiiliühendus..."
 
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Ühendus loodud"
 
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "Oled nüüd ühendatud mobiiliinternetti."
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr "Mobiiliühenduse võrk."
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "Oled nüüd ühendatud koduvõrku."
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "Oled nüüd ühendatud rändlusvõrku (roaming)."
+
+#: ../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
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Mobiiliühenduse '%s' ettevalmistamine..."
 
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, 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
 #, 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:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobiiliühendus '%s' on aktiivne"
 
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Mobiiliühendus (%s)"
-
-msgid "Mobile Broadband"
-msgstr "Mobiiliühendus"
-
-#. Default connection item
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Uus mobiiliühendus (CDMA)..."
-
-msgid "You are now connected to the CDMA network."
-msgstr "Oled nüüd ühendatud CDMA-võrku."
-
-msgid "CDMA network."
-msgstr "CDMA võrk."
-
-msgid "You are now registered on the home network."
-msgstr "Oled nüüd ühendatud koduvõrku."
-
-msgid "You are now registered on a roaming network."
-msgstr "Oled nüüd ühendatud rändlusvõrku (roaming)."
-
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automaatne juhtmega ühendus"
 
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet võrgud (%s)"
 
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet võrk (%s)"
 
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet võrgud"
 
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet võrk"
 
+#: ../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
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Ethernet võrgu ühenduse '%s' ettevalmistamine..."
 
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Ethernet võrgu ühenduse '%s' häälestamine..."
 
+#: ../src/applet-device-ethernet.c:167
 #, 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
 #, 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
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Ethernet võrguühendus '%s' on aktiivne"
 
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL autentimine"
 
-msgid "Wrong PUK code; please contact your provider."
-msgstr "Vale PUK-kood; võta ühendust oma teenusepakkujaga."
-
-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
-msgid "Sending unlock code..."
-msgstr "Luku avamise koodi saatmine..."
-
-#. Default connection item
-msgid "New Mobile Broadband connection..."
-msgstr "Uus mobiiliühendus..."
-
-msgid "You are now connected to the Mobile Broadband network."
-msgstr "Oled nüüd ühendatud mobiiliinternetti."
-
-msgid "Mobile Broadband network."
-msgstr "Mobiiliühenduse võrk."
-
-#. Default connection item
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Uus mobiiliühendus (GSM)..."
-
-msgid "You are now connected to the GSM network."
-msgstr "Oled nüüd ühendatud GSM-võrku."
-
-msgid "GSM network."
-msgstr "GSM võrk."
-
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Ühendu varjatud Wi-Fi võrku..."
 
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Loo _uus Wi-Fi võrk..."
 
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(puudub)"
 
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi võrgud (%s)"
 
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi võrk (%s)"
 
+#: ../src/applet-device-wifi.c:905
 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:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi on keelatud"
 
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi on keelatud riistvaralisest lülitist"
 
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Veel võrke"
 
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi võrgud on saadaval"
 
+#: ../src/applet-device-wifi.c:1181
 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:1364
 #, 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:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Wi-Fi võrgu '%s' ühenduse ettevalmistamine..."
 
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Wi-Fi võrgu '%s' ühenduse häälestamine..."
 
+#: ../src/applet-device-wifi.c:1405
 #, 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:1408
 #, 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:1419
 #, 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:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi võrguühendus '%s' on aktiivne"
 
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Ühenduse aktiveerimine nurjus"
 
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Uut ühendust pole võimalik lisada"
 
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX mobiiliühendus (%s)"
-
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX mobiiliühendus"
-
-msgid "WiMAX is disabled"
-msgstr "WiMAX on keelatud"
-
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX on keelatud riistvaralisest lülitist"
-
-msgid "You are now connected to the WiMAX network."
-msgstr "Oled nüüd ühendatud WiMAX-võrku."
-
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Mobiiliühendus '%s' on aktiivne: (%d%%%s%s)"
-
-msgid "roaming"
-msgstr "rändlus (roaming)"
-
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Viga ühenduse andmete kuvamisel:"
 
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dünaamiline WEP"
 
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Aadressid"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+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
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Tundmatu"
 
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "tundmatu"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP-aadress:"
 
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "tundmatu"
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Eetri aadress:"
 
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Tundmatu"
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Alamvõrgu mask:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Üldine"
 
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Liides:"
 
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Riistvara aadress:"
 
 #. Driver
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Draiver:"
 
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Kiirus:"
 
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Turvalisus:"
 
-msgid "CINR:"
-msgstr "CINR:"
-
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-msgid "IP Address:"
-msgstr "IP-aadress:"
-
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Tundmatu"
-
-msgid "Broadcast Address:"
-msgstr "Eetri aadress:"
-
-#. Prefix
-msgid "Subnet Mask:"
-msgstr "Alamvõrgu mask:"
-
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Tundmatu"
-
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Vaikimisi marsruut:"
 
-msgid "Primary DNS:"
-msgstr "Esmane DNS:"
-
-msgid "Secondary DNS:"
-msgstr "Teisene DNS:"
-
-msgid "Ternary DNS:"
-msgstr "Kolmas DNS:"
-
 #. --- IPv6 ---
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Eiratakse"
 
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPNi liik:"
 
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPNi lüüs:"
 
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPNi kasutajanimi:"
 
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN-i pealkiri (banner):"
 
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Baasühendus:"
 
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Tundmatu"
 
 #. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Sobivaid aktiivseid ühendusi pole!"
 
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -768,33 +914,42 @@ msgstr ""
 "Autoriõigused © 2005-2008 Novell, Inc.\n"
 "ja paljud teised kaasosalised ja tõlkijad kogukonnast"
 
+#: ../src/applet-dialogs.c:988
 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
 msgid "NetworkManager Website"
 msgstr "Võrguhalduri veebileht"
 
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Puuduvad allikad"
 
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Mobiiliühenduse võrguparool"
 
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Võrku '%s' ühendumiseks on vaja parooli."
 
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Parool:"
 
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Vajalik on SIM-kaardi PIN-kood"
 
+#: ../src/applet-dialogs.c:1337
 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:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -803,20 +958,25 @@ msgstr ""
 "Mobiiliühenduse seadme '%s' kasutamiseks on vajalik SIM-kaardi PIN-kood."
 
 #. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN-kood:"
 
 #. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Näita PIN-koodi"
 
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Vajalik on SIM-kaardi PUK-kood"
 
+#: ../src/applet-dialogs.c:1348
 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:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -825,33 +985,77 @@ msgstr ""
 "Mobiiliühenduse seadme '%s' kasutamiseks on vajalik SIM-kaardi PUK-kood."
 
 #. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK-kood:"
 
 #. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Uus PIN-kood:"
 
 #. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Uus PIN-kood uuesti:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
 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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
+
+#: ../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
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
 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: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
+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: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
+msgid "_Delete"
+msgstr "_Kustuta"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 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
 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
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -859,15 +1063,24 @@ msgstr ""
 "Kui märgitud, ei kasutata seda ühendust mitte kunagi vaikimisi "
 "võrguühendusena."
 
+#: ../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…"
 msgstr "Loo…"
 
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "Ühenduse liigi valimine"
 
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -879,62 +1092,82 @@ 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
 msgid "Round-robin"
 msgstr "Round-robin"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:2
 msgid "Active backup"
 msgstr "Aktiivne varundus"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:3
 msgid "XOR"
 msgstr "XOR"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:4
 msgid "Broadcast"
 msgstr "Eetriaadress"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:5
 msgid "802.3ad"
 msgstr "802.3ad"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:6
 msgid "Adaptive transmit load balancing"
 msgstr "Kohanev ülekande koormuse jaotus"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:7
 msgid "Adaptive load balancing"
 msgstr "Kohanev koormusjaotus"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:8
 msgid "MII (recommended)"
 msgstr "MII (soovitatud)"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:9
 msgid "ARP"
 msgstr "ARP"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:10
 msgid "Bonded _connections:"
 msgstr "Liitühendused (bonded):"
 
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Muuda"
 
-#. Delete
-msgid "_Delete"
-msgstr "_Kustuta"
-
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Monitoorimise _sagedus:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 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:"
 msgstr "_Liidese nimi:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "Ü_henduse monitooring:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP _sihtkohad:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -942,118 +1175,446 @@ 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:"
 msgstr "Link _maas viivitus:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Link _püsti viivitus:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "Esmane DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "baiti"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 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:"
 msgstr "_Prioriteet:"
 
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
 msgid "_Hairpin mode:"
 msgstr "_Hairpin režiim:"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
 msgid "Bridged _connections:"
 msgstr "_Sildühendused:"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "_Edastamise viivitus:"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Tervitusaeg:"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "_Võrguühendused lubatud"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_STP lubamine (Spanning Tree Protocol)"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Suurim vanus:"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_Vananemise aeg:"
 
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automaatne"
 
+#: ../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
+msgid "default"
+msgstr "vaikimisi"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Aadress"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Aadress"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Iga seade"
+
+#: ../src/connection-editor/ce-page.c:591
 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
+#, 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
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#, fuzzy
+msgid "Enable"
+msgstr "_Wi-Fi ühendused lubatud"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#, fuzzy
+msgid "Priority"
+msgstr "_Prioriteet:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#, fuzzy
+msgid "Priority Groups"
+msgstr "_Prioriteet:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioriteet:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Priority Bandwidth:"
+msgstr "_Prioriteet:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:"
 msgstr "_Kasutajanimi:"
 
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
 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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
 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:"
 msgstr "_Parool:"
 
-msgid "Yes"
-msgstr "Jah"
-
-msgid "Only on activation"
-msgstr "Ainult aktiveerumisel"
-
-msgid "No"
-msgstr "Ei"
-
+#: ../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
 msgid "Automatic"
 msgstr "Automaatne"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
 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
 msgid "Attachment Unit Interface (AUI)"
 msgstr "Attachment Unit Interface (AUI)"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
 msgid "BNC"
 msgstr "BNC"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
 msgid "Media Independent Interface (MII)"
 msgstr "Meediumist sõltumatu liides (MII)"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
 msgid "10 Mb/s"
 msgstr "10 Mb/s"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
 msgid "100 Mb/s"
 msgstr "100 Mb/s"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
 msgid "1 Gb/s"
 msgstr "1 Gb/s"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
 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.h:11
 msgid "_Speed:"
 msgstr "_Kiirus:"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
 msgid "Full duple_x"
 msgstr "_Täisdupleks"
 
 # Automaatne kokkulepe?
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
 msgid "Aut_onegotiate"
 msgstr "Aut_onegotiate"
 
-msgid "_Device MAC address:"
-msgstr "_Seadme MAC-aadress:"
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "_Teenus:"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "_Kloonitud MAC-aadress:"
 
+#: ../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 "
@@ -1063,56 +1624,120 @@ msgstr ""
 "riistvaralise aadressina. Seda võimalust tuntakse ka MAC-i kloonimise või "
 "petmisena. Näiteks: 00:11:22:33:44:55"
 
-msgid "_MTU:"
-msgstr "Ülekandeühiku piirsuurus (_MTU):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-msgid "bytes"
-msgstr "baiti"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Vaikimisi"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Eira"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Eetriaadress"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Privaatvõtme parool:"
 
-msgid "Carrier de_tect:"
-msgstr "Operaatori _tuvastus:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
 msgstr "Selle ühendusega koos ühendutakse automaatselt _VPN võrku"
 
+#: ../src/connection-editor/ce-page-general.ui.h:2
 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.h:4
 msgid "Firewall _zone:"
 msgstr "Tulemüüri _tsoon:"
 
+#: ../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
 msgid "Datagram"
 msgstr "Datagram"
 
 #. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 msgid "Connected"
 msgstr "Ühendatud"
 
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
 msgstr "Automaatne käsitsi DNS sätetega"
 
+#: ../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 "Käsitsi"
 
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
 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:186
+#: ../src/connection-editor/page-ip6.c:204
 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:"
 msgstr "_Meetod:"
 
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Aadressid"
 
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1122,6 +1747,8 @@ msgstr ""
 "määrata eriseadistuse. Kui soovid kasutada DHCP kliendi identifikaatorit, "
 "sisesta see siia."
 
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1129,15 +1756,25 @@ msgstr ""
 "Domeenid, mida kasutatakse hostinimede lahendamisel. Mitu domeeni eralda "
 "komaga."
 
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 msgid "D_HCP client ID:"
 msgstr "D_HCP kliendi ID:"
 
+#: ../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
 msgid "S_earch domains:"
 msgstr "_Otsidomeenid:"
 
+#: ../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:"
 msgstr "_DNS-serverid:"
 
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1145,9 +1782,11 @@ msgstr ""
 "Domeeninimeserverite IP-aadresse kasutatakse hostinimede lahendamiseks. "
 "Mitme domeeninimeserveri kasutamiseks eralda need komadega."
 
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1155,12 +1794,43 @@ 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:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Marsruudid…"
 
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Keelatud"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 ""
+"Domeeninimeserverite IP-aadresse kasutatakse hostinimede lahendamiseks. "
+"Mitme domeeninimeserveri kasutamiseks eralda need komadega."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1168,189 +1838,264 @@ msgstr ""
 "Ühendumisel IPv4 võrkudega lõpetatakse ühendumine edukalt ka siis, kui IPv6 "
 "seadistamine nurjub ja IPv4 seadistamine õnnestub."
 
-msgid "Any"
-msgstr "Suvaline"
-
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Eelista 3G (UMTS/HSPA)"
-
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Eelista 2G (GPRS/EDGE)"
-
-msgid "Prefer 4G (LTE)"
-msgstr "Eelistatakse 4G ühendust (LTE)"
-
-msgid "Use only 4G (LTE)"
-msgstr "Kasutatakse ainult 4G ühendust (LTE)"
-
+#: ../src/connection-editor/ce-page-mobile.ui.h:1
 msgid "Basic"
 msgstr "Põhiline"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "_Number:"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Täpsemalt"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "_Võrgu ID:"
 
-msgid "_Type:"
-msgstr "_Liik:"
-
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "_Muuda..."
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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
 msgid "Sho_w passwords"
 msgstr "_Näita paroole"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
 msgid "Authentication"
 msgstr "Autentimine"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
 msgid "Allowed methods:"
 msgstr "Lubatud viisid:"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Configure _Methods…"
 msgstr "_Meetodite seadistamine…"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Compression"
 msgstr "Tihendus"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
 msgid "_Use point-to-point encryption (MPPE)"
 msgstr "_Point-to-Point krüpteeringu kasutamine (MPPE)"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
 msgid "_Require 128-bit encryption"
 msgstr "_128-bitine krüpteerimine nõutud"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
 msgid "Use _stateful MPPE"
 msgstr "_Stateful-MPPE kasutamine"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
 msgid "Allow _BSD data compression"
 msgstr "_BSD-tihendamine lubatud"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
 msgid "Allow _Deflate data compression"
 msgstr "_Deflate-tihendamine lubatud"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
 msgid "Use TCP _header compression"
 msgstr "TCP _päiste tihendamine lubatud"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
 msgid "Echo"
 msgstr "Kaja"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
 msgid "Send PPP _echo packets"
 msgstr "Saadetakse PPP _echo pakette"
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+msgid "_Import team configuration from a file..."
+msgstr "VPN-ühenduse seadistuse importimine..."
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Liitühendused (bonded):"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "VPN-ühenduse seadistuse importimine..."
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Vanemliides:"
 
-msgid "VLAN interface _name:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN liidese _nimi:"
 
-msgid "_Cloned MAC address:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Kloonitud MAC-aadress:"
 
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLANi _ID:"
 
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Seadme nimi + number"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + number"
 
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
 msgid "S_ecurity:"
 msgstr "_Turvalisus:"
 
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-msgid "Infrastructure"
-msgstr "Infrastruktuur"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Saatja _võimsus:"
 
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Kiirus:"
 
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Kanal:"
 
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_Sagedus:"
 
-msgid "M_ode:"
-msgstr "_Režiim:"
-
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Lubatud autentimismeetodid"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Laiendatav autentimisprotokoll"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Parooliga autentimisprotokoll"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake autentimisprotokoll (CHAP)"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsofti Challenge Handshake autentimisprotokoll (MCHAP)"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1358,80 +2103,157 @@ msgstr ""
 "Tavaliselt toetab PPP teenusepakkuja server kõiki autentimisviise. Kui "
 "ühendus siiski nurjub, proovi mõne viisi keelamist."
 
-msgid "Address"
-msgstr "Aadress"
-
-msgid "Netmask"
-msgstr "Võrgumask"
-
-msgid "Gateway"
-msgstr "Lüüs (gateway)"
-
-msgid "Metric"
-msgstr "Meetrika"
-
-msgid "Prefix"
-msgstr "Prefiks"
-
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
+#: ../src/connection-editor/connection-helpers.c:109
+#: ../src/connection-editor/page-bond.c:444 ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../src/libnm-gtk/nm-ui-utils.c:577
 msgid "Bond"
 msgstr "Liitühendus (bond)"
 
+#: ../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
+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
 msgid "Bridge"
 msgstr "Sild"
 
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Riistvara"
 
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtuaalne"
 
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "VPN-ühenduse seadistuse importimine..."
 
+#: ../src/connection-editor/connection-helpers.c:323
 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:332
 msgid "Could not create new connection"
 msgstr "Uut ühendust pole võimalik luua"
 
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Ühenduse kustutamine nurjus"
 
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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:804
+#: ../src/connection-editor/ip6-routes-dialog.c:746
+#: ../src/connection-editor/page-ip4.c:1068
+#: ../src/connection-editor/page-ip6.c:1066
+msgid "Address"
+msgstr "Aadress"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Võrgumask"
+
+#: ../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
+msgid "Gateway"
+msgstr "Lüüs (gateway)"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Meetrika"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Prefiks"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Ühenduse %s muutmine"
 
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Nimetu ühenduse muutmine"
 
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Ühenduse _nimi:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Viga redaktori lähtestamisel"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Ühenduse lisamine nurjus"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -1439,142 +2261,212 @@ msgstr ""
 "Ühenduste redigeerija ei suutnud leida vajalikke allikaid (.ui faili ei "
 "leitud)."
 
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Salvesta"
 
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Salvesta kõik sellele ühendusele tehtud muudatused."
 
-msgid "_Save..."
-msgstr "_Salvesta..."
-
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:437
 msgid "Could not create connection"
 msgstr "Ühendust pole võimalik luua"
 
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Ühendust pole võimalik muuta"
 
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Tundmatu viga ühenduse muutmise dialoogi loomisel."
 
-msgid "Error saving connection"
-msgstr "Viga ühenduse salvestamisel"
-
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Omadus '%s' / '%s' pole sobiv: %d"
-
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Viga redaktori lähtestamisel"
 
+#: ../src/connection-editor/nm-connection-editor.c:921
 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
 msgid "Connection _name:"
 msgstr "Ühenduse _nimi:"
 
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Eksportimine..."
 
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "mitte kunagi"
 
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "nüüd"
 
 #. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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
 #, 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
 #, 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
 #, 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
 #, 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:623
 msgid "Name"
 msgstr "Nimi"
 
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Viimati kasutatud"
 
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Valitud ühenduse muutmine"
 
-msgid "_Edit..."
-msgstr "_Muuda..."
-
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Valitud ühenduse muutmiseks pead end autentima"
 
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Valitud ühenduse kustutamine"
 
-msgid "_Delete..."
-msgstr "_Kustuta..."
-
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Valitud ühenduse kustutamiseks pead end autentima"
 
-msgid "Error creating connection"
-msgstr "Viga ühenduse loomisel"
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
 
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:933
+msgid "Error creating connection"
+msgstr "Viga ühenduse loomisel"
+
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Viga ühenduse muutmisel"
 
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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
 msgid "802.1x Security"
 msgstr "802.1x turvalisus"
 
+#: ../src/connection-editor/page-8021x-security.c:111
 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
 msgid "Use 802.1_X security for this connection"
 msgstr "Sellel ühendusel 802.1_X turvalisuse kasutamine"
 
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Ethernet võrgu kasutajaliidest pole võimalik laadida."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Liitühendus %d (bond)"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Ethernet võrk"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Wi-Fi võrk"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Liitühenduse (bond) kasutajaliidest pole võimalik laadida."
 
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "Esmane DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Liitühendus %d (bond)"
 
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Sildühenduse kasutajaliidest pole võimalik laadida."
 
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Sildühendus %d"
@@ -1582,37 +2474,75 @@ 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
 msgid "Bridge Port"
 msgstr "Silla port"
 
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Sildpordi kasutajaliidest pole võimalik laadida."
 
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "DSL kasutajaliidest pole võimalik laadida."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL kasutajaliidest pole võimalik laadida."
 
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-ühendus %d"
 
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "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:328
 msgid "Could not load ethernet user interface."
 msgstr "Ethernet võrgu kasutajaliidest pole võimalik laadida."
 
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Kloonitud MAC-aadress:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Vaikimisi"
 
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -1622,98 +2552,193 @@ msgstr ""
 "valimisel kasutatakse tulemüüri vaikimisi tsooni. Kasutatav ainult siis, kui "
 "firewalld on aktiivne."
 
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD ei tööta."
 
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Üldist kasutajaliidest pole võimalik laadida."
 
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand-võrgu kasutajaliidest pole võimalik laadida."
 
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand võrgu ühendus %d"
 
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automaatne (VPN)"
 
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Automaatselt (VPN) ainult aadressid"
 
-msgid "Automatic (PPP)"
-msgstr "Automaatne (PPP)"
-
-msgid "Automatic (PPP) addresses only"
-msgstr "Automaatselt (PPP) ainult aadressid"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "Automaatne, ainult aadressid"
 
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automaatne (PPPoE)"
 
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automaatselt (PPPoE) ainult aadressid"
 
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automaatne (DHCP)"
 
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automaatselt (DHCP) ainult aadressid"
 
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Ainult Link-Local"
 
-msgid "Disabled"
-msgstr "Keelatud"
-
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "_DNS lisaserverid:"
 
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "_Lisaotsidomeenid:"
 
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Seadme %s IPv4-marsruutide muutmine"
 
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 sätted"
 
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 kasutajaliidest pole võimalik laadida."
 
-msgid "Automatic, addresses only"
-msgstr "Automaatne, ainult aadressid"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Eira"
 
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automaatne, ainult DHCP"
 
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Seadme %s IPv6-marsruutide muutmine"
 
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 sätted"
 
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 kasutajaliidest pole võimalik laadida."
 
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
 #, c-format
 msgid "%s slave %d"
 msgstr "%s alluv %d"
 
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Mobiiliühenduse kasutajaliidest pole võimalik laadida."
 
+#: ../src/connection-editor/page-mobile.c:327
 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:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Mobiiliühenduse teenusepakkuja liigi valimine"
 
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1721,68 +2746,148 @@ msgstr ""
 "Vali mobiiliühenduse pakkuja kasutatav tehnoloogia.  Kui sa pole kindel, "
 "küsi oma teenusepakkujalt."
 
+#: ../src/connection-editor/page-mobile.c:561
 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, "
 "UMTS, HSDPA)"
 
+#: ../src/connection-editor/page-mobile.c:568
 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:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 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
 msgid "PAP"
 msgstr "PAP"
 
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "puudub"
 
+#: ../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
 msgid "PPP Settings"
 msgstr "PPP sätted"
 
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP kasutajaliidest pole võimalik laadida."
 
+# importimise dialoogi pealkiri
+#: ../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 "Importimiseks faili valimine"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "VLAN kasutajaliidest pole võimalik laadida."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+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:151
+#, fuzzy
+msgid "Team Port"
+msgstr "Silla port"
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+msgid "Could not load team port user interface."
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Võrguühendus puudub"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "VLAN kasutajaliidest pole võimalik laadida."
 
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-ühendus %d"
 
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN kasutajaliidest pole võimalik laadida."
 
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "VPN-i pluginat teenuse '%s' jaoks ei leitud."
 
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-ühendus %d"
 
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -1792,9 +2897,11 @@ msgstr ""
 "\n"
 "Viga: puudub VPN teenuse tüüp."
 
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "VPN-ühenduse liigi valimine"
 
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -1803,6 +2910,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
 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"
@@ -1810,61 +2918,93 @@ msgstr ""
 "See valik lubab ühenduda ainult siia sisestatud BSSID aadressiga Wi-Fi "
 "ruuteriga (AP). Näiteks: 00:11:22:33:44:55"
 
-#, c-format
-msgid "default"
-msgstr "vaikimisi"
+#: ../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)\""
+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
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi-võrgu kasutajaliidest pole võimalik laadida."
 
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Iga seade"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi ühendus %d"
 
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "Puudub"
-
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:345
+#: ../src/libnma/nma-wifi-dialog.c:945 ../src/libnm-gtk/nm-wifi-dialog.c:961
 msgid "Dynamic WEP (802.1x)"
 msgstr "Dünaamiline WEP (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
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 isiklik"
 
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ettevõtte"
 
+#: ../src/connection-editor/page-wifi-security.c:413
 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:424
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi turvalisus"
 
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi-võrgu turvalisuse kasutajaliidest pole võimalik laadida."
 
-msgid "Could not load WiMAX user interface."
-msgstr "WiMAX-võrgu kasutajaliidest pole võimalik laadida."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX ühendus %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN-ühendust pole võimalik importida"
 
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -1877,24 +3017,30 @@ msgstr ""
 "\n"
 "Viga: %s."
 
-# importimise dialoogi pealkiri
-msgid "Select file to import"
-msgstr "Importimiseks faili valimine"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Tundmatu viga"
 
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Fail nimega \"%s\" on juba olemas."
 
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Asenda"
 
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:255
 msgid "Cannot export VPN connection"
 msgstr "VPN-ühendust pole võimalik eksportida"
 
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -1906,9 +3052,11 @@ msgstr ""
 "Viga: %s."
 
 # eksportimise faili valiku pealkiri
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN-ühenduse eksportimine..."
 
+#: ../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)."
@@ -1916,104 +3064,49 @@ msgstr ""
 "Võrguhalduri rakend ei suutnud leida vajalikke allikaid (.ui faili ei "
 "leitud)."
 
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Bluetoothi seadistamine pole võimalik (ühendumine D-Bus'iga nurjus: (%s) %s)."
-
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Bluetoothi seadistamine pole võimalik (tõrge võrguhalduri otsimisel: (%s) "
-"%s)."
-
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Mobiiltelefoni kasutamine võrguseadmena (PAN/NAP)"
-
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Internetiühendus mobiiltelefoni kaudu (DUN)"
-
-#, c-format
-msgid "Error: %s"
-msgstr "Tõrge: %s"
-
-#, c-format
-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!"
-
-msgid "Mobile wizard was canceled"
-msgstr "Mobiiliühenduse nõustaja katkestati"
-
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Tundmatut tüüpi telefoniseade (pole GSM ega CDMA)"
-
-msgid "unknown modem type."
-msgstr "tundmatu modemi liik."
-
-msgid "failed to connect to the phone."
-msgstr "telefoniga ühendumine nurjus."
-
-msgid "unexpectedly disconnected from the phone."
-msgstr "ühendus katkes ootamatult telefonist."
-
-msgid "timed out detecting phone details."
-msgstr "telefoni andmete tuvastamine aegus."
-
-msgid "Detecting phone configuration..."
-msgstr "Telefoni seadistuse tuvastamine..."
-
-msgid "error getting bus connection"
-msgstr "viga siini ühenduse hankimisel"
-
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Vaikimisi Bluetoothi adapter peab olema enne sissehelistamisühenduse (dial-"
-"up) seadistamist sisse lülitatud."
-
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "PAN-ühenduse loomine nurjus: %s"
-
-#, c-format
-msgid "%s Network"
-msgstr "%s võrk"
-
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Võta lukust lahti"
 
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Selle seadme luku automaatne avamine"
 
+#: ../src/info.ui.h:1
 msgid "Connection Information"
 msgstr "Ühenduse andmed"
 
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Aktiivsed võrguühendused"
 
+#: ../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
 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 "
@@ -2026,18 +3119,28 @@ msgstr ""
 "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-wizard.c:325
+#: ../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
 msgid ""
 "Warning: Selecting an incorrect plan may result in billing issues for your "
 "broadband account or may prevent connectivity.\n"
@@ -2050,167 +3153,288 @@ msgstr ""
 "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
 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
 msgid "Provider"
 msgstr "Teenusepakkuja"
 
+#: ../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 "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
 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
 msgid "Installed GSM device"
 msgstr "Paigaldatud GSM-seade"
 
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../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
 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
 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
 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
 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
 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
 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
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Mobiiliühenduse seadistamine"
 
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Uus mobiiliühendus"
 
-msgid "Wired"
-msgstr "Juhtmega"
+#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+msgid "Store the password only for this user"
+msgstr ""
 
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-msgid "OLPC Mesh"
-msgstr "OLPC võrk"
+#: ../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"
 
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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."
 
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Parool:"
 
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Parool:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_Näita paroole"
 
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Uus..."
 
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Puudub"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Loo"
 
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, 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:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi võrk nõuab salasõna"
 
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi võrgu jaoks on vaja salasõna"
 
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Uue Wi-Fi võrgu loomine"
 
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Uus Wi-Fi võrk"
 
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Varjatud Wi-Fi võrku ühendumine"
 
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Varjatud Wi-Fi võrk"
 
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "Sisesta varjatud Wi-Fi võrgu nimi ja parool."
 
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi _turvalisus:"
 
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Ü_hendus:"
 
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi _adapter:"
 
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC võrk"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Kasutus:"
 
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"See rakendus on võrguhalduri osa (https://wiki.gnome.org/Projects/NetworkManager/)."
+"See rakendus on võrguhalduri osa (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
 
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -2218,164 +3442,282 @@ msgstr ""
 "See ei ole mõeldud käsurealt juhtimiseks, vaid GNOME töölauakeskkonnas "
 "kasutamiseks."
 
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "pole lubatud"
 
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "pole registreeritud"
 
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Koduvõrk (%s)"
 
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Koduvõrk"
 
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "otsimine"
 
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registreerimisest keelduti"
 
+#: ../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
 #, 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
 #, 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
 msgid "Roaming network"
 msgstr "Välisriigi roaming-võrk"
 
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "'%s' SIM kaardi PIN kood seadmes '%s'"
 
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Vajalik on PIN-kood"
 
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Mobiiliühenduse seadmele on vaja PIN-koodi"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Mobiiliühendus '%s' on aktiivne: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "rändlus (roaming)"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s ühendus"
 
-msgid "No Certificate Authority certificate chosen"
-msgstr "Ühtki sertifitseerimiskeskuse sertifikaadifaili pole valitud"
-
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"Sertifitseerimiskeskuse (CA) sertifikaadi mittekasutamine võib põhjustada "
-"ühendumise ebaturvalistesse, kuritegelikesse Wi-Fi võrkudesse. Kas sa "
-"valiksid siiski sertifitseerimiskeskuse sertifikaadi?"
 
-msgid "Choose CA Certificate"
-msgstr "Vali sertifitseerimiskeskuse sertifikaat"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
+#: ../src/wireless-security/eap-method.c:452
 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:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER või PEM sertifikaadid (*.der, *.pem, *.crt, *.cer)"
 
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "PAC-faili lubamine..."
 
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC failid (*.pac)"
 
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Kõik failid"
 
+#: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "Anonüümne"
 
+#: ../src/wireless-security/eap-method-fast.ui.h:3
 msgid "Authenticated"
 msgstr "Autenditud"
 
+#: ../src/wireless-security/eap-method-fast.ui.h:4
 msgid "Both"
 msgstr "Mõlemad"
 
+#: ../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:"
 msgstr "Anonüü_mne identiteet:"
 
+#: ../src/wireless-security/eap-method-fast.ui.h:6
 msgid "PAC _file:"
 msgstr "PAC _fail:"
 
+#: ../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
 msgid "_Inner authentication:"
 msgstr "_Sise-autentimine:"
 
+#: ../src/wireless-security/eap-method-fast.ui.h:8
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automaatsed _PAC-klauslid on lubatud"
 
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 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 "Vali sertifitseerimiskeskuse sertifikaadifail..."
 
+#: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
 msgstr "Versioon 0"
 
+#: ../src/wireless-security/eap-method-peap.ui.h:4
 msgid "Version 1"
 msgstr "Versioon 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 "Sertifitseerimis_keskuse sert:"
 
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "Sertifitseerimiskeskuse sertifikaadi eiramine"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "PEAP _versioon:"
 
-msgid "As_k for this password every time"
-msgstr "_Seda parooli küsitakse iga kord"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Sertifitseerimis_keskuse sert:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
 
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Krüpteerimata privaatvõtmed pole turvalised"
 
+#: ../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 "
@@ -2388,69 +3730,367 @@ msgstr ""
 "\n"
 "(Privaatvõtme saab parooliga kaitsta openssl-i abil)"
 
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Vali privaatsertifikaadi fail..."
 
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Vali privaatvõtme fail..."
 
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "I_dentiteet:"
 
+#: ../src/wireless-security/eap-method-tls.ui.h:2
 msgid "_User certificate:"
 msgstr "_Kasutaja sertifikaart:"
 
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Privaat_võti:"
 
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "_Privaatvõtme parool:"
 
-msgid "Don't _warn me again"
-msgstr "Ära enam _hoiata"
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
 
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunnelis TLS"
 
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Kaitstud EAP (PEAP)"
 
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../src/wireless-security/ws-wep-key.ui.h:9
+#: ../src/wireless-security/ws-wpa-eap.ui.h:2
 msgid "Au_thentication:"
 msgstr "_Autentimine:"
 
-msgid "1 (Default)"
-msgstr "1 (vaikimisi)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
 msgid "Open System"
 msgstr "Avatud süsteem"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:6
 msgid "Shared Key"
 msgstr "Jagatud võti"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
 msgstr "_Võti:"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:8
 msgid "Sho_w key"
 msgstr "_Näita võtit"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "WEP inde_ks:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Liik:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "WiMA_X-ühendus lubatud"
+
+#~ msgid "_Help"
+#~ msgstr "A_bi"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Uus mobiiliühendus (CDMA)..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Oled nüüd ühendatud CDMA-võrku."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA võrk."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Uus mobiiliühendus (GSM)..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Oled nüüd ühendatud GSM-võrku."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM võrk."
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX mobiiliühendus (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX mobiiliühendus"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX on keelatud"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX on keelatud riistvaralisest lülitist"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Oled nüüd ühendatud WiMAX-võrku."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "tundmatu"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "tundmatu"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "Teisene DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "Kolmas DNS:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Režiim:"
+
+#~ msgid "Yes"
+#~ msgstr "Jah"
+
+#~ msgid "Only on activation"
+#~ msgstr "Ainult aktiveerumisel"
+
+#~ msgid "No"
+#~ msgstr "Ei"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_Seadme MAC-aadress:"
+
+#~ msgid "Carrier de_tect:"
+#~ msgstr "Operaatori _tuvastus:"
+
+#~ msgid "Any"
+#~ msgstr "Suvaline"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Eelista 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Eelista 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Eelistatakse 4G ühendust (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Kasutatakse ainult 4G ühendust (LTE)"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastruktuur"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "_Save..."
+#~ msgstr "_Salvesta..."
+
+#~ msgid "Error saving connection"
+#~ msgstr "Viga ühenduse salvestamisel"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Omadus '%s' / '%s' pole sobiv: %d"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Muuda..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Kustuta..."
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Automaatne (PPP)"
+
+#~ 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)."
+#~ msgstr ""
+#~ "Bluetoothi seadistamine pole võimalik (ühendumine D-Bus'iga nurjus: (%s) "
+#~ "%s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Bluetoothi seadistamine pole võimalik (tõrge võrguhalduri otsimisel: (%s) "
+#~ "%s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Mobiiltelefoni kasutamine võrguseadmena (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Internetiühendus mobiiltelefoni kaudu (DUN)"
+
+#~ 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!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Mobiiliühenduse nõustaja katkestati"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Tundmatut tüüpi telefoniseade (pole GSM ega CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "tundmatu modemi liik."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "telefoniga ühendumine nurjus."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ühendus katkes ootamatult telefonist."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "telefoni andmete tuvastamine aegus."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Telefoni seadistuse tuvastamine..."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "viga siini ühenduse hankimisel"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Vaikimisi Bluetoothi adapter peab olema enne sissehelistamisühenduse "
+#~ "(dial-up) seadistamist sisse lülitatud."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "PAN-ühenduse loomine nurjus: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s võrk"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Ühtki sertifitseerimiskeskuse sertifikaadifaili pole valitud"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Sertifitseerimiskeskuse (CA) sertifikaadi mittekasutamine võib põhjustada "
+#~ "ühendumise ebaturvalistesse, kuritegelikesse Wi-Fi võrkudesse. Kas sa "
+#~ "valiksid siiski sertifitseerimiskeskuse sertifikaadi?"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "Vali sertifitseerimiskeskuse sertifikaat"
+
+#~ msgid "Don't _warn me again"
+#~ msgstr "Ära enam _hoiata"
+
 #~ msgid "Connect _automatically"
 #~ msgstr "_Automaatne ühendumine"
 
diff --git a/po/eu.po b/po/eu.po
index 4238fe24..2aa1dde9 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2015-01-08 16:35+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -20,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.4\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Sarea"
 
@@ -131,46 +130,90 @@ msgstr ""
 "Ezarri TRUE (egia) gisa EAP autentifikazioaren 2. urratsean ZE ziurtagiriei "
 "buruzko abisuak desgaitzeko."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Sareko kudeatzailea"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Sareko kudeatzailea"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X autentifikazioa"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_Konektatu"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Sarearen izena:"
 
-#: ../src/applet.c:573
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Huts egin du konexioa gehitzean/aktibatzean"
 
-#: ../src/applet.c:575 ../src/applet.c:619 ../src/applet.c:645
-#: ../src/applet-device-wifi.c:1323 ../src/applet-device-wifi.c:1342
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: ../src/applet.c:578 ../src/applet.c:648 ../src/applet-device-wifi.c:1326
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Konexioaren hutsegitea"
 
-#: ../src/applet.c:617
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Huts egin du gailua deskonektatzean"
 
-#: ../src/applet.c:622
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Deskonexioaren hutsegitea"
 
-#: ../src/applet.c:643
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Konexioaren aktibazioak huts egin du"
 
-#: ../src/applet.c:951 ../src/applet-device-wifi.c:1045
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Ez erakutsi mezu hau berriro"
 
-#: ../src/applet.c:1040
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -180,7 +223,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, sareko konexioa eten egin delako."
 
-#: ../src/applet.c:1043
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -189,7 +232,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, VPN zerbitzua ustekabean gelditu delako."
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -200,7 +243,7 @@ msgstr ""
 "'%s' VPN konexioak huts egin du, VPN zerbitzuak konfigurazio baliogabea "
 "itzuli duelako."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -209,7 +252,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, konexio-saiakeren denbora iraungitu delako."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -218,7 +261,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, VPN zerbitzua ez delako garaiz hasi."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -228,7 +271,7 @@ msgstr ""
 "'%s' VPN konexioak huts egin du, VPN zerbitzuak huts egin duelako "
 "abiaraztean."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -237,7 +280,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, ez dagoelako baliozko VPN sekreturik."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -246,7 +289,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du, ez dagoelako baliozko VPN sekreturik."
 
-#: ../src/applet.c:1068
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -255,7 +298,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioak huts egin du."
 
-#: ../src/applet.c:1086
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -265,7 +308,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioa deskonektatu egin da, sareko konexioa eten egin delako."
 
-#: ../src/applet.c:1089
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -274,7 +317,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioa deskonektatu egin da, VPN zerbitzua gelditu egin delako."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -283,7 +326,7 @@ msgstr ""
 "\n"
 "'%s' VPN konexioa deskonektatu egin da."
 
-#: ../src/applet.c:1125
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -294,19 +337,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1127
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPNaren konexioa ongi ezarri da.\n"
 
-#: ../src/applet.c:1129
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN saio-hasierako mezua"
 
-#: ../src/applet.c:1135 ../src/applet.c:1143 ../src/applet.c:1193
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN konexioak huts egin du"
 
-#: ../src/applet.c:1200
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -320,7 +363,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1203
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -333,805 +376,549 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1531
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "gailua ez dago prest (firmwarea falta da)"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "gailua ez dago prest"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1543 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "deskonektatuta"
 
-#: ../src/applet.c:1559
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Deskonektatu"
 
-#: ../src/applet.c:1573
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "gailua ez dago kudeatuta"
 
-#: ../src/applet.c:1733
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Ez dago sareko gailurik erabilgarri"
 
-#: ../src/applet.c:1786
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN konexioak"
 
-#: ../src/applet.c:1843
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Konfiguratu VPN..."
 
-#: ../src/applet.c:1847
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Deskonektatu VPNa"
 
-#: ../src/applet.c:1963
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager ez da exekutatzen ari..."
 
-#: ../src/applet.c:1968 ../src/applet.c:2944
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Sarea desgaituta"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2188
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Gaitu _sarea"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2197
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Gaitu _wifia"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2206
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Gaitu _banda-zabal mugikorra"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2215
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Gaitu _WiMAX banda zabal mugikorra"
-
 #. Toggle notifications item
-#: ../src/applet.c:2226
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Gaitu _jakinarazpenak"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2237
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Konexioaren _informazioa"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2247
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Editatu konexioak..."
 
-#. Help item
-#: ../src/applet.c:2261
-msgid "_Help"
-msgstr "_Laguntza"
-
-#. About item
-#: ../src/applet.c:2270
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "Honi _buruz"
 
-#: ../src/applet.c:2518
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "'%s' sarera konektatuta."
 
-#: ../src/applet.c:2559
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Deskonektatuta"
 
-#: ../src/applet.c:2560
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Sareko konexioa deskonektatu egin da."
 
-#: ../src/applet.c:2799
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "'%s' sareko konexioa prestatzen..."
 
-#: ../src/applet.c:2802
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Erabiltzailearen autentifikazioa behar da '%s' sareko konexiorako..."
 
-#: ../src/applet.c:2805 ../src/applet-device-bt.c:137
-#: ../src/applet-device-wimax.c:446 ../src/mobile-helpers.c:592
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Sareko helbide bat eskatzen '%s' sareari..."
 
-#: ../src/applet.c:2808
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "'%s' sareko konexioa aktiboa"
 
-#: ../src/applet.c:2898
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "'%s' VPN konexioa hasieratzen..."
 
-#: ../src/applet.c:2901
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Erabiltzailearen autentifikazioa behar da '%s' VPN konexiorako..."
 
-#: ../src/applet.c:2904
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Sareko helbide bat eskatzen VPN '%s' sareari..."
 
-#: ../src/applet.c:2907
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "'%s' VPN konexioa aktiboa"
 
-#: ../src/applet.c:2949
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Ez dago sareko konexiorik"
 
-#: ../src/applet.c:3555
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager miniaplikazioa"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:774 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:836 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Erabilgarri"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:801 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1242 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Konektatuta"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Orain lotutako sarera konektatuta zaude."
-
-#: ../src/applet-device-bond.c:115
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "'%s' loturaren konexioa prestatzen..."
-
-#: ../src/applet-device-bond.c:118
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "'%s' loturaren konexioa konfiguratzen..."
-
-#: ../src/applet-device-bond.c:121
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr ""
-"Erabiltzailearen autentifikazioa behar da '%s' loturaren konexiorako..."
-
-#: ../src/applet-device-bond.c:124 ../src/applet-device-bridge.c:124
-#: ../src/applet-device-infiniband.c:177 ../src/applet-device-team.c:120
-#: ../src/applet-device-vlan.c:238
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Helbidea eskatzen '%s'(r)entzako..."
-
-#: ../src/applet-device-bond.c:128
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "'%s' loturaren konexioa aktiboa"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Orain zubiaren sarera konektatuta zaude."
-
-#: ../src/applet-device-bridge.c:115
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "'%s' zubiaren sareko konexioa prestatzen..."
-
-#: ../src/applet-device-bridge.c:118
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "'%s' zubiaren konexioa konfiguratzen..."
-
-#: ../src/applet-device-bridge.c:121
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Erabiltzailearen autentifikazioa behar da '%s' zubiaren konexiorako..."
-
-#: ../src/applet-device-bridge.c:128
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "'%s' zubiaren konexioa aktiboa"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:509
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Okerreko PUK kodea. Jar zaitez hornitzailearekin harremanetan."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:486
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:536
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Desblokeatzeko kodea bidaltzen..."
 
-#: ../src/applet-device-broadband.c:720 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Bandazabal mugikorra (%s)"
 
-#: ../src/applet-device-broadband.c:722 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/connection-helpers.c:125
-#: ../src/connection-editor/page-mobile.c:350
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Bandazabal mugikorra"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Erabilgarri"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:787
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Bandazabal mugikorraren konexio berria..."
 
-#: ../src/applet-device-broadband.c:802
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Konektatuta"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Bandazabal mugikorren sarera konektatuta."
 
-#: ../src/applet-device-broadband.c:937 ../src/applet-device-broadband.c:943
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Bandazabal mugikorreko sarea."
 
-#: ../src/applet-device-broadband.c:938 ../src/applet-device-cdma.c:407
-#: ../src/applet-device-gsm.c:666
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Orain etxeko sarera harpidetuta zaude."
 
-#: ../src/applet-device-broadband.c:944 ../src/applet-device-cdma.c:413
-#: ../src/applet-device-gsm.c:672
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Orain sare ibiltarian harpidetuta zaude."
 
-#: ../src/applet-device-bt.c:103
+#: ../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:128 ../src/applet-device-wimax.c:437
-#: ../src/mobile-helpers.c:583
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "'%s' banda-zabalera mugikorraren konexioa prestatzen..."
 
-#: ../src/applet-device-bt.c:131 ../src/applet-device-wimax.c:440
-#: ../src/mobile-helpers.c:586
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "'%s' banda-zabalera mugikorraren konexioa konfiguratzen..."
 
-#: ../src/applet-device-bt.c:134 ../src/applet-device-wimax.c:443
-#: ../src/mobile-helpers.c:589
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:141 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "'%s' banda-zabal mugikorraren konexioa aktibo dago"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Bandazabal mugikor (CDMA) konexio berria"
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "CDMA sarera konektatuta."
-
-#: ../src/applet-device-cdma.c:406 ../src/applet-device-cdma.c:412
-msgid "CDMA network."
-msgstr "CDMA sarea."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automatikoa"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet sareak (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet sarea (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet sareak"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet sarea"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Ethernet sarera konektatuta."
 
-#: ../src/applet-device-ethernet.c:172
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "'%s' ethernet sarearen konexioa prestatzen..."
 
-#: ../src/applet-device-ethernet.c:175
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "'%s' ethernet sarearen konexioa konfiguratzen..."
 
-#: ../src/applet-device-ethernet.c:178
+#: ../src/applet-device-ethernet.c:167
 #, 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:181
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Ethernet sareko helbide bat eskatzen '%s'(r)entzako ..."
 
-#: ../src/applet-device-ethernet.c:185
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "'%s' ethernet sarearen konexioa aktibo dago"
 
-#: ../src/applet-device-ethernet.c:364
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL autentifikazioa"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Bandazabal mugikorraren  (GSM) konexio berria..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "GSM sarera konektatuta."
-
-#: ../src/applet-device-gsm.c:665 ../src/applet-device-gsm.c:671
-msgid "GSM network."
-msgstr "GSM sarea."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "InfiniBand automatikoa"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand sareak (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand sarea (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "InfiniBand sareak"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "InfiniBand sarea"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Orain InfiniBand sarera konektatuta zaude."
-
-#: ../src/applet-device-infiniband.c:168
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "'%s' InfiniBand konexioa prestatzen..."
-
-#: ../src/applet-device-infiniband.c:171
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "'%s' InfiniBand konexioa konfiguratzen..."
-
-#: ../src/applet-device-infiniband.c:174
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr ""
-"Erabiltzailearen autentifikazioa behar da '%s' InfiniBand konexiorako..."
-
-#: ../src/applet-device-infiniband.c:181
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "'%s' InfiniBand konexioa aktiboa"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Orain taldekatutako sarera konektatuta zaude."
-
-#: ../src/applet-device-team.c:111
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "'%s' talde-konexioa prestatzen..."
-
-#: ../src/applet-device-team.c:114
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "'%s' talde-konexioa konfiguratzen..."
-
-#: ../src/applet-device-team.c:117
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Erabiltzailearen autentifikazioa behar da '%s' talde-konexiorako..."
-
-#: ../src/applet-device-team.c:124
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "'%s' talde-konexioa aktiboa"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Orain VLAN-era konektatuta zaude."
-
-#: ../src/applet-device-vlan.c:229
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "'%s' VLAN konexioa hasieratzen..."
-
-#: ../src/applet-device-vlan.c:232
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "'%s' VLAN konexioa konfiguratzen..."
-
-#: ../src/applet-device-vlan.c:235
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Erabiltzailearen autentifikazioa behar da '%s' VLAN konexiorako..."
-
-#: ../src/applet-device-vlan.c:242
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "'%s' VLAN konexioa aktiboa"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Konektatu ezkutuko wifi sarera..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "_Sortu wifi sare berria..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: ../src/applet-device-wifi.c:768
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wifi sareak (%s)"
 
-#: ../src/applet-device-wifi.c:770
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wifi sarea (%s)"
 
-#: ../src/applet-device-wifi.c:772
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wifi sarea"
 msgstr[1] "Wifi sareak"
 
-#: ../src/applet-device-wifi.c:801
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wifia desgaituta dago"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Hardwarearen aldatzaileak desgaitu du wifia"
 
-#: ../src/applet-device-wifi.c:863
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Sare gehiago"
 
-#: ../src/applet-device-wifi.c:1041
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Wifi sare erabilgarriak"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1181
 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:1241
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "'%s' wifi sarera konektatuta."
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "'%s' wifi sarearen konexioa prestatzen..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "'%s' wifi sarearen konexioa konfiguratzen..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Erabiltzailearen autentifikazioa behar da '%s' wifi sarerako..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, 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:1302
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "'%s' wifi sarearen konexioa aktiboa: %s (%%%d)"
 
-#: ../src/applet-device-wifi.c:1306
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "'%s' wifi sarearen konexioa aktibo dago"
 
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Huts egin du konexioa aktibatzean"
 
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Ezin izan da konexio berria gehitzean"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX banda zabal mugikorra (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX banda zabal mugikorra"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX desgaituta dago"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "Hardwarearen aldatzaileak desgaitu du WiMAX"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "WiMAX sarera konektatuta."
-
-#: ../src/applet-device-wimax.c:455 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "'%s' banda-zabal mugikorraren konexioa aktibo dago: (%% %d%s%s)"
-
-#: ../src/applet-device-wimax.c:458 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "ibiltaritza"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Errorea konexioaren informazioa bistaratzean:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:318
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP dinamikoa"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Helbideak"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:270
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (lehenetsia)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "ezezaguna"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "ezezaguna"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP helbidea:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP helbidea:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Difusio-helbidea:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Azpisare-maskara:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Bide lehenetsia:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Azpisare-maskara:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi-a (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:322
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Orokorra"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interfazea:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Hardwarearen helbidea:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Kontrolatzailea:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Abiadura:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Segurtasuna:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Bide lehenetsia:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ez ikusi eginda"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN mota:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPNren atebidea:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPNren erabiltzaile-izena:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPNren iragarkia:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Oinarrizko konexioa:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:348
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Ezezaguna"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Ez da konexio aktiborik aurkitu."
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1139,43 +926,43 @@ msgstr ""
 "Copyright-a © 2005-2008 Novell, Inc. eta komunitateko beste laguntzaile eta "
 "itzultzaileak"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Jakinarazpen-areako miniaplikazioa sareko gailuak eta konexioak kudeatzeko."
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager-en web gunea"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Baliabideak falta dira"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Bandazabal mugikorreko sarearen pasahitza"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Pasahitza behar da '%s'(e)ra konektatzeko."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIMa desblokeatzeko PIN kodea behar da"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 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:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1184,25 +971,25 @@ msgstr ""
 "'%s' banda-zabaleko gailuak SIMaren PIN kodea behar du erabili ahal izateko."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN kodea:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Erakutsi PIN kodea"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIMa desblokeatzeko PUK kodea behar da"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 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:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1211,27 +998,34 @@ msgstr ""
 "'%s' banda-zabaleko gailuak SIMaren PUK kodea behar du erabili ahal izateko."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK kodea:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "PIN kode berria:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Sartu berriro PIN kode berria:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Erakutsi PIN/PUK kodeak"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1241,18 +1035,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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "E_zabatu"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Ezikusi egin automatikoki lortutako bideei"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1260,9 +1077,8 @@ msgstr ""
 "Gaituta badago, konexio hau ez da inoiz ere erabiliko sareko konexio "
 "lehenetsi gisa."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1270,15 +1086,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Sortu..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1331,48 +1147,41 @@ msgid "Bonded _connections:"
 msgstr "Lotutako _konexioak:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
 msgstr "_Modua:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:697
-msgid "_Edit"
-msgstr "_Editatu"
-
-#. Delete
 #: ../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:713
-msgid "_Delete"
-msgstr "E_zabatu"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Editatu"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Monitorizazioaren _maiztasuna:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "_Interfazearen izena:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "_Konexioaren monitorizazioa:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP _helburuak:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1380,19 +1189,19 @@ msgstr ""
 "IP helbidea , edo komaz bereiztutako IP helbideen zerrenda, konexioaren "
 "egoera egiaztatzean bilatzeko"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Konexioa aktibatzeko _atzerapena:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Konexioa desaktibatzeko _atzerapena:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Nagusia:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1400,12 +1209,30 @@ 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "byte"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "Bidearen _kostua:"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Lehentasuna:"
 
@@ -1417,44 +1244,89 @@ msgstr "_Hairpin modua:"
 msgid "Bridged _connections:"
 msgstr "Zubi _konexioak:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "_Birbidalketaren atzerapena:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Hello denbora:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Gaitu _sarea"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Gaitu _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "G_ehien. adina:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_Adinaren denbora:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatikoa"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "lehenetsia"
 
-#: ../src/connection-editor/ce-page.c:360
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Helbidea"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Helbidea"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Edozein gailu"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Huts egin du konexioaren sekretua eguneratzean errore ezezagun bat dela eta."
@@ -1554,78 +1426,78 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Lehentasunaren fluxu-kontrola"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 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:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Lehentasuna:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Trafikoaren klasea:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Banda-zabalera zorrotza:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Lehentasuneko banda-zabalera:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Taldearen banda-zabalera:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "Taldearen IDa:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 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:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1634,25 +1506,25 @@ 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 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:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 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:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1665,7 +1537,7 @@ 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:4
+#: ../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
@@ -1673,8 +1545,9 @@ msgid "Sho_w password"
 msgstr "Erakutsi _pasahitza"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1686,8 +1559,8 @@ msgstr "_Pasahitza:"
 #: ../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:139
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatikoa"
@@ -1742,18 +1615,18 @@ msgstr "_Auto-negoziatu"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "_Gailuaren MAC helbidea:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Zerbitzua:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "_Klonatutako MAC helbidea:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1763,19 +1636,54 @@ 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-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "byte"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Lehenetsia"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ez ikusi egin"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Igorpena"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Gako pribatuaren pasahitza:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1814,8 +1722,8 @@ msgstr "Automatikoa DNSren eskuzko ezarpenekin"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:171
-#: ../src/connection-editor/page-ip6.c:196
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Eskuz"
 
@@ -1826,8 +1734,8 @@ 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:189
-#: ../src/connection-editor/page-ip6.c:216
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Beste ordenagailuekin partekatua"
 
@@ -1841,7 +1749,7 @@ msgstr "_Metodoa:"
 msgid "Addresses"
 msgstr "Helbideak"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1851,8 +1759,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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1860,25 +1768,25 @@ msgstr ""
 "Ostalari-izenak ebaztean erabiliko den domeinua. Erabili komak hainbat "
 "domeinu bereizteko."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:309
-#: ../src/connection-editor/page-ip6.c:318
+#: ../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
 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:300
-#: ../src/connection-editor/page-ip6.c:309
+#: ../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:"
 msgstr "_DNS zerbitzariak:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1886,11 +1794,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1898,13 +1806,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Bideak..."
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Desgaituta"
 
@@ -1916,7 +1824,7 @@ msgstr "Gaituta (helbide publikoa hobetsita)"
 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.h:17
 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 "
@@ -1926,15 +1834,15 @@ 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
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 _pribatutasunaren hedapenak:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1943,71 +1851,38 @@ msgstr ""
 "konfigurazioak huts egiten badu baina IPv4 konfigurazioa ongi lantzen denean."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Edozer"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Hobetsi 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Hobetsi 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Hobetsi 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Erabili 4G soilik (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "_Zenbakia:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "_Sareko IDa:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Mota:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Aldatu..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "_PINa:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "Erakutsi _pasahitzak"
 
@@ -2073,32 +1948,55 @@ msgid "_Teamed connections:"
 msgstr "_Taldearen konexioak:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "I_nportatu taldearen konfigurazioa fitxategitik..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Inportatu taldearen konfigurazioa fitxategitik..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "Interfaze _gurasoa:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN interfazearen _izena:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Klonatutako MAC helbidea:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLANaren _IDa:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Gailuaren izena + zenbakia"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + zenbakia"
 
@@ -2115,94 +2013,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Azpiegitura"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Transmisio-indarra:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Tasa:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Kanala:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_Banda:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "_Modua:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Baimendutako autentifikazio metodoak"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Autentifikazio protokolo hedagarria"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Pasahitzaren autentifikazioa protokoloa"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "_CHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication protokoloa"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft-en Challenge Handshake Authentication protokoloa"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2211,78 +2113,78 @@ msgstr ""
 "guztiak onartzen dituzte. Konexioak huts egiten badu, saiatu metodo "
 "batzuentzako euskarria desgaituz."
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-ethernet.c:240
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:123
-#: ../src/connection-editor/page-wifi.c:464 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wifia"
 
-#: ../src/connection-editor/connection-helpers.c:131
-#: ../src/connection-editor/page-wimax.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:332 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:132
-#: ../src/connection-editor/page-dsl.c:135
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:133
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:336
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:134
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Bond"
 msgstr "Lotu"
 
-#: ../src/connection-editor/connection-helpers.c:135
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:340
-#: ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Team"
 msgstr "Taldea"
 
-#: ../src/connection-editor/connection-helpers.c:136
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:342 ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../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
 msgid "Bridge"
 msgstr "Zubia"
 
-#: ../src/connection-editor/connection-helpers.c:137
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:344
-#: ../src/libnm-gtk/nm-ui-utils.c:588
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:146
-#: ../src/connection-editor/connection-helpers.c:286
-#: ../src/connection-editor/page-vpn.c:112
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:232
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Hardwarea"
 
-#: ../src/connection-editor/connection-helpers.c:256
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Birtuala"
 
-#: ../src/connection-editor/connection-helpers.c:324
-#: ../src/connection-editor/connection-helpers.c:326
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Inportatu gordetako VPNaren konfigurazioa..."
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2290,58 +2192,79 @@ msgstr ""
 "Ezin izan da konexioaren editorearen elkarrizketa-koadroa hasieratu errore "
 "ezezagun bat gertatu delako."
 
-#: ../src/connection-editor/connection-helpers.c:364
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Ezin izan da konexio berria sortu"
 
-#: ../src/connection-editor/connection-helpers.c:499
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Huts egin du konexioa ezabatzean"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:925
-#: ../src/connection-editor/page-ip6.c:921
+#: ../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
 msgid "Address"
 msgstr "Helbidea"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:942
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Sare-maskara"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:959
-#: ../src/connection-editor/page-ip6.c:955
+#: ../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
 msgid "Gateway"
 msgstr "Atebidea"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrika"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:938
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Aurrizkia"
 
-#: ../src/connection-editor/nm-connection-editor.c:124
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "%s editatzen"
 
-#: ../src/connection-editor/nm-connection-editor.c:128
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Izenik gabeko konexioa editatzea"
 
-#: ../src/connection-editor/nm-connection-editor.c:288
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Konexioaren _izena:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Errorea editorea hasieratzean"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Konexioa gehitzean huts egin du"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2375,158 +2298,186 @@ msgid "Unknown error creating connection editor dialog."
 msgstr ""
 "Errore ezezaguna konexioaren editorearen elkarrizketa-koadroa sortzean."
 
-#: ../src/connection-editor/nm-connection-editor.c:573
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Errorea editorea hasieratzean"
 
-#: ../src/connection-editor/nm-connection-editor.c:912
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Konexioa gehitzean huts egin du"
 
-#: ../src/connection-editor/nm-connection-editor.c:952
-msgid "Error saving connection"
-msgstr "Errorea konexioaren gordetzean"
-
-#: ../src/connection-editor/nm-connection-editor.c:953
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "'%s' / '%s' propietatea baliogabea da: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "Konexioaren _izena:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "E_sportatu..."
 
-#: ../src/connection-editor/nm-connection-list.c:145
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "inoiz ez"
 
-#: ../src/connection-editor/nm-connection-list.c:156
-#: ../src/connection-editor/nm-connection-list.c:167
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "orain"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:178
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:190
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:196
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:200
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:641
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/connection-editor/nm-connection-list.c:654
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Erabilitako azkena"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Editatu hautatutako konexioa"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentifikatu hautatutako konexioa editatzeko"
 
-#: ../src/connection-editor/nm-connection-list.c:714
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Ezabatu hautatutako konexioa"
 
-#: ../src/connection-editor/nm-connection-list.c:715
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentifikatu hautatutako konexioa ezabatzeko"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Ez dago VPN pluginik instalatuta."
 
-#: ../src/connection-editor/nm-connection-list.c:952
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:954
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Errorea konexioa sortzean."
 
-#: ../src/connection-editor/nm-connection-list.c:1010
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Errorea konexioa editatzean"
 
-#: ../src/connection-editor/nm-connection-list.c:1011
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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:119
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x segurtasuna"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:111
 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:135
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Erabili 802.1_X segurtasuna konexio honetan"
 
-#: ../src/connection-editor/page-bluetooth.c:108
-#: ../src/libnm-gtk/nm-ui-utils.c:328
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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:110
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Ezin izan da Bluetoohth erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "ezin izan da Bluetooth gailua aurkitu."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Loturen %d konexio"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Ethernet sarea"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Wifi sarea"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Ezin izan da loturaren interfazea kargatu."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Nagusia:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Loturen %d konexio"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Ezin izan da zubiaren erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Zubien %d konexio"
@@ -2534,58 +2485,74 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Zubiaren ataka"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Ezin izan da zubiaren atakaren erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-dcb.c:605
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:607
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Ezin izan da DCB erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Ezin izan da DSLrentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-dsl.c:229
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSLen %d konexio"
 
-#: ../src/connection-editor/page-ethernet.c:79
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:94
-#: ../src/connection-editor/page-wimax.c:59
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "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:242
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Ezin izan da ethernet erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-ethernet.c:385
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Klonatutako MAC helbidea:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:56
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2595,116 +2562,168 @@ msgstr ""
 "arrunt bat, hau hautatzean suebakian ezarritako zona lehenetsia erabiltzea "
 "dakar. Soilik erabilgarria 'firewalld' aktibo dagoenean."
 
-#: ../src/connection-editor/page-general.c:58
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD ez da exekutatzen ari."
 
-#: ../src/connection-editor/page-general.c:325
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Ezin izan da erabiltzailearen interfaze nagusia kargatu."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Ezin izan da InfiniBand-en erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBanden %d konexio"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatikoa (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Helbide automatikoak soilik (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automatikoa, helbideak soilik"
 
-#: ../src/connection-editor/page-ip4.c:142
-#: ../src/connection-editor/page-ip6.c:144
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatikoa (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143
-#: ../src/connection-editor/page-ip6.c:145
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Helbide automatikoak soilik (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:145
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatikoa (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:146
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Helbide automatikoak soilik (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:209
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Esteka lokalak soilik"
 
-#: ../src/connection-editor/page-ip4.c:298
-#: ../src/connection-editor/page-ip6.c:307
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "DNS _zerbitzari gehigarriak:"
 
-#: ../src/connection-editor/page-ip4.c:307
-#: ../src/connection-editor/page-ip6.c:316
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "_Bilaketako domeinu gehigarriak:"
 
-#: ../src/connection-editor/page-ip4.c:857
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "'%s'(r)en IPv4 bideak editatzea"
 
-#: ../src/connection-editor/page-ip4.c:1009
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 ezarpenak"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Ezin izan da IPv4rentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-ip6.c:160
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ez ikusi egin"
 
-#: ../src/connection-editor/page-ip6.c:184
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatikoa (DHCP soilik)"
 
-#: ../src/connection-editor/page-ip6.c:853
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "'%s'(r)en IPv6 bideak editatzea"
 
-#: ../src/connection-editor/page-ip6.c:1004
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 ezarpenak"
 
-#: ../src/connection-editor/page-ip6.c:1006
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Ezin izan da IPv6rentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Bikoiztu morroiak"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, 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:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2713,26 +2732,26 @@ msgstr ""
 "'%s' eta '%s' morroiak gailu fisiko berdineko ataka birtual desberdinei "
 "aplikatuko zaizkie ('%s' eta '%s')."
 
-#: ../src/connection-editor/page-master.c:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s(r)en %d. morroia"
 
-#: ../src/connection-editor/page-mobile.c:352
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Ezin izan da banda-zabal mugikorrentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-mobile.c:369
+#: ../src/connection-editor/page-mobile.c:327
 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:615
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Hautatu banda-zabal mugikorraren hornitzaile mota"
 
-#: ../src/connection-editor/page-mobile.c:642
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2740,87 +2759,87 @@ msgstr ""
 "Hautatu banda-zabal mugikorraren hornitzaileak erabiltzen duen teknologia. "
 "Ez bazaude ziur, galdetu hornitzaileari."
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Hornitzaileak _GSMen oinarritutako teknologia darabil (adib. GPRS, EDGE, "
 "UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:654
+#: ../src/connection-editor/page-mobile.c:568
 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:664 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:667 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:136
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:143
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "bat ere ez"
 
-#: ../src/connection-editor/page-ppp.c:203
+#: ../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:286
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP ezarpenak"
 
-#: ../src/connection-editor/page-ppp.c:288
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Ezin izan da PPPrentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Hautatu fitxategia inportatzeko"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Errorea: fitxategiak ez dauka baliozko JSON konfigurazioa"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Ezin izan da taldearen UIa kargatu."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "%d talde-konexioa"
@@ -2828,47 +2847,56 @@ 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:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Taldearen ataka"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s ('%s' bidez)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Ez dago sareko konexiorik"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Ezin izan da VLANarentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLANen %d konexio"
 
-#: ../src/connection-editor/page-vpn.c:114
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Ezin izan da VPNren interfazea kargatu."
 
-#: ../src/connection-editor/page-vpn.c:129
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Ezin izan da VPN pluginaren zerbitzurik aurkitu '%s'(r)entzako."
 
-#: ../src/connection-editor/page-vpn.c:216
-#: ../src/connection-editor/page-vpn.c:313
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPNen %d konexio"
 
-#: ../src/connection-editor/page-vpn.c:242
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2878,11 +2906,11 @@ msgstr ""
 "\n"
 "Errorea: ez da VPN zerbitzu mota."
 
-#: ../src/connection-editor/page-vpn.c:267
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Aukeratu VPN konexio mota"
 
-#: ../src/connection-editor/page-vpn.c:268
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2892,7 +2920,7 @@ msgstr ""
 "VPN konexio mota ez bada zerrendan agertzen baliteke VPN plugina ongi "
 "instalatuta ez egotea."
 
-#: ../src/connection-editor/page-wifi.c:84
+#: ../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"
@@ -2900,74 +2928,94 @@ 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:200
+#: ../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)\""
+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
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:466
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Ezin izan da WiFiarentzako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-wifi.c:637
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Edozein gailu"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wifien %d konexio"
 
-#: ../src/connection-editor/page-wifi-security.c:295
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:305
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:331
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "WEP dinamikoa (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:345
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA eta WPA2 pertsonala"
 
-#: ../src/connection-editor/page-wifi-security.c:359
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA eta WPA2 enpresa"
 
-#: ../src/connection-editor/page-wifi-security.c:400
+#: ../src/connection-editor/page-wifi-security.c:413
 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:411
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Wifiaren segurtasuna"
 
-#: ../src/connection-editor/page-wifi-security.c:413
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "Ezin izan da wifiaren segurtasunerako erabiltzailearen interfazea kargatu."
 
-#: ../src/connection-editor/page-wimax.c:126
-msgid "Could not load WiMAX user interface."
-msgstr "Ezin izan da WiMAXarentzako erabiltzailearen interfazea kargatu."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:222
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAXen %d konexio"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Ezin da VPN konexioa inportatu"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2980,25 +3028,30 @@ msgstr ""
 "\n"
 "Errorea: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Errore ezezaguna"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" izeneko fitxategia badago lehendik ere."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Ordeztu"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Ezin da VPN konexioa esportatu"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3009,11 +3062,11 @@ msgstr ""
 "\n"
 "Errorea: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Esportatu VPN konexioa..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -3021,96 +3074,11 @@ msgstr ""
 "NetworkManager miniaplikazioak ezin izan du behar diren baliabide batzuk "
 "aurkitu (.ui fitxategia ez da aurkitu)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Ezin da Bluetooth konfiguratu (huts egin du 'D-Bus'-ekin konektatzean: (%s) "
-"%s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Ezin da Bluetooth konfiguratu (errorea NetworkManager bilatzean: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Erabili mugikorra sareko gailu gisa (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Sarbidetu internetera telefono mugikorra erabiliz (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Errorea: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Huts egin du DUN konexioa sortzean: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:952
-msgid "Your phone is now ready to use!"
-msgstr "Telefonoa prest dago erabiltzeko."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Mugikorraren morroia bertan behera utzi da"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Telefono gailu mota ezezaguna (ez da GSM ez CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:721
-#: ../src/gnome-bluetooth/nma-bt-device.c:727
-msgid "failed to connect to the phone."
-msgstr "huts egin du telefonoarekin konektatzean."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:740
-msgid "error getting bus connection"
-msgstr "errorea bus-aren konexioa lortzean"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
-msgid "unexpectedly disconnected from the phone."
-msgstr "ustekabeki deskonektatua da telefonotik."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:804
-msgid "timed out detecting phone details."
-msgstr "denbora-muga iraungituta telefonoaren xehetasunak detektatzean."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:815
-msgid "Detecting phone configuration..."
-msgstr "Telefonoaren konfigurazioa detektatzen..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:913
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Bluetooth moldagailu lehenetsia gaitu behar da sareko deia konexioa "
-"konfiguratu aurretik."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:950
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Huts egin du PAN konexioa sortzean: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:971
-#, c-format
-msgid "%s Network"
-msgstr "%s sarea"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Desblokeatu"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Desblokeatu automatikoki gailu hau"
 
@@ -3118,31 +3086,36 @@ msgstr "Desblokeatu automatikoki gailu hau"
 msgid "Connection Information"
 msgstr "Konexioaren informazioa"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Aktibatu sareko konexioak"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Gailua:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Hornitzailea:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Plana:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3156,23 +3129,28 @@ msgstr ""
 "konexioaren ezarpenak aldatzeko, aukeratu Sistema >> Hobespenak menuko "
 "\"Sareko konexioak\" elementua."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Zerrendatu gabea"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Hautatu zure plana:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3185,67 +3163,83 @@ msgstr ""
 "Ez bazaude ziur planari buruz, galdetu ezaiozu hornitzaileari planaren "
 "APLari buruz."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Nire plana ez dago zerrendatuta..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Hornitzailea"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Ezin dut hornitzailea aurkitu eta _eskuz sartzea nahiko nuke:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Hornitzailea:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Aukeratu hornitzailea"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Herrialde edo eskualdea"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Aukeratu hornitzailearen herrialde edo eskualdea"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Instalatutako GSM gailua"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Instalatutako CDMA gailua"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3253,119 +3247,142 @@ msgstr ""
 "Morroi honek banda-zabal mugikorraren konexioa mugikorren sarera (3G) "
 "konfiguratzen lagunduko dizu."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Honako informazioa beharko duzu:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Bandazabalaren hornitzailearen izena"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Bandazabaleko prezioen planaren izena"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 "(zenbait kasutan) banda-zabalaren APN prezioen plana"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Sortu konexio bat banda-zabal mugikor gailu _honentzako:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Edozein gailu"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Konfiguratu banda-zabal mugikorraren konexioa"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Bandazabal mugikorraren konexio berria"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:374
-msgid "Wired"
-msgstr "Hariduna"
+#: ../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/libnm-gtk/nm-ui-utils.c:330
-msgid "OLPC Mesh"
-msgstr "OLPC maila"
+#: ../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/libnm-gtk/nm-ui-utils.c:346
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:409
-msgid "PCI"
-msgstr "PCI"
+#: ../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/libnm-gtk/nm-ui-utils.c:411
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Bigarren pasahitza:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:487 ../src/libnm-gtk/nm-ui-utils.c:507
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "[%s] %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary 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-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Deskonektatu"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Berria..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Sortu"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, 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/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wifi sarearen autentifikazioa beharrezkoa"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wifi sareak autentifikazioa eskatzen du"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Sortu wifi sare berria"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Wifi sare berria"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Sartu wifi sarearen izena sortzeko."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Konektatu ezkutuko wifi sarera"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Ezkutuko wifi sarea"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3373,31 +3390,55 @@ msgstr ""
 "Sartu konektatzea nahi duzun ezkutuko wifi sarearen izena eta segurtasuneko "
 "xehetasunak."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Bigarren pasahitza:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "Erakutsi _pasahitzak"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_Wifiaren segurtasuna:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "_Konexioa:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Wifiaren _moldagailua:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC maila"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "[%s] %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Erabilera:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3405,7 +3446,7 @@ msgstr ""
 "Programa hau NetworkManager-ren osagai bat da (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3413,138 +3454,151 @@ msgstr ""
 "Ez du komando-lerroan elkarreragiteko helbururik, baizik eta GNOME "
 "mahaigaineko ingurunean exekutatzea da bere helburua."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ez dago gaituta"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "erregistratu gabe"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Etxeko sarea (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Etxeko sarea"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "bilatzen"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "erregistratzea ukatuta"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Ibiltaritza sarea (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Ibiltaritza sarea"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "'%s' SIM txartelaren PIN kodea '%s'(e)n"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN kodea behar da"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN kodea behar da banda-zabal mugikorreko gailuarentzako"
 
+#: ../src/mobile-helpers.c:619
+#, 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:622
+msgid "roaming"
+msgstr "ibiltaritza"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s konexioa"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Gorde pasahitza soilik erabiltzaile _honentzako"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "Gorde pasahitza erabiltzaile _guztientzako"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER edo PEM ziurtagiriak (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Aukeratu PAC fitxategia..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC fitxategiak (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
@@ -3580,15 +3634,32 @@ msgstr "_Barneko autentifikazioa:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Baimendu PAC automatikoa _aldi baterako"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Aukeratu Ziurtagiri-Emailearen ziurtagiria..."
 
@@ -3616,15 +3687,46 @@ msgstr "Ez da ZE ziurtagiririk _behar"
 msgid "PEAP _version:"
 msgstr "PEAP _bertsioa:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Eskatu pasahitz hau aldiro"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "_ZE ziurtagiria:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Enkriptatu gabeko gako pribatuak ez dira seguruak"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3638,11 +3740,11 @@ msgstr ""
 "\n"
 "(Zure gako pribatua pasahitz batekin babes dezakezu openssl-rekin)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Aukeratu ziurtagiri pertsonala..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Aukeratu gako pribatua..."
 
@@ -3662,23 +3764,36 @@ msgstr "_Gako pribatua:"
 msgid "_Private key password:"
 msgstr "_Gako pribatuaren pasahitza:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "Bizkorra"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tuneldun TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Babestutako EAP (PEAP)"
 
@@ -3688,6 +3803,44 @@ msgstr "Babestutako EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Autentifikazioa:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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)"
@@ -3712,6 +3865,286 @@ msgstr "E_rakutsi gakoa"
 msgid "WEP inde_x:"
 msgstr "WEP _indizea:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Mota:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Gaitu _WiMAX banda zabal mugikorra"
+
+#~ msgid "_Help"
+#~ msgstr "_Laguntza"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Orain lotutako sarera konektatuta zaude."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "'%s' loturaren konexioa prestatzen..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "'%s' loturaren konexioa konfiguratzen..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr ""
+#~ "Erabiltzailearen autentifikazioa behar da '%s' loturaren konexiorako..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Helbidea eskatzen '%s'(r)entzako..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "'%s' loturaren konexioa aktiboa"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Orain zubiaren sarera konektatuta zaude."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "'%s' zubiaren sareko konexioa prestatzen..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "'%s' zubiaren konexioa konfiguratzen..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr ""
+#~ "Erabiltzailearen autentifikazioa behar da '%s' zubiaren konexiorako..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "'%s' zubiaren konexioa aktiboa"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Bandazabal mugikor (CDMA) konexio berria"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "CDMA sarera konektatuta."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA sarea."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Bandazabal mugikorraren  (GSM) konexio berria..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "GSM sarera konektatuta."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM sarea."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "InfiniBand automatikoa"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand sareak (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand sarea (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand sareak"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand sarea"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Orain InfiniBand sarera konektatuta zaude."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "'%s' InfiniBand konexioa prestatzen..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "'%s' InfiniBand konexioa konfiguratzen..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr ""
+#~ "Erabiltzailearen autentifikazioa behar da '%s' InfiniBand konexiorako..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "'%s' InfiniBand konexioa aktiboa"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Orain taldekatutako sarera konektatuta zaude."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "'%s' talde-konexioa prestatzen..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "'%s' talde-konexioa konfiguratzen..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Erabiltzailearen autentifikazioa behar da '%s' talde-konexiorako..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "'%s' talde-konexioa aktiboa"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Orain VLAN-era konektatuta zaude."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "'%s' VLAN konexioa hasieratzen..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "'%s' VLAN konexioa konfiguratzen..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Erabiltzailearen autentifikazioa behar da '%s' VLAN konexiorako..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "'%s' VLAN konexioa aktiboa"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX banda zabal mugikorra (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX banda zabal mugikorra"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX desgaituta dago"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "Hardwarearen aldatzaileak desgaitu du WiMAX"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "WiMAX sarera konektatuta."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "ezezaguna"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "ezezaguna"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Modua:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_Gailuaren MAC helbidea:"
+
+#~ msgid "Any"
+#~ msgstr "Edozer"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Hobetsi 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Hobetsi 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Hobetsi 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Erabili 4G soilik (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "I_nportatu taldearen konfigurazioa fitxategitik..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "Azpiegitura"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Errorea konexioaren gordetzean"
+
+#~ 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)."
+#~ msgstr ""
+#~ "Ezin da Bluetooth konfiguratu (huts egin du 'D-Bus'-ekin konektatzean: "
+#~ "(%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Ezin da Bluetooth konfiguratu (errorea NetworkManager bilatzean: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Erabili mugikorra sareko gailu gisa (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Sarbidetu internetera telefono mugikorra erabiliz (DUN)"
+
+#~ 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."
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Mugikorraren morroia bertan behera utzi da"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Telefono gailu mota ezezaguna (ez da GSM ez CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "huts egin du telefonoarekin konektatzean."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "errorea bus-aren konexioa lortzean"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ustekabeki deskonektatua da telefonotik."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "denbora-muga iraungituta telefonoaren xehetasunak detektatzean."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Telefonoaren konfigurazioa detektatzen..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Bluetooth moldagailu lehenetsia gaitu behar da sareko deia konexioa "
+#~ "konfiguratu aurretik."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Huts egin du PAN konexioa sortzean: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s sarea"
+
 #~ msgid "Secondary DNS:"
 #~ msgstr "Bigarren mailako DNSa:"
 
@@ -3827,9 +4260,6 @@ msgstr "WEP _indizea:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "Ez daki nola editatu '%s' konexioak"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "ezin izan da Bluetooth gailua aurkitu."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr ""
 #~ "Ezin da Bluetooth konfiguratu (huts egin du 'D-Bus'-aren proxya sortzean)."
@@ -3855,9 +4285,6 @@ msgstr "WEP _indizea:"
 #~ msgid "United Kingdom"
 #~ msgstr "Erresuma Batua"
 
-#~ msgid "Network Manager"
-#~ msgstr "Sareko kudeatzailea"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "'nm-applet'-en instantzia bat jadanik exekutatzen ari da.\n"
 
diff --git a/po/fa.po b/po/fa.po
index 24d53d74..fdc06fa0 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2012-08-20 16:42+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -21,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=1;\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "شبکه"
 
@@ -43,8 +42,6 @@ msgid "Disable connected notifications"
 msgstr "غیرفعال‌سازی اعلان‌های برقراری ارتباط"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
-#| msgid ""
-#| "Set this to TRUE to disable notifications when connecting to a network."
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "برای غیرفعال‌سازی اعلان‌ها هنگام ارتباط با یک شبکه این قسمت را True تنظیم کنید."
@@ -54,9 +51,6 @@ msgid "Disable disconnected notifications"
 msgstr "غیرفعال‌سازی اعلان‌های قطع ارتباط"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
@@ -64,14 +58,10 @@ msgstr ""
 "کنید."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
-#| msgid "Disable connected notifications"
 msgid "Disable VPN notifications"
 msgstr "غیرفعال‌سازی اعلان‌های وی‌پی‌ان"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:6
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -84,12 +74,9 @@ msgid "Suppress networks available notifications"
 msgstr "متوقف کردن اعلان‌های موجود شبکه‌ها"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
-#| msgid ""
-#| "Set this to TRUE to disable notifications when wireless networks are "
-#| "available."
+#, fuzzy
 msgid ""
-"Set this to true to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "برای غیرفعال‌سازی اعلان‌ها در زمانی که شبکه‌های بی‌سیم در دسترس هستند این قسمت "
 "را True تنظیم کنید."
@@ -109,8 +96,6 @@ msgid "Disable WiFi Create"
 msgstr "غیرفعال‌سازی ساخت وای‌فای"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
-#| msgid ""
-#| "Set to TRUE to disable creation of adhoc networks when using the applet."
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
@@ -118,11 +103,18 @@ msgstr ""
 "را انتخاب کنید."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
-#| msgid "Choose CA Certificate"
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "نادیده گرفتن گواهینامه‌ی CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
@@ -130,7 +122,7 @@ msgstr ""
 "برای غیرفعال کردن هشدارهای مربوط به گواهینامه‌های CA در تصدیق‌هویت EAP برروی "
 "true تنظیم کنید."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -138,612 +130,810 @@ msgstr ""
 "برای غیرفعال کردن هشدارهای مربوط به گواهینامه‌های CA در تصدیق‌هویت فاز ۲ از "
 "EAP برروی true تنظیم کنید."
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:396
-#: ../src/applet-device-gsm.c:444 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "در دسترس"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "برنامک مدیریت شبکه"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "برنامک مدیریت شبکه"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_اتصال"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "نام _شبکه:"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "ادهاک"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+msgid "Failed to add/activate connection"
+msgstr "اضافه/فعال کردن اتصال شکست خورد"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr "خطا ناشناس"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+msgid "Connection failure"
+msgstr "اتصال شکست خورد"
+
+#: ../src/applet.c:399
+msgid "Device disconnect failed"
+msgstr "قطع ارتباط دستگاه شکست خورد"
+
+#: ../src/applet.c:404
+msgid "Disconnect failure"
+msgstr "شکست قطع ارتباط"
+
+#: ../src/applet.c:434
+msgid "Connection activation failed"
+msgstr "فعال‌سازی اتصال شکست خورد"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "این پیغام را دیگر نمایش نده"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:438
-#: ../src/applet-device-gsm.c:486 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "هم‌اکنون شما به «%s» متصل شده‌اید."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون اتصال شبکه قطع شده است."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:442
-#: ../src/applet-device-gsm.c:490 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "اتصال برقرار شد"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"اتصال شبکه خصوصی مجازی «%s» شکست خورد، چون سرویس شبکه خصوصی مجازی به طور غیر "
+"منتظره متوقف شد."
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "شما در حال حاضر به شبکه پهن‌باند تلفن همراه متصل شده‌اید."
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون سرویس شبکه خصوصی مجازی تنظیمات "
+"اشتباهی برگردانده است."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:478
-#: ../src/applet-device-gsm.c:526 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "آماده‌سازی اتصال پهن‌باند تلفن همراه «%s»..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون زمان تلاش برای برقراری ارتباط "
+"به پایان رسیده است."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "پیکربندی اتصال پهن‌باند تلفن همراه «%s»..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون سرویس شبکه خصوصی مجازی به موقع "
+"اجرا نشد."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "تأیید هویت مورد نیاز برای اتصال موبایل پهن‌باند «%s»..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون اجرا سرویس شبکه خصوصی مجازی "
+"شکست خورد."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2500
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "درخواست یک آدرس شبکه برای «%s»..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون رمز درستی وجود ندارد."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:505
-#: ../src/applet-device-gsm.c:553
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "ارتباط شبکه پهن‌باند موبایل «%s» فعال شد"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون رمز استباه است."
 
-#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"اتصال شبکه خصوصی مجازی «%s» شکست خورد."
 
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
-#: ../src/applet-dialogs.c:424
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "شبکه پهن‌باند تلفن همراه (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"اتصال به شبکه وی‌پی‌ان «%s» شکست خورد، چون اتصال شبکه قطع شده است."
 
-#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1510
-msgid "Mobile Broadband"
-msgstr "پهن‌باند تلفن همراه"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"اتصال شبکه مجازی خصوصی «%s» بدلیل توقف سرویس شبکه مجازی خصوصی، قطع شد."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:409
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "ارتباط پهن‌باند تلفن همراه (CDMA) جدید..."
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"اتصال شبکه خصوصی مجازی «%s» شکست خورد."
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"اتصال وی‌پی‌ان موفقیت‌آمیز بود.\n"
+"\n"
+"%s\n"
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr "اتصال وی‌پی‌ان موفقیت‌آمیز بود.\n"
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "پیام ورودی به شبکه مجازی خصوصی"
 
-#: ../src/applet-device-cdma.c:443
-msgid "You are now connected to the CDMA network."
-msgstr "اکنون شما به شبکه CDMA متصل شده‌اید."
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "اتصال شبکه خصوصی مجازی شکست خورد"
 
-#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:990
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "ارتباط پهن‌باند «%s» فعال شد: (٪%Id%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"اتصال شبکه مجازی خصوصی «%s» شکست خورد، بدلیل اینکه اجرا سرویس شبکه مجازی "
+"خصوصی شکست خورد.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "رومینگ"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"اتصال وی‌پی‌ان «%s» شکست خورد.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
-msgid "CDMA network."
-msgstr "شبکه CDMA."
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "دستگاه آماده نیست (میان‌افراز وجود ندارد)"
 
-#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
-msgid "You are now registered on the home network."
-msgstr "شما هم‌اکنون در شبکه خانگی ثبت شده‌اید."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "دستگاه آماده نیست"
 
-#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
-msgid "You are now registered on a roaming network."
-msgstr "شما هم‌اکنون در شبکه رومینگ ثبت شده‌اید"
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "قطع شد"
 
-#: ../src/applet-device-gsm.c:211 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "جی‌اس‌ام"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "ارتباط قطع شده"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:457
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "ارتباط پهن‌باند تلفن همراه (جی‌اس‌ام) جدید..."
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "دستگاه مدیریت نشده"
 
-#: ../src/applet-device-gsm.c:491
-msgid "You are now connected to the GSM network."
-msgstr "اکنون شما به شبکه GSM متصل شده‌اید."
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "هیچ دستگاه شبکه‌ای موجود نیست"
 
-#: ../src/applet-device-gsm.c:652
-msgid "PIN code required"
-msgstr "پین کد مورد نیاز است"
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "اتصال‌های شبکه‌های اختصاصی _مجازی (VPN)"
 
-#: ../src/applet-device-gsm.c:660
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "برای دستگاه پهن‌باند شبکه تلفن همراه به پین کد نیاز است"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "_پیکربندی شبکه خصوصی مجازی"
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "_قطع ارتباط شبکه خصوصی مجازی"
 
-#: ../src/applet-device-gsm.c:781
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "مدیر شبکه در حال اجرا نیست..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "شبکه غیر فعال شد"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "فعال‌سازی _شبکه"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "فعال‌سازی _بی‌سیم"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "فعال‌سازی پهن‌باند تلفن _همراه"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "فعال سازی ا_علان‌ها"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "_اطلاعات اتصال"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "ویرایش ارتباط‌ها..."
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_درباره"
+
+#: ../src/applet.c:2179
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "کد PIN برای SIM کارت «%s» بر روی «%s»"
+msgid "You are now connected to '%s'."
+msgstr "هم‌اکنون شما به «%s» متصل شده‌اید."
 
-#: ../src/applet-device-gsm.c:873
-msgid "Wrong PIN code; please contact your provider."
-msgstr "پین‌کد اشتباه است؛ لطفا با ارائه‌دهنده خود تماس بگیرید."
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "ارتباط قطع شد"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "اتصال شبکه قطع شده است."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "آماده‌سازی ارتباط شبکه «%s»..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "تصدیق هویت کاربر جهت اتصال به «%s» مورد نیاز است..."
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "درخواست یک آدرس شبکه برای «%s»..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "ارتباط شبکه «%s» فعال شد"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "درحال شروع ارتباط شبکه خصوصی مجازی «%s»..."
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "برای ارتباط شبکه خصوصی مجازی «%s» به تصدیق هویت نیاز است..."
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "درحال درخواست یک آدرس شبکه اختصاصی شخصی برای «%s»..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "ارتباط شبکه خصوصی مجازی «%s» فعال شد"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "هیچ اتصال شبکه وجود ندارد"
 
-#: ../src/applet-device-gsm.c:896
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "برنامک مدیریت شبکه"
+
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "کد PUK اشتباه است؛ لطفا با ارائه‌دهنده خود تماس بگیرید."
 
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "پین‌کد اشتباه است؛ لطفا با ارائه‌دهنده خود تماس بگیرید."
+
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:923
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "درحال ارسال کد باز کردن قفل..."
 
-#: ../src/applet-device-gsm.c:986
-msgid "SIM PIN unlock required"
-msgstr "پین SIM به بازکردن قفل نیاز دارد"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "شبکه پهن‌باند تلفن همراه (%s)"
 
-#: ../src/applet-device-gsm.c:987
-msgid "SIM PIN Unlock Required"
-msgstr "پین SIM به بازکردن قفل نیاز دارد"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "پهن‌باند تلفن همراه"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:989
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"دستگاه پهن‌باند تلفن همراه «%s» پیش از اینکه بتواند مورد استفاده قرار گیرد، "
-"به کد پین SIM نیاز دارد."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "در دسترس"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:991
-msgid "PIN code:"
-msgstr "کد پین:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "اتصال جدید شبکه تلفن همراه پهن‌باند"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:995
-msgid "Show PIN code"
-msgstr "نمایش کد پین"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "اتصال برقرار شد"
 
-#: ../src/applet-device-gsm.c:998
-msgid "SIM PUK unlock required"
-msgstr "به بازکردن قفل SIM PUK نیاز است"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "شما در حال حاضر به شبکه پهن‌باند تلفن همراه متصل شده‌اید."
 
-#: ../src/applet-device-gsm.c:999
-msgid "SIM PUK Unlock Required"
-msgstr "به بازکردن قفل SIM PUK نیاز است"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "کلمه عبور شبکه پهن‌باند تلفن همراه"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1001
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"دستگاه پهن‌باند تلفن همراه «%s» قبل از این که بتواند مورد استفاده قرار گیرد "
-"به کد SIM PUK نیاز دارد."
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "شما هم‌اکنون در شبکه خانگی ثبت شده‌اید."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1003
-msgid "PUK code:"
-msgstr "کد PUK:"
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "شما هم‌اکنون در شبکه رومینگ ثبت شده‌اید"
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1006
-msgid "New PIN code:"
-msgstr "کد پین جدید:"
+#: ../src/applet-device-bt.c:88
+msgid "You are now connected to the mobile broadband network."
+msgstr "شما در حال حاضر به شبکه پهن‌باند تلفن همراه متصل شده‌اید."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "Re-enter new PIN code:"
-msgstr "کد پین جدید را مجدد وارد کنید:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "آماده‌سازی اتصال پهن‌باند تلفن همراه «%s»..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1013
-msgid "Show PIN/PUK codes"
-msgstr "کدهای پین/PUK را نمایش بده"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "پیکربندی اتصال پهن‌باند تلفن همراه «%s»..."
 
-#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
-msgid "GSM network."
-msgstr "شبکه GSM."
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "تأیید هویت مورد نیاز برای اتصال موبایل پهن‌باند «%s»..."
+
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "ارتباط شبکه پهن‌باند موبایل «%s» فعال شد"
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "اترنت خودکار"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "شبکه‌های سیمی (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "شبکه‌های سیمی (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "شبکه‌های سیمی"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "شبکه سیمی"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
-msgid "disconnected"
-msgstr "قطع شد"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "شما اکنون به شبکه سیمی متصل شده‌اید"
 
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "آماده‌سازی اتصال شبکه سیمی «%s»..."
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "پیکربندی اتصال شبکه سیمی «%s»..."
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "برای شبکه سیمی «%s» تایید هویت نیاز است..."
 
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "درخواست یک آدرس شبکه برای «%s»..."
 
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "اتصال شبکه سیمی «%s» فعال شد"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "تصدیق هویت دی‌اس‌ال"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_اتصال به شبکه بی‌سیم مخفی..."
 
-#: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "ساخت یک شبکه بی‌سیم _جدید..."
 
-#: ../src/applet-device-wifi.c:292
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(هیچکدام)"
 
-#: ../src/applet-device-wifi.c:790
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "(%s) شبکه‌های بی‌سیم "
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "شبکه‌های سیمی (%s)"
 
-#: ../src/applet-device-wifi.c:792
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "(%s) شبکه بی‌سیم"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "شبکه‌های سیمی (%s)"
 
-#: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "شبکه بی‌سیم"
-msgstr[1] "شبکه‌های بی‌سیم"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "شبکه سیمی"
+msgstr[1] "شبکه سیمی"
 
-#: ../src/applet-device-wifi.c:827
-msgid "wireless is disabled"
-msgstr "شبکه بی‌سیم غیرفعال است"
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "وایمکس غیر فعال است"
 
-#: ../src/applet-device-wifi.c:828
-msgid "wireless is disabled by hardware switch"
-msgstr "شبکه بی‌سیم توسط سوییچ سخت‌افزاری غیر فعال شده"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "وایمکس توسط سوییچ سخت افزاری غیرفعال است"
 
-#: ../src/applet-device-wifi.c:889
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "شبکه‌های بیشتر"
 
-#: ../src/applet-device-wifi.c:1068
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "شبکه‌های بی‌سیم در دسترس است"
 
-#: ../src/applet-device-wifi.c:1069
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "برای ارتباط به یک شبکه بی‌سیم از منوی شبکه استفاده کنید"
 
-#: ../src/applet-device-wifi.c:1072 ../src/applet.c:924
-msgid "Don't show this message again"
-msgstr "این پیغام را دیگر نمایش نده"
-
-#: ../src/applet-device-wifi.c:1263
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, fuzzy, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "شما در حال حاظر به شبکه «%s» متصل شده‌اید."
 
-#: ../src/applet-device-wifi.c:1294
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "درحال آماده‌سازی ارتباط شبکه بی‌سیم  «%s»..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "آماده‌سازی ارتباط شبکه «%s»..."
 
-#: ../src/applet-device-wifi.c:1297
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "درحال پیکربندی ارتباط شبکه بی‌سیم «%s»..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "پیکربندی اتصال شبکه سیمی «%s»..."
 
-#: ../src/applet-device-wifi.c:1300
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "شبکه بی‌سیم  «%s» به تایید هویت نیاز دارد..."
 
-#: ../src/applet-device-wifi.c:1303
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "درحال درخواست یک آدرس شبکه بی‌سیم برای «%s»..."
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "درخواست یک آدرس شبکه برای «%s»..."
 
-#: ../src/applet-device-wifi.c:1324
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "ارتباط با شبکه بی‌سیم «%s» فعال شد: %s (٪%Id)"
 
-#: ../src/applet-device-wifi.c:1329
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "شبکه بی‌سیم «%s» فعال شد"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "اتصال شبکه سیمی «%s» فعال شد"
 
-#: ../src/applet-device-wifi.c:1377
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "فعال‌سازی اتصال شکست خورد"
 
-#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
-#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
-msgid "Unknown error"
-msgstr "خطا ناشناس"
-
-#: ../src/applet-device-wifi.c:1382 ../src/applet-device-wifi.c:1401
-#: ../src/applet.c:493 ../src/applet.c:563
-msgid "Connection failure"
-msgstr "اتصال شکست خورد"
-
-#: ../src/applet-device-wifi.c:1396
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "اضافه کردن اتصال جدید شکست خورد"
 
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "شبکه پهن‌باند وایمکس (%s)"
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr "شبکه پهن‌باند وایمکس"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "وایمکس غیر فعال است"
-
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "وایمکس توسط سوییچ سخت افزاری غیرفعال است"
-
-#: ../src/applet-device-wimax.c:428
-msgid "You are now connected to the WiMAX network."
-msgstr "در حال حاظر شما به شبکه بی‌سیم  متصل شده‌اید."
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "خطا در هنگام نمایش اطلاعات اتصال:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:313
-#: ../src/libnm-gtk/nm-wireless-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "وپ پویا"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "آدرس‌ها"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "وپ"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/libnm-gtk/nm-wireless-dialog.c:905
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "هیچکدام"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (پیش‌فرض)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%Iu مگابایت/ثانیه"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "ناشناس"
 
-#: ../src/applet-dialogs.c:361
-#, c-format
-msgid "%d dB"
-msgstr "%Id دسی‌بل"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "ناشناس"
 
-#: ../src/applet-dialogs.c:363
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "ناشناخته"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "آدرس آی‌پی:‌"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "آدرس انتشار:"
 
-#: ../src/applet-dialogs.c:375
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
 msgstr "ناشناخته"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "نقاب زیرشبکه"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "اترنت (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "وایمکس (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "عمومی"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "واسط:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "آدرس سخت‌افزار:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "راه انداز:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "سرعت:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "امنیت: "
 
-#: ../src/applet-dialogs.c:512
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:525
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "آدرس آی‌پی:‌"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "ناشناس"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "آدرس انتشار:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "نقاب زیرشبکه"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "ناشناخته"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "مسیر پیش‌فرض:"
 
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "دی‌ان‌اس اصلی:"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "دی‌ان‌اس دوم:"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "دی‌ان‌اس سوم:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "رد شد"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "نوع وی‌پی‌ان:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "دروازه وی‌پی‌ان:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "نام کاربری وی‌پی‌ان:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "نشان وی‌پی‌ان:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "ارتباط پایه:"
 
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "ناشناس"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "هیچ اتصال فعالی پیدا نشد!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -751,412 +941,602 @@ msgstr ""
 "حق رونوشت © ۲۰۰۵-۲۰۰۸ شرکت نُوِل. \n"
 "و بسیاری از مشارکت‌کنندگان و مترجمان دیگر"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "برنامک ناحیه اعلان جهت مدیریت دستگاه‌ها و اتصال‌های شبکه."
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "پایگاه وب مدیر شبکه"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "منابع از دست رفته"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "کلمه عبور شبکه پهن‌باند تلفن همراه"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "برای اتصال با «%s» به کلمه عبور نیاز دارید."
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../src/applet.c:488
-msgid "Failed to add/activate connection"
-msgstr "اضافه/فعال کردن اتصال شکست خورد"
-
-#: ../src/applet.c:532
-msgid "Device disconnect failed"
-msgstr "قطع ارتباط دستگاه شکست خورد"
-
-#: ../src/applet.c:537
-msgid "Disconnect failure"
-msgstr "شکست قطع ارتباط"
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "پین SIM به بازکردن قفل نیاز دارد"
 
-#: ../src/applet.c:558
-msgid "Connection activation failed"
-msgstr "فعال‌سازی اتصال شکست خورد"
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "پین SIM به بازکردن قفل نیاز دارد"
 
-#: ../src/applet.c:1013
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون اتصال شبکه قطع شده است."
+"دستگاه پهن‌باند تلفن همراه «%s» پیش از اینکه بتواند مورد استفاده قرار گیرد، "
+"به کد پین SIM نیاز دارد."
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "کد پین:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "نمایش کد پین"
 
-#: ../src/applet.c:1016
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "به بازکردن قفل SIM PUK نیاز است"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "به بازکردن قفل SIM PUK نیاز است"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"اتصال شبکه خصوصی مجازی «%s» شکست خورد، چون سرویس شبکه خصوصی مجازی به طور غیر "
-"منتظره متوقف شد."
+"دستگاه پهن‌باند تلفن همراه «%s» قبل از این که بتواند مورد استفاده قرار گیرد "
+"به کد SIM PUK نیاز دارد."
 
-#: ../src/applet.c:1019
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "کد PUK:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "کد پین جدید:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "کد پین جدید را مجدد وارد کنید:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
 msgstr ""
-"\n"
-"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون سرویس شبکه خصوصی مجازی تنظیمات "
-"اشتباهی برگردانده است."
 
-#: ../src/applet.c:1022
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون زمان تلاش برای برقراری ارتباط "
-"به پایان رسیده است."
+"آدرس‌های آی‌پی شما را بر روی شبکه مشخص میکنند.  برای اضافه کردن یک آدرس آی‌پی، "
+"بر روی دکمه‌ی «افزودن» کلیک کنید."
 
-#: ../src/applet.c:1025
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+#: ../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
+msgid "_Add"
 msgstr ""
-"\n"
-"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون سرویس شبکه خصوصی مجازی به موقع "
-"اجرا نشد."
 
-#: ../src/applet.c:1028
-#, c-format
+#. 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
+msgid "_Delete"
+msgstr "_حذف"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
 msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr "اگر فعال باشد، این اتصال هیچ‌وقت به عنوان اتصال شبکه پیش‌فرض نخواهد بود."
+
+#: ../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…"
+msgstr "ایجاد..."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "نوع شبکه خصوصی مجازی (VPN) را انتخاب کنید"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
+msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"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."
 msgstr ""
-"\n"
-"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون اجرا سرویس شبکه خصوصی مجازی "
-"شکست خورد."
+"نوع شبکه خصوصی مجازی که می‌خواهید برای اتصال جدید استفاده کنید را انتخاب "
+"کنید. اگر نوع اتصالی که می خواهید بسازید در لیست وجود ندارد، ممکن است افزونه "
+"صحیح شبکه خصوصی مجازی را نصب ندارید."
 
-#: ../src/applet.c:1031
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "آدرس انتشار:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "ارتباط پایه:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_ویرایش"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "واسط:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون رمز درستی وجود ندارد."
 
-#: ../src/applet.c:1034
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "دی‌ان‌اس اصلی:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+"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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "بایت"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "_امنیت: "
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "ارتباط پایه:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
 msgstr ""
-"\n"
-"اتصال به شبکه خصوصی مجازی «%s» شکست خورد، چون رمز استباه است."
 
-#: ../src/applet.c:1041
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "فعال‌سازی _شبکه"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "خودکار"
+
+#: ../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
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+msgid "default"
+msgstr "پیش‌فرض"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"\n"
-"اتصال شبکه خصوصی مجازی «%s» شکست خورد."
 
-#: ../src/applet.c:1059
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "آدرس"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "آدرس"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+msgid "invalid %s for %s (%s)"
 msgstr ""
-"\n"
-"اتصال به شبکه وی‌پی‌ان «%s» شکست خورد، چون اتصال شبکه قطع شده است."
 
-#: ../src/applet.c:1062
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+msgid "invalid %s (%s)"
 msgstr ""
-"\n"
-"اتصال شبکه مجازی خصوصی «%s» بدلیل توقف سرویس شبکه مجازی خصوصی، قطع شد."
 
-#: ../src/applet.c:1068
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+msgid "invalid interface-name for %s (%s)"
 msgstr ""
-"\n"
-"اتصال شبکه خصوصی مجازی «%s» شکست خورد."
 
-#: ../src/applet.c:1098
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid ""
-"VPN connection has been successfully established.\n"
-"\n"
-"%s\n"
+msgid "invalid interface-name (%s)"
 msgstr ""
-"اتصال وی‌پی‌ان موفقیت‌آمیز بود.\n"
-"\n"
-"%s\n"
 
-#: ../src/applet.c:1100
-msgid "VPN connection has been successfully established.\n"
-msgstr "اتصال وی‌پی‌ان موفقیت‌آمیز بود.\n"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "هر دستگاهی"
 
-#: ../src/applet.c:1102
-msgid "VPN Login Message"
-msgstr "پیام ورودی به شبکه مجازی خصوصی"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "بروزرسانی رمز اتصال‌ها به دلیل یک خطای ناشناس شکست خورد."
 
-#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
-msgid "VPN Connection Failed"
-msgstr "اتصال شبکه خصوصی مجازی شکست خورد"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "از امنیت 802.1_X برای این ارتباط استفاده شود"
 
-#: ../src/applet.c:1173
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
 msgstr ""
-"\n"
-"اتصال شبکه مجازی خصوصی «%s» شکست خورد، بدلیل اینکه اجرا سرویس شبکه مجازی "
-"خصوصی شکست خورد.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1176
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
 msgstr ""
-"\n"
-"اتصال وی‌پی‌ان «%s» شکست خورد.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1496
-msgid "device not ready (firmware missing)"
-msgstr "دستگاه آماده نیست (میان‌افراز وجود ندارد)"
-
-#: ../src/applet.c:1498
-msgid "device not ready"
-msgstr "دستگاه آماده نیست"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1524
-msgid "Disconnect"
-msgstr "ارتباط قطع شده"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1538
-msgid "device not managed"
-msgstr "دستگاه مدیریت نشده"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.c:1582
-msgid "No network devices available"
-msgstr "هیچ دستگاه شبکه‌ای موجود نیست"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.c:1670
-msgid "_VPN Connections"
-msgstr "اتصال‌های شبکه‌های اختصاصی _مجازی (VPN)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.c:1727
-msgid "_Configure VPN..."
-msgstr "_پیکربندی شبکه خصوصی مجازی"
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.c:1731
-msgid "_Disconnect VPN"
-msgstr "_قطع ارتباط شبکه خصوصی مجازی"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.c:1825
-msgid "NetworkManager is not running..."
-msgstr "مدیر شبکه در حال اجرا نیست..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.c:1830 ../src/applet.c:2631
-msgid "Networking disabled"
-msgstr "شبکه غیر فعال شد"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2051
-msgid "Enable _Networking"
-msgstr "فعال‌سازی _شبکه"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2060
-msgid "Enable _Wireless"
-msgstr "فعال‌سازی _بی‌سیم"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2069
-msgid "Enable _Mobile Broadband"
-msgstr "فعال‌سازی پهن‌باند تلفن _همراه"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "۲"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2078
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "فعال سازی پهن‌باند تلفن همراه _وایمکسی"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "۳"
 
-#. Toggle notifications item
-#: ../src/applet.c:2089
-msgid "Enable N_otifications"
-msgstr "فعال سازی ا_علان‌ها"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "۴"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2100
-msgid "Connection _Information"
-msgstr "_اطلاعات اتصال"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2110
-msgid "Edit Connections..."
-msgstr "ویرایش ارتباط‌ها..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2124
-msgid "_Help"
-msgstr "_راهنما"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2133
-msgid "_About"
-msgstr "_درباره"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.c:2310
-msgid "Disconnected"
-msgstr "ارتباط قطع شد"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2311
-msgid "The network connection has been disconnected."
-msgstr "اتصال شبکه قطع شده است."
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2494
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "آماده‌سازی ارتباط شبکه «%s»..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2497
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "تصدیق هویت کاربر جهت اتصال به «%s» مورد نیاز است..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:2503
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "ارتباط شبکه «%s» فعال شد"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:2586
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "درحال شروع ارتباط شبکه خصوصی مجازی «%s»..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.c:2589
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "برای ارتباط شبکه خصوصی مجازی «%s» به تصدیق هویت نیاز است..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "۲"
 
-#: ../src/applet.c:2592
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "درحال درخواست یک آدرس شبکه اختصاصی شخصی برای «%s»..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "۳"
 
-#: ../src/applet.c:2595
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "ارتباط شبکه خصوصی مجازی «%s» فعال شد"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "۴"
 
-#: ../src/applet.c:2636
-msgid "No network connection"
-msgstr "هیچ اتصال شبکه وجود ندارد"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.c:3336
-msgid "NetworkManager Applet"
-msgstr "برنامک مدیریت شبکه"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "بطور خودکار این دستگاه را باز کن"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "_بازکردن قفل"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Connection Information"
-msgstr "اطلاعات اتصال:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Active Network Connections"
-msgstr "اتصال‌های فعال شبکه"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "تصدیق هویت ۸۰۲.۱x کابلی"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
-msgstr "نام _شبکه:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "خودکار"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:318
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "بروزرسانی رمز اتصال‌ها به دلیل یک خطای ناشناس شکست خورد."
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 msgstr ""
-"آدرس‌های آی‌پی شما را بر روی شبکه مشخص میکنند.  برای اضافه کردن یک آدرس آی‌پی، "
-"بر روی دکمه‌ی «افزودن» کلیک کنید."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-msgid "Ig_nore automatically obtained routes"
-msgstr "_نادیده‌گرفتن خودکار مسیرهای دریافت شده"
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "_Use this connection only for resources on its network"
-msgstr "_استفاده از این ا_تصال تنها برای منابع‌ش بر روی این شبکه"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
-msgstr "اگر فعال باشد، این اتصال هیچ‌وقت به عنوان اتصال شبکه پیش‌فرض نخواهد بود."
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:8
+#: ../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
@@ -1169,15 +1549,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 msgid "Sho_w password"
 msgstr "_نمایش گذرواٰژه"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../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
@@ -1185,15 +1567,168 @@ msgstr "_نمایش گذرواٰژه"
 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-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#: ../src/connection-editor/page-ip6.c:142
+#: ../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
 msgid "Automatic"
 msgstr "خودکار"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Twisted Pair (TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "۱۰ مگابیت/ثانیه"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "۱۰۰ مگابیت/ثانیه"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "۱ گیگابیت/ثانیه"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "۱۰ گیگابیت/ثانیه"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "_درگاه:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_سرعت:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "کاملا duple_x"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "مذاکره _خودکار"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "_خدمات:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+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 ""
+"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 cloning "
+"یا spoofing شناخته می‌شود. مثال: 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.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "پیش‌فرض"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "رد کردن"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "آدرس انتشار:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "گذرواژه کلید _خصوصی:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "_اتصال"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1201,8 +1736,8 @@ msgstr "خودکار با تنظیمات دی ان اس دستی"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "دستی"
 
@@ -1213,22 +1748,22 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "با رایانه‌های دیگر به اشتراک گذاشته شد"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_روش:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "آدرس‌ها"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1238,8 +1773,8 @@ msgstr ""
 "را سفارشی کند.  اگر تمایل دارید که از شناساگرِ کارگیرِ DHCP استفاده کنید، آن "
 "را اینجا وارد کنید."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1247,26 +1782,25 @@ msgstr ""
 "دامنه‌های استفاده شده هنگام تحلیل نام میزبان. برای جدا کردن چند دامنه از کاما "
 "استفاده کنید."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 msgid "D_HCP client ID:"
 msgstr "_شناسه DHCP کارگیر:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "_جستجوی دامنه‌ها:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "کارگزارهای _دی‌ان‌اس:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1274,11 +1808,11 @@ msgstr ""
 "آدرس‌های آی‌پی کارگزارهای نام دامنه استفاده شده جهت تشخصی نام میزبان‌ها. از "
 "کاما برای جدا کردن آدرس‌های کارگزارهای نام دامنه استفاده کنید."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1286,16 +1820,43 @@ msgstr ""
 "در هنگام اتصال به شبکه‌هایی با قابلیت IPv6، این اجازه را می‌دهد که در صورت "
 "شکست خوردن پیکربندی‌های IPv4 و موفقیت پیکربندی‌های IPv6، اتصال برقرار شود."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_مسیریاب‌ها..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "غیر فعال شد"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "به آدرس‌دهی آی‌پی _نسخه ۶ برای تکمیل این اتصال نیاز است"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1304,63 +1865,38 @@ msgstr ""
 "شکست خوردن پیکربندی‌های IPv6 و موفقیت پیکربندی‌های IPv4، اتصال برقرار شود."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "هرکدام"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "ترجیح 3G (یا UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "ترجیح  2G (یا GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "Basic"
 msgstr "مقدماتی"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "_شماره:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "شناسه _شبکه:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_نوع:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "تغییر..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "_پین:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "چنانچه شبکه خانگی موجود نبود اجازه‌ی _رومینگ بده"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "_نمایش گذرواژه‌ها"
 
@@ -1412,194 +1948,177 @@ msgstr "انعکاس"
 msgid "Send PPP _echo packets"
 msgstr "ارسال بسته‌های ا_نعکاسی PPP"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "Twisted Pair (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "ارتباط پایه:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "۱۰ مگابیت/ثانیه"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "۱۰۰ مگابیت/ثانیه"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "واسط:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "۱ گیگابیت/ثانیه"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "۱۰ گیگابیت/ثانیه"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "آدرس مک _کلون شده:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "_درگاه:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "_سرعت:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "کاملا duple_x"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "مذاکره _خودکار"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "_Device MAC address:"
-msgstr "آدرس مک _دستگاه:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "C_loned MAC address:"
-msgstr "آدرس مک _کلون شده:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-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"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
 msgstr ""
-"آدرس MAC وارد شده در اینجا به عنوان آدرسِ سخت‌افزاری برای دستگاه شبکه‌ای که این "
-"اتصال بر روی آن فعال شده است استفاده می‌گردد.  این امکان بعنوان MAC cloning "
-"یا spoofing شناخته می‌شود. مثال: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "بایت"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr "_امنیت: "
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (۵ گیگاهرتز)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (۲.۴ گیگاهرتز)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "Infrastructure"
-msgstr "پایه (Infrastructure)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "ادهاک"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "_قدرت انتقال:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "مگابیت/ثانیه"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_نرخ:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"این گزینه اتصال به نقطه دسترسی بی‌سیم (AP) مشخص شده توسط BSSID وارد شده را "
-"قفل می‌کند. نمونه: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_کانال:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_باند:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "M_ode:"
-msgstr "_نوع:"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "S_ecurity:"
-msgstr "_امنیت: "
+#: ../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:1
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
 msgid "Allowed Authentication Methods"
 msgstr "روش‌های مجاز تصدیق هویت"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "پروتکل تصدیق هویت توسعه‌پذیر (Extensible)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "پروتکل تصدیق هویت گذرواژه"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "پرتکل تصدیق هویت Handshake"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft 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.h:12
 msgid "MSCHAP v_2"
 msgstr "نسخه _۲ MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "پروتکل تصدیق هویت مایکروسافت Challenge Handshake نسخه ۲"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1607,189 +2126,651 @@ msgstr ""
 "در بیشتر موارد، کارگزارهای ارائه‌دهندگان از تمام روش‌های تصدیق هویت پشتیبانی "
 "می‌کنند.  اگر اتصال شکست خورد، غیرفعال کردن تعدادی از روش‌ها را امتحان کنید."
 
-#: ../src/connection-editor/ce-vpn-wizard.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/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+#, fuzzy
+msgid "Ethernet"
+msgstr "اترنت خودکار"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "نوع شبکه خصوصی مجازی (VPN) را انتخاب کنید"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "DSL"
+
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "شبکه خصوصی مجازی (VPN)"
+
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "آدرس سخت‌افزار:"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "صادر کردن اتصال وی‌پی‌ان..."
+
+#: ../src/connection-editor/connection-helpers.c:323
 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."
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
 msgstr ""
-"نوع شبکه خصوصی مجازی که می‌خواهید برای اتصال جدید استفاده کنید را انتخاب "
-"کنید. اگر نوع اتصالی که می خواهید بسازید در لیست وجود ندارد، ممکن است افزونه "
-"صحیح شبکه خصوصی مجازی را نصب ندارید."
+"به دلیل یک خطا ناشناس، محاوره ویرایش اتصال نمی‌تواند مقدار دهی اولیه شود."
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Create…"
-msgstr "ایجاد..."
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "ساخت ارتباط جدید امکان‌پذیر نیست"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "حذف ارتباط ناموفق بود"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:911
-#: ../src/connection-editor/page-ip6.c:877
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "آیا مطمئن هستید که می خواهید اتصال %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
 msgid "Address"
 msgstr "آدرس"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "نقاب شبکه"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
+#: ../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
 msgid "Gateway"
 msgstr "دروازه"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "متری"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "پیشوند"
 
-#: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1518
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "ویرایش %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "ویرایش ارتباط بی‌نام"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "نام _اتصال:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "خطا در هنگام مقدار دهی اولیه ویرایشگر"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "اضافه‌کردن اتصال شکست خورد"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+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:419
+msgid "_Save"
+msgstr "_ذخیره"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "ذخیره تمام تغییرات اعمال شده بر روی این اتصال."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr ""
+"برای ذخیره این اتصال برای تمام کاربرها در این ماشین تصدیق هویت لازم است."
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "ساخت ارتباط جدید امکان‌پذیر نیست"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "ارتباط قابل ویرایش نیست"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+msgid "Unknown error creating connection editor dialog."
+msgstr "خطا در ساخت محاوره ویرایشگر اتصال."
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "خطا در هنگام مقدار دهی اولیه ویرایشگر"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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
+msgid "Connection _name:"
+msgstr "نام _اتصال:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "_خارج کردن"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "هیچ وقت"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "اکنون"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%Id سال گذشته"
+msgstr[1] "%Id سال گذشته"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "نام"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "آخرین بار استفاده"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "ویرایش اتصال انتخاب شده"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "برای ویرایش اتصال انتخاب شده تصدیق هویت کنید"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "حذف اتصال انتخاب شده"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "برای حذف اتصال انتخاب شده تصدیق هویت کنید"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "نمی‌دانم چه طور اتصال‌های «%s» را بسازم"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "خطا در هنگام ساخت ارتباط"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr "خطا در هنگام ویرایش ارتباط"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "ارتباطی با UUIDی «%s» یافت نشد"
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "امنیت 802.1x"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "نمی‌توان واسط کاربری امنیت وای‌فای را بارگیری کرد."
+
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr "از امنیت 802.1_X برای این ارتباط استفاده شود"
+
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "نمی‌توان دستگاه بلوتوثی پیدا کرد."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "اتصال سیمی %Id"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "فعال‌سازی _شبکه"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "شبکه بی‌سیم"
+
+#: ../src/connection-editor/page-bond.c:447
+#, fuzzy
+msgid "Could not load bond user interface."
+msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "دی‌ان‌اس اصلی:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "اتصال سیمی %Id"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "اتصال سیمی %Id"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "امکان بارگزاری واسط کاربری DSL وجود ندارد."
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "امکان بارگزاری واسط کاربری DSL وجود ندارد."
 
-#: ../src/connection-editor/page-dsl.c:232
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "اتصال دی‌اس‌ال %Id"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"این گزینه اتصال به شبکه دستگاه مشخص شده توسط آدرس MAC همیشگی وارد شده در "
+"اینجا را قفل میکند. نمونه: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "اترنت (%s)"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "آدرس مک _کلون شده:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "پیش‌فرض"
+
+#: ../src/connection-editor/page-general.c:52
+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 "مدیر شبکه در حال اجرا نیست..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+#, fuzzy
+msgid "Could not load InfiniBand user interface."
+msgstr "امکان بارگزاری واسط کاربری WiFi وجود ندارد."
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "اتصال سیمی %Id"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "خودکار (شبکه خصوصی مجازی VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "خودکار (شبکه خصوصی مجازی) فقط آدرس‌ها"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "خودکار (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "خودکار (PPP) فقط آدرس‌ها"
+msgid "Automatic, addresses only"
+msgstr "خودکار، فقط آدرس‌ها"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "خودکار (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "خودکار (PPPoE) فقط آدرس‌ها"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "خودکار (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "خودکار (DHCP) فقط آدرس‌ها"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "فقط پیوند محلی"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "غیر فعال شد"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
-#| msgid "DNS ser_vers:"
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "کارگزارهای _دی‌ان‌اس اضافی:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
-#| msgid "S_earch domains:"
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "دامنه‌های _جست‌وجو اضافی:"
 
-#: ../src/connection-editor/page-ip4.c:843
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "ویرایش مسیرهای آی‌پی نسخه ۴ برای %s"
 
-#: ../src/connection-editor/page-ip4.c:992
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "تنظیمات آی‌پی نسخه ۴"
 
-#: ../src/connection-editor/page-ip4.c:994
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "نمی‌توان واسط کاربری آی‌پی نسخه ۴ را بارگزاری کرد."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "خودکار، فقط آدرس‌ها"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "رد کردن"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "خودکار، فقط DHCP"
 
-#: ../src/connection-editor/page-ip6.c:809
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "ویرایش مسیرهای آی‌پی نسخه ۶ برای %s"
 
-#: ../src/connection-editor/page-ip6.c:956
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "تنظیمات آی‌پی نسخه ۶"
 
-#: ../src/connection-editor/page-ip6.c:958
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "امکان بارگزاری آی‌پی ورژن ۶ وجود ندارد."
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "امکان بارگزاری واسط کاربری شبکه پهن‌باند وجود ندارد."
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "نوع ارتباط‌های شبکه پهن‌باند که پشتیبانی نمی‌شود."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:639
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "نوع ارائه‌دهنده پهن‌باند همراه را انتخاب کنید"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1797,427 +2778,267 @@ msgstr ""
 "فناوری که ارائه‌دهنده شبکه پهن‌باند تلفن همراه استفاده می‌کند را انتخاب کنید. "
 "اگر شما مطمئن نیستید، با ارائه‌دهنده خود تماس بگیرید."
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "ارائه‌دهنده من از فناوری _GSM-based استفاده می‌کند (مانند GPRS, EDGE, UMTS, "
 "HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ارائه‌دهنده من از فناوری C_DMA-based استفاده می‌کند (i.e. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "جی‌اس‌ام"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "هیچکدام"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:282
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "تنظیمات PPP"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "امکان بارگزاری واسط کاربری PPP وجود ندارد."
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-#: ../src/connection-editor/nm-connection-list.c:1514
-msgid "VPN"
-msgstr "شبکه خصوصی مجازی (VPN)"
+#: ../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 "پرونده را برای وارد کردن انتخاب کنید"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "اتصال سیمی %Id"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "هیچ اتصال شبکه وجود ندارد"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "نمی‌توان واسط کاربری آی‌پی نسخه ۴ را بارگزاری کرد."
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "ارتباط شبکه خصوصی مجازی %Id"
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "امکان بارگزاری واسط کاربری شبکه خصوصی مجازی (VPN) وجود ندارد."
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "افزونه‌های سرویس شبکه خصوصی مجازی (VPN) برای «%s» پیدا نشد."
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:899
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "ارتباط شبکه خصوصی مجازی %Id"
 
-#: ../src/connection-editor/page-wired.c:89
-#: ../src/connection-editor/page-wireless.c:94
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 msgstr ""
-"این گزینه اتصال به شبکه دستگاه مشخص شده توسط آدرس MAC همیشگی وارد شده در "
-"اینجا را قفل میکند. نمونه: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/page-wired.c:272
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:1502
-msgid "Wired"
-msgstr "سیمی"
-
-#: ../src/connection-editor/page-wired.c:274
-msgid "Could not load wired user interface."
-msgstr "امکان بارگزاری واسط کاربری سیمی وجود ندارد."
-
-#: ../src/connection-editor/page-wired.c:449
-#, c-format
-msgid "Wired connection %d"
-msgstr "اتصال سیمی %Id"
+"افزونه شبکه خصوصی مجازی موفق به واردن کرد صحیح اتصال شبکه مجازی خصوصی نشد\n"
+"\n"
+"خطا: نوع سرویس شبکه خصوصی مجازی مشخص نیست."
 
-#: ../src/connection-editor/page-wired-security.c:119
-msgid "802.1x Security"
-msgstr "امنیت 802.1x"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "نوع شبکه خصوصی مجازی (VPN) را انتخاب کنید"
 
-#: ../src/connection-editor/page-wired-security.c:121
-msgid "Could not load Wired Security security user interface."
-msgstr "امکان بارگزاری واسط کاربری امنیتی کابلی وجود ندارد."
+#: ../src/connection-editor/page-vpn.c:255
+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-wired-security.c:139
-msgid "Use 802.1_X security for this connection"
-msgstr "از امنیت 802.1_X برای این ارتباط استفاده شود"
+#: ../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 ""
+"این گزینه اتصال به نقطه دسترسی بی‌سیم (AP) مشخص شده توسط BSSID وارد شده را "
+"قفل می‌کند. نمونه: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
-#, c-format
-msgid "default"
-msgstr "پیش‌فرض"
+#: ../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)\""
+msgstr ""
+"این گزینه اتصال به شبکه دستگاه مشخص شده توسط آدرس MAC همیشگی وارد شده در "
+"اینجا را قفل میکند. نمونه: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%Iu (%Iu مگاهرتز)"
 
-#: ../src/connection-editor/page-wireless.c:457
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:1506
-msgid "Wireless"
-msgstr "بی‌سیم"
-
-#: ../src/connection-editor/page-wireless.c:459
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "امکان بارگزاری واسط کاربری WiFi وجود ندارد."
 
-#: ../src/connection-editor/page-wireless.c:663
-#, c-format
-msgid "Wireless connection %d"
-msgstr "شبکه بی‌سیم %Id"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/libnm-gtk/nm-wireless-dialog.c:922
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "هر دستگاهی"
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "اتصال سیمی %Id"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "کلید وپ ۴۰/۱۲۸ بیتی (Hex یا ASCII)"
 
-#: ../src/connection-editor/page-wireless-security.c:300
-#: ../src/libnm-gtk/nm-wireless-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "عبارت عبور وپ ۱۲۸ بیتی"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:961
+#: ../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)"
 msgstr "وپ پویا (x02.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:340
-#: ../src/libnm-gtk/nm-wireless-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 شخصی"
 
-#: ../src/connection-editor/page-wireless-security.c:354
-#: ../src/libnm-gtk/nm-wireless-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wireless-security.c:395
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "نمی‌توان واسط کاربری وای‌فای را بارگیری کرد؛ تنظیمات وای‌فای وجود ندارد."
 
-#: ../src/connection-editor/page-wireless-security.c:405
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "امنیت بی‌سیم"
 
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
 msgstr "نمی‌توان واسط کاربری امنیت وای‌فای را بارگیری کرد."
 
-#: ../src/connection-editor/nm-connection-editor.c:102
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Editing %s"
-msgstr "ویرایش %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:106
-msgid "Editing un-named connection"
-msgstr "ویرایش ارتباط بی‌نام"
-
-#: ../src/connection-editor/nm-connection-editor.c:292
-msgid ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
+msgid "missing SSID"
 msgstr ""
-"ویرایشگر اتصال نتوانست تعدادی از منابع لازم را پیدا کند ( پرونده ui پیدا "
-"نشد)."
-
-#: ../src/connection-editor/nm-connection-editor.c:395
-msgid "Error creating connection editor dialog."
-msgstr "خطا در ساخت محاوره ویرایشگر اتصال."
-
-#: ../src/connection-editor/nm-connection-editor.c:407
-msgid "_Save"
-msgstr "_ذخیره"
-
-#: ../src/connection-editor/nm-connection-editor.c:408
-msgid "Save any changes made to this connection."
-msgstr "ذخیره تمام تغییرات اعمال شده بر روی این اتصال."
-
-#: ../src/connection-editor/nm-connection-editor.c:409
-msgid "_Save..."
-msgstr "_ذخیره..."
-
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr ""
-"برای ذخیره این اتصال برای تمام کاربرها در این ماشین تصدیق هویت لازم است."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "_Import"
-msgstr "_وارد کردن"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "E_xport"
-msgstr "_خارج کردن"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-msgid "Connection _name:"
-msgstr "نام _اتصال:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-msgid "Connect _automatically"
-msgstr "اتصال _خودکار"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "A_vailable to all users"
-msgstr "در دسترس برای همه کاربرها"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "هیچ وقت"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "اکنون"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%Id دقیقه گذشته"
-msgstr[1] "%Id دقیقه گذشته"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%Id ساعت گذشته"
-msgstr[1] "%Id ساعت گذشته"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%Id روز گذشته"
-msgstr[1] "%Id روز گذشته"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%Id ماه گذشته"
-msgstr[1] "%Id ماه گذشته"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%Id سال گذشته"
-msgstr[1] "%Id سال گذشته"
-
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "اضافه‌کردن اتصال شکست خورد"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "خطا در هنگام ذخیره اتصال"
 
-#: ../src/connection-editor/nm-connection-list.c:516
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "ویژگی «%s» / «%s» نادرست است: %Id"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-msgstr "یک خطای ناشناس پیش آمد."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-msgstr "خطا در هنگام مقدار دهی اولیه ویرایشگر"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:719
-#: ../src/connection-editor/nm-connection-list.c:885
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
+msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
-"به دلیل یک خطا ناشناس، محاوره ویرایش اتصال نمی‌تواند مقدار دهی اولیه شود."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "ساخت ارتباط جدید امکان‌پذیر نیست"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "ویرایش ارتباط جدید امکان‌پذیر نیست"
-
-#: ../src/connection-editor/nm-connection-list.c:733
-msgid "Could not edit connection"
-msgstr "ارتباط قابل ویرایش نیست"
 
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "حذف ارتباط ناموفق بود"
-
-#: ../src/connection-editor/nm-connection-list.c:795
-#, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "آیا مطمئن هستید که می خواهید اتصال %s را پاک کنید؟"
-
-#: ../src/connection-editor/nm-connection-list.c:929
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "نمی‌توان ارتباط شبکه خصوصی مجازی (VPN) را وارد کرد"
 
-#: ../src/connection-editor/nm-connection-list.c:931
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"افزونه شبکه خصوصی مجازی موفق به واردن کرد صحیح اتصال شبکه مجازی خصوصی نشد\n"
-"\n"
-"خطا: نوع سرویس شبکه خصوصی مجازی مشخص نیست."
-
-#: ../src/connection-editor/nm-connection-list.c:944
-msgid "Could not edit imported connection"
-msgstr "ارتباط وارد شده قابل ویرایش نیست"
-
-#: ../src/connection-editor/nm-connection-list.c:1125
-msgid "Name"
-msgstr "نام"
-
-#: ../src/connection-editor/nm-connection-list.c:1137
-msgid "Last Used"
-msgstr "آخرین بار استفاده"
-
-#: ../src/connection-editor/nm-connection-list.c:1263
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr ""
-"افزونه شبکه خصوصی مجازی در دسترس نیست. برای فعال شدن این دکمه لطفا یک افزونه "
-"نصب کنید."
-
-#: ../src/connection-editor/nm-connection-list.c:1274
-msgid "_Edit"
-msgstr "_ویرایش"
-
-#: ../src/connection-editor/nm-connection-list.c:1275
-msgid "Edit the selected connection"
-msgstr "ویرایش اتصال انتخاب شده"
-
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "_Edit..."
-msgstr "_ویرایش..."
-
-#: ../src/connection-editor/nm-connection-list.c:1277
-msgid "Authenticate to edit the selected connection"
-msgstr "برای ویرایش اتصال انتخاب شده تصدیق هویت کنید"
-
-#: ../src/connection-editor/nm-connection-list.c:1292
-msgid "_Delete"
-msgstr "_حذف"
-
-#: ../src/connection-editor/nm-connection-list.c:1293
-msgid "Delete the selected connection"
-msgstr "حذف اتصال انتخاب شده"
-
-#: ../src/connection-editor/nm-connection-list.c:1294
-msgid "_Delete..."
-msgstr "_حذف..."
-
-#: ../src/connection-editor/nm-connection-list.c:1295
-msgid "Authenticate to delete the selected connection"
-msgstr "برای حذف اتصال انتخاب شده تصدیق هویت کنید"
-
-#: ../src/connection-editor/nm-connection-list.c:1574
-msgid "Error creating connection"
-msgstr "خطا در هنگام ساخت ارتباط"
-
-#: ../src/connection-editor/nm-connection-list.c:1575
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "نمی‌دانم چه طور اتصال‌های «%s» را بسازم"
-
-#: ../src/connection-editor/nm-connection-list.c:1630
-#: ../src/connection-editor/nm-connection-list.c:1642
-msgid "Error editing connection"
-msgstr "خطا در هنگام ویرایش ارتباط"
-
-#: ../src/connection-editor/nm-connection-list.c:1631
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "نمی‌دانم چه طور اتصال‌های «%s» را ویرایش کند"
-
-#: ../src/connection-editor/nm-connection-list.c:1643
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "ارتباطی با UUIDی «%s» یافت نشد"
-
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2229,31 +3050,32 @@ msgstr ""
 "\n"
 "خطا: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:263
-msgid "Select file to import"
-msgstr "پرونده را برای وارد کردن انتخاب کنید"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "خطا ناشناس"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "یک پرونده به نام «%s» درحال حاظر وجود دارد."
 
-#: ../src/connection-editor/vpn-helpers.c:316
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_جای‌گزینی"
 
-#: ../src/connection-editor/vpn-helpers.c:318
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:354
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "نمی‌توان ارتباط شبکه خصوصی مجازی را صادر کرد"
 
-#: ../src/connection-editor/vpn-helpers.c:356
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2264,116 +3086,60 @@ msgstr ""
 "\n"
 "خطا: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:391
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "صادر کردن اتصال وی‌پی‌ان..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "پیکربندی بلوتوث امکان‌پذیر نیست (اتصال به D-Bus شکست خورد: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "پیکربندی بلوتوث امکان‌پذیر نیست (خطا در پیدا کردن مدیر شبکه: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:445
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "استفاده از تلفن همراه شما به عنوان یک دستگاه شبکه (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:454
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "دسترسی به اینترنت با استفاده از گوشی تلفن همراه خود (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:318
-#, c-format
-msgid "Error: %s"
-msgstr "خطا: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:425
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "ساخت اتصال DUN شکست خورد: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:427
-#: ../src/gnome-bluetooth/nma-bt-device.c:833
-msgid "Your phone is now ready to use!"
-msgstr "تلفن شما هم اکنون آماده استفاده است!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:450
-msgid "Mobile wizard was canceled"
-msgstr "جادوگر تلفن همراه لغو شد"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:459
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "نوع دستگاه تلفن ناشناس (GSM و CDMA نیست)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:567
-msgid "unknown modem type."
-msgstr "نوع مودم ناشناخته است."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:639
-#: ../src/gnome-bluetooth/nma-bt-device.c:645
-msgid "failed to connect to the phone."
-msgstr "اتصال به تلفن شکست خورد."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:676
-msgid "unexpectedly disconnected from the phone."
-msgstr "ارتباط با تلفن به طور غیر منتظره‌ایی قطع شد."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:686
-msgid "timed out detecting phone details."
-msgstr "زمان تشخیص جزئیات گوشی به پایان رسید."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"برنامه مدیریت شبکه نمی‌تواند تعدادی از منابع لازم را پیدا کند (پرونده ui پیدا "
+"نشد)."
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:697
-msgid "Detecting phone configuration..."
-msgstr "تشخیص پیکربندی تلفن..."
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "_بازکردن قفل"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"قبل از برپاسازی ارتباط شبکه Dial-Up آداپتور پیشفرض بلوتوث باید فعال شود."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "بطور خودکار این دستگاه را باز کن"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:831
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "ساخت اتصال PAN شکست خورد: %s"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "اطلاعات اتصال:"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:852
-#, c-format
-msgid "%s Network"
-msgstr "%s شبکه"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "اتصال‌های فعال شبکه"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:205
+#: ../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/libnm-gtk/nm-mobile-wizard.c:212
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "دستگاه شما:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:223
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "ارئه‌دهنده شما:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:234
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "پلان شما:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:259
+#: ../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 "
@@ -2386,23 +3152,28 @@ msgstr ""
 "پیدا کنید، تنظیمات خود را دوباره بررسی کنید. برای تغییر تنظیمات اتصال "
 "پهن‌باند تلفن همراه، «اتصال‌های شبکه» را از منوی سیستم >> ترجیحات انتخاب کنید."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:271
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "تایید تنظیمات شبکه پهن‌باند تلفن همراه"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:332
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "فهرست نشده"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:487
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "پلان خود را _انتخاب کنید"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:511
+#: ../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/libnm-gtk/nm-mobile-wizard.c:535
+#: ../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"
@@ -2415,69 +3186,85 @@ msgstr ""
 "اگر شما از پلان خود مطمئن نیستید، از ارائه‌دهنده خود در مورد APN پلان خود "
 "بپرسید."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:542
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "پلان مالی خود را انتخاب کنید"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:590
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "پلان من در فهرست نیست..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:747
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "ارائه‌دهنده خود را از یک _فهرست انتخاب کنید:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:760
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ارائه‌دهنده"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:785
+#: ../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/libnm-gtk/nm-mobile-wizard.c:796
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "ارئه دهنده:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:820
+#: ../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/libnm-gtk/nm-mobile-wizard.c:826
+#: ../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/libnm-gtk/nm-mobile-wizard.c:837
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "ارائه‌دهنده خود را انتخاب کنید"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1088
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "فهرست کشور یا منطقه:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "کشور یا منطقه"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1107
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "کشور من در فهرست نیست"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1153
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1207
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "دستگاه GSM نصب شده"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1210
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "دستگاه CDMA نصب شده"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1382
+#: ../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."
@@ -2485,114 +3272,215 @@ msgstr ""
 "این دستیار کمک می‌کند تا شما به راحتی یک ارتباط باند پهن تلفن همراه را به "
 "عنوان تلفن همراه (3G) راه‌اندازی کنید."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "شما به اطلاعات زیر نیاز خواهید داشت:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "نام ارائه‌دهنده شبکه پهن‌باند"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "نام پلان مالی شبکه پهن‌باند"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1441
+#: ../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 "یک اتصال برای ا_ین شبکه پهن‌باند تلفن همراه بساز:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1456
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "هر دستگاهی"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1469
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "برپاسازی اتصال شبکه تلفن همراه پهن‌باند"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1633
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "اتصال جدید شبکه تلفن همراه پهن‌باند"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_گذرواژه:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_گذرواژه:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_نمایش گذرواژه‌ها"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "جدید..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1076
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "هیچکدام"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_ساخت"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "برای دسترسی به شبکه بی‌سیم «%s»، گذرواژه‌ها یا کلیدهای رمز نگاری شده نیاز است."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1162
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "شبکه بی‌سیم به تصدیق هویت نیاز دارد"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "شبکه بی‌سیم به تصدیق هویت نیاز دارد"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "ساخت یک شبکه بی‌سیم جدید"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1171
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "شبکه بی‌سیم جدید"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "نام شبکه بی‌سیمی را که می خواهید بسازید وارد کنید."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1174
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "اتصال به شبکه بی‌سیم مخفی "
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1176
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "شبکه‌های بی‌سیم مخفی"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "نام و جزئیات امنیتی شبکه مخفی که می‌خواهید به آن متصل شوید را وارد کنید."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
 msgstr "ا_منیت بی‌سیم:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "ا_رتباط:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
 msgstr "آ_داپتور بی‌سیم:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "کاربرد:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"این برنامه بخشی از برنامه مدیریت شبکه است (https://wiki.gnome.org/"
-"Projects/NetworkManager/)"
+"این برنامه بخشی از برنامه مدیریت شبکه است (https://wiki.gnome.org/Projects/"
+"NetworkManager/)"
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -2600,128 +3488,156 @@ msgstr ""
 "این برای خط فرمان تعامل کنند تهیه نشده است اما به جای آن  در محیط میز کار "
 "گنوم اجرا می شود."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "وایمکس"
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "فعال نشده"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ثبت نشده"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "شبکه خانگی (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "شبکه خانگی"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "درحال جستجو"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "اجازه ثبت داده نشد"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../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:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (رومینگ)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "شبکه رومینگ (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "شبکه رومینگ"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "پیش‌فرض"
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "کد PIN برای SIM کارت «%s» بر روی «%s»"
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "پین کد مورد نیاز است"
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "برای دستگاه پهن‌باند شبکه تلفن همراه به پین کد نیاز است"
+
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "ارتباط پهن‌باند «%s» فعال شد: (٪%Id%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "رومینگ"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:325
+#: ../src/utils/utils.c:179
 #, c-format
-#| msgid "Base Connection:"
 msgid "%s connection"
 msgstr "اتصال %s"
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"برنامه مدیریت شبکه نمی‌تواند تعدادی از منابع لازم را پیدا کند (پرونده ui پیدا "
-"نشد)."
-
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "مجوز مجاز انتخاب نشده است"
 
-#: ../src/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
 msgstr ""
-"استفاده نکردن از گواهی سازمان (CA) می تواند نتیجه ارتباط ناامن با شبکه‌های "
-"بی‌سیم داشته باشد. آیا می خواهید از یک مجوز گواهی سازمان استفاده کنید؟"
-
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "مجوز CA انتخاب کنید"
 
-#: ../src/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:648
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "گواهینامه‌های DER یا PEM شامل (*.der, *.pem, *.crt, *.cer)"
 
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr "GTC"
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr "یک پرونده PAC انتخاب کنید..."
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr "پرونده‌های PAC"
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr "تمام پرونده‌ها"
+
 #: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "ناشناس"
@@ -2745,8 +3661,8 @@ msgid "PAC _file:"
 msgstr "_پرونده PAC:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "تصدیق هویت _درونی:"
 
@@ -2754,31 +3670,32 @@ msgstr "تصدیق هویت _درونی:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "استفاده از تامینِ خودکار PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
-msgid "GTC"
-msgstr "GTC"
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "یک پرونده PAC انتخاب کنید..."
+#: ../src/wireless-security/eap-method-leap.c:69
+msgid "missing EAP-LEAP password"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:406
-msgid "PAC files (*.pac)"
-msgstr "پرونده‌های PAC"
+#: ../src/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:410
-msgid "All files"
-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:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "یک مجوز مجاز انتخاب کنید..."
 
@@ -2796,19 +3713,57 @@ msgstr "نسخه ۱"
 msgid "C_A certificate:"
 msgstr "_مجوز CA:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "نادیده گرفتن گواهینامه‌ی CA"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "ن_سخه PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "این گذرواژه هر بار پرسیده شود"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "_مجوز CA:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "کلیدهای رمز گذاری نشده امن نیستند"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../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 "
@@ -2822,11 +3777,11 @@ msgstr ""
 "\n"
 "(شما می‌توانید به وسیله openssl کلید خصوصی خود را توسط گذرواژه محافظت کنید)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "مجوز شخصی خود را انتخاب کنید..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "کلید خصوصی خود را انتخاب کنید ..."
 
@@ -2838,27 +3793,44 @@ msgstr "_هویت:"
 msgid "_User certificate:"
 msgstr "مجوز _کاربر:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "کلید خصوصی"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "گذرواژه کلید _خصوصی:"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "TLS تونل شده"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP محافظت شده (PEAP)"
 
@@ -2868,29 +3840,55 @@ msgstr "EAP محافظت شده (PEAP)"
 msgid "Au_thentication:"
 msgstr "_تصدیق هویت:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "سیستم باز"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "کلید به اشتراک گذاشته شده"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:4
-msgid "2"
-msgstr "۲"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "۳"
+msgid "Open System"
+msgstr "سیستم باز"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "۴"
+msgid "Shared Key"
+msgstr "کلید به اشتراک گذاشته شده"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -2904,8 +3902,260 @@ msgstr "_نمایش کلید"
 msgid "WEP inde_x:"
 msgstr "_نمایه وپ:"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "نمی‌توان دستگاه بلوتوثی پیدا کرد."
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_نوع:"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "ارتباط پهن‌باند تلفن همراه (CDMA) جدید..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "اکنون شما به شبکه CDMA متصل شده‌اید."
+
+#~ msgid "CDMA network."
+#~ msgstr "شبکه CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "ارتباط پهن‌باند تلفن همراه (جی‌اس‌ام) جدید..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "اکنون شما به شبکه GSM متصل شده‌اید."
+
+#~ msgid "GSM network."
+#~ msgstr "شبکه GSM."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "(%s) شبکه‌های بی‌سیم "
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "(%s) شبکه بی‌سیم"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "شبکه بی‌سیم غیرفعال است"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "شبکه بی‌سیم توسط سوییچ سخت‌افزاری غیر فعال شده"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "درحال آماده‌سازی ارتباط شبکه بی‌سیم  «%s»..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "درحال پیکربندی ارتباط شبکه بی‌سیم «%s»..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "درحال درخواست یک آدرس شبکه بی‌سیم برای «%s»..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "شبکه بی‌سیم «%s» فعال شد"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "شبکه پهن‌باند وایمکس (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "شبکه پهن‌باند وایمکس"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "در حال حاظر شما به شبکه بی‌سیم  متصل شده‌اید."
+
+#~ msgid "%d dB"
+#~ msgstr "%Id دسی‌بل"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "ناشناخته"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "ناشناخته"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "وایمکس (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "دی‌ان‌اس دوم:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "دی‌ان‌اس سوم:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "فعال سازی پهن‌باند تلفن همراه _وایمکسی"
+
+#~ msgid "_Help"
+#~ msgstr "_راهنما"
+
+#~ msgid "Any"
+#~ msgstr "هرکدام"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "ترجیح 3G (یا UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "ترجیح  2G (یا GPRS/EDGE)"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "آدرس مک _دستگاه:"
+
+#~ msgid "Infrastructure"
+#~ msgstr "پایه (Infrastructure)"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "خودکار (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "خودکار (PPP) فقط آدرس‌ها"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "امکان بارگزاری واسط کاربری امنیتی کابلی وجود ندارد."
+
+#~ msgid "Wireless"
+#~ msgstr "بی‌سیم"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "شبکه بی‌سیم %Id"
+
+#~ msgid "_Save..."
+#~ msgstr "_ذخیره..."
+
+#~ msgid "_Import"
+#~ msgstr "_وارد کردن"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "اتصال _خودکار"
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "در دسترس برای همه کاربرها"
+
+#~ msgid "Error saving connection"
+#~ msgstr "خطا در هنگام ذخیره اتصال"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "ویژگی «%s» / «%s» نادرست است: %Id"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "یک خطای ناشناس پیش آمد."
+
+#~ msgid "Could not edit new connection"
+#~ msgstr "ویرایش ارتباط جدید امکان‌پذیر نیست"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "ارتباط وارد شده قابل ویرایش نیست"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr ""
+#~ "افزونه شبکه خصوصی مجازی در دسترس نیست. برای فعال شدن این دکمه لطفا یک "
+#~ "افزونه نصب کنید."
+
+#~ msgid "_Edit..."
+#~ msgstr "_ویرایش..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_حذف..."
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "نمی‌دانم چه طور اتصال‌های «%s» را ویرایش کند"
+
+#~| msgid ""
+#~| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr "پیکربندی بلوتوث امکان‌پذیر نیست (اتصال به D-Bus شکست خورد: (%s) %s)."
+
+#~| msgid ""
+#~| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "پیکربندی بلوتوث امکان‌پذیر نیست (خطا در پیدا کردن مدیر شبکه: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "استفاده از تلفن همراه شما به عنوان یک دستگاه شبکه (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "دسترسی به اینترنت با استفاده از گوشی تلفن همراه خود (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "خطا: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "ساخت اتصال DUN شکست خورد: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "تلفن شما هم اکنون آماده استفاده است!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "جادوگر تلفن همراه لغو شد"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "نوع دستگاه تلفن ناشناس (GSM و CDMA نیست)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "نوع مودم ناشناخته است."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "اتصال به تلفن شکست خورد."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ارتباط با تلفن به طور غیر منتظره‌ایی قطع شد."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "زمان تشخیص جزئیات گوشی به پایان رسید."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "تشخیص پیکربندی تلفن..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "قبل از برپاسازی ارتباط شبکه Dial-Up آداپتور پیشفرض بلوتوث باید فعال شود."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "ساخت اتصال PAN شکست خورد: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s شبکه"
+
+#~ msgid "WiMAX"
+#~ msgstr "وایمکس"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "مجوز مجاز انتخاب نشده است"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "استفاده نکردن از گواهی سازمان (CA) می تواند نتیجه ارتباط ناامن با شبکه‌های "
+#~ "بی‌سیم داشته باشد. آیا می خواهید از یک مجوز گواهی سازمان استفاده کنید؟"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "مجوز CA انتخاب کنید"
 
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "تنظیم بلوتوث امکان‌پذیر نیست (امکان ساخت پروکسی D-Bus وجود ندارد)."
@@ -2919,9 +4169,6 @@ msgstr "_نمایه وپ:"
 #~ msgid "United Kingdom"
 #~ msgstr "بریتانیا"
 
-#~ msgid "C_onnect"
-#~ msgstr "_اتصال"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "سایر شبکه‌های بی‌سیم..."
 
diff --git a/po/fi.po b/po/fi.po
index d2eadf65..63beff58 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,9 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-03-13 11:44+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -29,7 +28,7 @@ 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:3118
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Verkko"
 
@@ -52,8 +51,6 @@ msgstr "Älä näytä ilmoitusta kun yhteys muodostuu"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
 #, fuzzy
-#| msgid ""
-#| "Set this to TRUE to disable notifications when connecting to a network."
 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 "
@@ -65,9 +62,6 @@ msgstr "Älä näytä ilmoitusta kun yhteys katkeaa"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
 #, fuzzy
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
@@ -80,9 +74,6 @@ msgstr "Poista VPN-ilmoitukset käytöstä"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:6
 #, fuzzy
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -96,9 +87,6 @@ msgstr "Älä näytä ilmoituksia saatavilla olevista verkoista"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
 #, fuzzy
-#| msgid ""
-#| "Set this to TRUE to disable notifications when wireless networks are "
-#| "available."
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
@@ -119,8 +107,6 @@ msgstr "Estä WiFi-luonti"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
 #, fuzzy
-#| msgid ""
-#| "Set to TRUE to disable creation of adhoc networks when using the applet."
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
@@ -136,7 +122,6 @@ msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:15
-#| msgid "Choose CA Certificate"
 msgid "Ignore CA certificate"
 msgstr "Älä huomioi CA-varmennetta"
 
@@ -194,47 +179,46 @@ msgstr "_Yhdistä"
 msgid "_Network name:"
 msgstr "_Verkon nimi:"
 
-#: ../src/ap-menu-item.c:84
+#: ../src/ap-menu-item.c:82
 #, fuzzy
-#| msgid "Ad-hoc"
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:89
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:338
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Yhteyden lisäys/aktivointi epäonnistui"
 
-#: ../src/applet.c:340 ../src/applet.c:394 ../src/applet.c:429
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
 #: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: ../src/applet.c:343 ../src/applet.c:432 ../src/applet-device-wifi.c:1447
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
 #: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Yhteysvirhe"
 
-#: ../src/applet.c:392
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Laitteen katkaisu epäonnistui"
 
-#: ../src/applet.c:397
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Katkaisuvirhe"
 
-#: ../src/applet.c:427
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Yhteyden aktivointi epäonnistui"
 
-#: ../src/applet.c:751 ../src/applet-device-wifi.c:1184
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Älä näytä tätä uudestaan"
 
-#: ../src/applet.c:838
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -244,7 +228,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska verkkoyhteys katkaistiin."
 
-#: ../src/applet.c:841
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -253,7 +237,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelu pysäytettiin odottamatta."
 
-#: ../src/applet.c:844
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -264,7 +248,7 @@ msgstr ""
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelulta saatiin virheellinen "
 "asetusmäärittely."
 
-#: ../src/applet.c:847
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -273,7 +257,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska yhteyttä palveluun ei saatu."
 
-#: ../src/applet.c:850
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -283,7 +267,7 @@ msgstr ""
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelu ei käynnistynyt sallitussa "
 "ajassa."
 
-#: ../src/applet.c:853
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -292,7 +276,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska VPN-palvelua ei voitu käynnistää."
 
-#: ../src/applet.c:856
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -301,7 +285,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui, koska kelvollisia VPN-salaisuuksia ei löytynyt."
 
-#: ../src/applet.c:859
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -310,7 +294,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui virheellisten VPN-salaisuuksien takia."
 
-#: ../src/applet.c:866
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -319,7 +303,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” epäonnistui."
 
-#: ../src/applet.c:882
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -329,7 +313,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” katkesi, koska verkkoyhteys katkaistiin."
 
-#: ../src/applet.c:885
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -338,7 +322,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” katkesi, koska VPN-palvelu pysäytettiin."
 
-#: ../src/applet.c:891
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -347,7 +331,7 @@ msgstr ""
 "\n"
 "VPN-yhteys ”%s” katkesi."
 
-#: ../src/applet.c:921
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -358,19 +342,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:923
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-yhteys on muodostettu onnistuneesti.\n"
 
-#: ../src/applet.c:925
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN-yhteyden kirjautumisviesti"
 
-#: ../src/applet.c:931 ../src/applet.c:939 ../src/applet.c:980
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN-yhteys epäonnistui"
 
-#: ../src/applet.c:984
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -383,7 +367,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:987
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -396,150 +380,144 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1277
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "laite ei ole valmiina"
 
-#: ../src/applet.c:1279
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "laite ei valmis"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1289 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "katkaistu"
 
-#: ../src/applet.c:1305
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: ../src/applet.c:1319
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "laitetta ei hallita"
 
-#: ../src/applet.c:1389
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Verkkolaitteita ei löytynyt"
 
-#: ../src/applet.c:1443
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN-yhteydet"
 
-#: ../src/applet.c:1497
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Määrittele VPN-yhteys…"
 
-#: ../src/applet.c:1502
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Katkaise VPN-yhteys"
 
-#: ../src/applet.c:1612
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Verkon hallinta ei ole käytössä…"
 
-#: ../src/applet.c:1617 ../src/applet.c:2620
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Verkko ei ole käytössä"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1826
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Ota _verkko käyttöön"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1835
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Ota _wifi käyttöön"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1844
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Ota _mobiililaajakaista käyttöön"
 
 #. Toggle notifications item
-#: ../src/applet.c:1856
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Ota ilm_oitukset käyttöön"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1868
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Tietoja _yhteydestä"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1878
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Muokkaa yhteyksiä…"
 
-#. Help item
-#: ../src/applet.c:1893
-msgid "_Help"
-msgstr "O_hje"
-
-#. About item
-#: ../src/applet.c:1902
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/applet.c:2186
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Yhteys verkkoon ”%s” on nyt muodostettu."
 
-#: ../src/applet.c:2229
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Yhteys katkaistu"
 
-#: ../src/applet.c:2230
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Verkkoyhteys on nyt katkaistu."
 
-#: ../src/applet.c:2485
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Valmistellaan verkkoyhteyttä  ”%s”…"
 
-#: ../src/applet.c:2488
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Käyttäjätunnistautuminen vaaditaan verkkoyhteydelle ”%s”…"
 
-#: ../src/applet.c:2491 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Pyydetään verkko-osoitetta verkosta ”%s”…"
 
-#: ../src/applet.c:2494
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Verkkoyhteys ”%s” on aktiivinen"
 
-#: ../src/applet.c:2568
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Käynnistetään VPN-yhteyttä ”%s”…"
 
-#: ../src/applet.c:2571
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Käyttäjätunnistautuminen vaaditaan VPN-yhteydelle ”%s”…"
 
-#: ../src/applet.c:2574
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Pyydetään VPN-osoitetta yhteydelle ”%s”…"
 
-#: ../src/applet.c:2577
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-yhteys ”%s” on aktiivinen"
 
-#: ../src/applet.c:2624
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Ei verkkoyhteyttä"
 
-#: ../src/applet.c:3223
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Verkon hallinta -sovelma"
 
@@ -1274,7 +1252,6 @@ msgstr "s"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:10
 #, fuzzy
-#| msgid "Enable _Networking"
 msgid "Enable I_GMP snooping"
 msgstr "Ota _verkko käyttöön"
 
@@ -1313,7 +1290,6 @@ msgstr "MAC-osoite"
 
 #: ../src/connection-editor/ce-page.c:245
 #, fuzzy
-#| msgid "Address"
 msgid "HW address"
 msgstr "Osoite"
 
@@ -1647,42 +1623,44 @@ msgid "Wake on LAN:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:20
-#| msgid "Default"
 msgid "De_fault"
 msgstr "_Oletus"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ohita"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 #, fuzzy
-#| msgid "Broadcast"
 msgid "_Broadcast"
 msgstr "Yleislähetys"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
-#| msgid "_Private key password:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "_Wake on LAN-salasana:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1829,9 +1807,6 @@ msgstr "Käytössä (suosi väliaikaista osoitetta)"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:17
 #, fuzzy
-#| msgid ""
-#| "IP addresses of domain name servers used to resolve host names. Use "
-#| "commas to separate multiple domain name server addresses."
 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 "
@@ -1964,12 +1939,10 @@ msgstr "_Isäntäliitäntä:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
 #, fuzzy
-#| msgid "VLAN interface _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:"
 msgid "Cloned MAC _address:"
 msgstr "_Kloonattu MAC-osoite:"
 
@@ -2121,7 +2094,7 @@ msgstr ""
 "joitain tunnistautumistapoja."
 
 #: ../src/connection-editor/connection-helpers.c:97
-#: ../src/connection-editor/page-ethernet.c:315
+#: ../src/connection-editor/page-ethernet.c:326
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
@@ -2254,7 +2227,6 @@ msgstr "Yhteyden nimi puuttuu"
 
 #: ../src/connection-editor/nm-connection-editor.c:187
 #, fuzzy
-#| msgid "Error initializing editor"
 msgid "Editor initializing..."
 msgstr "Virhe alustettaessa muokkainta"
 
@@ -2434,7 +2406,6 @@ msgstr "Bluetooth-käyttöliittymän lataaminen ei onnistunut."
 
 #: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
-#| msgid "could not find the Bluetooth device."
 msgid "invalid Bluetooth device (%s)"
 msgstr "virheellinen Bluetooth-laite (%s)"
 
@@ -2453,7 +2424,6 @@ msgstr "Valitse Bluetooth-yhteysprofiilin tyyppi."
 
 #: ../src/connection-editor/page-bluetooth.c:325
 #, fuzzy
-#| msgid "Ethernet Network"
 msgid "_Personal Area Network"
 msgstr "Ethernet-verkko"
 
@@ -2513,9 +2483,6 @@ msgstr "DSL-yhteys %d"
 
 #: ../src/connection-editor/page-ethernet.c:74
 #, fuzzy
-#| msgid ""
-#| "This option locks this connection to the network device specified by its "
-#| "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"em1\", "
@@ -2524,25 +2491,25 @@ 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:317
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Ethernet-käyttöliittymän lataus epäonnistui."
 
-#: ../src/connection-editor/page-ethernet.c:444
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Ethernet-laite"
 
-#: ../src/connection-editor/page-ethernet.c:448
+#: ../src/connection-editor/page-ethernet.c:461
 #: ../src/connection-editor/page-vlan.c:741
 #: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "kloonattu MAC-osoite"
 
-#: ../src/connection-editor/page-ethernet.c:452
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Wake-on-LAN-salasana"
 
-#: ../src/connection-editor/page-ethernet.c:487
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet-yhteys %d"
@@ -2767,12 +2734,12 @@ msgstr ""
 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:578 ../src/mb-menu-item.c:52
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
 #: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:56
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
 #: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
@@ -2926,9 +2893,6 @@ msgstr ""
 
 #: ../src/connection-editor/page-wifi.c:88
 #, fuzzy
-#| msgid ""
-#| "This option locks this connection to the network device specified by its "
-#| "permanent MAC address entered here.  Example: 00:11:22:33:44:55"
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"wlan0\", "
@@ -3307,7 +3271,6 @@ msgstr "_Toissijainen salasana:"
 #: ../src/libnma/nma-vpn-password-dialog.c:102
 #: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 #, fuzzy
-#| msgid "_Secondary Password:"
 msgid "_Ternary Password:"
 msgstr "_Toissijainen salasana:"
 
@@ -3444,84 +3407,84 @@ msgstr ""
 "Sitä ei ole tarkoitettu komentorivin keskusteluun mutta sen sijaan se toimii "
 "GNOME-työpöytäympäristössä"
 
-#: ../src/mb-menu-item.c:54
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:58
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:123
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ei käytössä"
 
-#: ../src/mb-menu-item.c:129
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ei rekisteröity"
 
-#: ../src/mb-menu-item.c:147
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Kotiverkko (%s)"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Kotiverkko"
 
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "etsitään"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "rekisteröinti evätty"
 
-#: ../src/mb-menu-item.c:165 ../src/mb-menu-item.c:171
+#: ../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:167 ../src/mb-menu-item.c:173
+#: ../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:176
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Verkkovierailu (roaming - %s)"
 
-#: ../src/mb-menu-item.c:178
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Vierasverkko"
@@ -3868,6 +3831,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Tyyppi:"
 
+#~ msgid "_Help"
+#~ msgstr "O_hje"
+
 #~ msgid "Infrastructure"
 #~ msgstr "Infrastruktuuri"
 
diff --git a/po/fr.po b/po/fr.po
index bb6e4c64..093226d8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,9 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-09-05 10:06+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2015-09-01 11:10+0200\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: GNOME French TEAM <gnomefr@traduc.org>\n"
@@ -27,7 +26,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Réseau"
 
@@ -139,46 +138,90 @@ 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."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Applet NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Applet NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Authentification 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "Se _connecter"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Nom du réseau :"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Échec de l'ajout/création de la connexion"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Échec de la connexion"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "La déconnexion du périphérique a échoué"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Échec de la déconnexion"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "L'activation de la connexion a échoué"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Ne plus m'avertir"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -188,7 +231,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué car la connexion réseau a été interrompue."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -198,7 +241,7 @@ msgstr ""
 "La connexion VPN « %s » a échoué car le service VPN a été arrêté de manière "
 "inattendue."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -209,7 +252,7 @@ msgstr ""
 "La connexion VPN « %s » a échoué car le service VPN a renvoyé une "
 "configuration invalide."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -218,7 +261,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué car le délai de connexion est dépassé."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -227,7 +270,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué car le service VPN n'a pas démarré à temps."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -236,7 +279,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué car le démarrage du service VPN a échoué."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -245,7 +288,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué car il n'y avait pas de secrets VPN valides."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -254,7 +297,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué en raison de secrets VPN non valides."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -263,7 +306,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a échoué."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -274,7 +317,7 @@ msgstr ""
 "La connexion VPN « %s » a été déconnectée car la connexion réseau a été "
 "interrompue."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -283,7 +326,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a été déconnectée car le service VPN a été arrêté."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -292,7 +335,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a été déconnectée."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -303,19 +346,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "La connexion VPN a été établie avec succès.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Message d'identification VPN"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "La connexion VPN a échoué"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -328,7 +371,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -341,802 +384,547 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "périphérique non prêt (micrologiciel manquant)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "périphérique non prêt"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "déconnecté"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Se déconnecter"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "périphérique non géré"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Aucun périphérique réseau disponible"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_Connexions VPN"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Configurer le VPN..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Déconnecter le VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager n'est pas lancé..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Réseau désactivé"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Activer le _réseau"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Activer le réseau _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Activer la connexion _mobile"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Activer la connexion mobile WiMA_X"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Activer les _notifications"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Informations sur la connexion"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Modification des connexions..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "_Aide"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "À _propos"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Vous êtes maintenant connecté à « %s »."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "La connexion réseau a été déconnectée."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Préparation de la connexion réseau « %s »..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Authentification nécessaire pour la connexion réseau « %s »..."
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Obtention d'une adresse réseau pour « %s »..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Connexion réseau « %s » active"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Démarrage de la connexion VPN « %s »..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Authentification nécessaire pour la connexion VPN « %s »..."
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Obtention d'une adresse VPN pour « %s »..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Connexion VPN « %s » active"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Aucune connexion réseau"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Disponible"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Connexion établie"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Vous êtes maintenant connecté au réseau lié."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Préparation de la connexion liée « %s »..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Configuration de la connexion liée « %s »..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Authentification nécessaire pour la connexion liée « %s »..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Obtention d'une adresse pour « %s »..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Connexion liée « %s » active"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Vous êtes maintenant connecté au réseau pont."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Préparation de la connexion pont « %s »..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Configuration de la connexion pont « %s »..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Authentification nécessaire pour la connexion pont « %s »..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Connexion pont « %s » active"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Code PUK erroné ; contactez votre fournisseur."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Envoi du code de déverrouillage..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Connexion mobile (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Connexion mobile"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Disponible"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Nouvelle connexion mobile..."
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Connexion établie"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Vous êtes maintenant connecté au réseau mobile."
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Réseau mobile."
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Vous êtes maintenant enregistré sur le réseau domestique."
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 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:103
+#: ../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:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Préparation de la connexion mobile « %s »..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Configuration de la connexion mobile « %s »..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
-"Authentification personnelle nécessaire pour la connexion mobile "
-"« %s »..."
+"Authentification personnelle nécessaire pour la connexion mobile « %s »..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Connexion mobile « %s » active"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Nouvelle connexion mobile (CDMA)..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Vous êtes maintenant connecté au réseau CDMA."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "Réseau CDMA."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automatique"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Réseaux Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Réseau Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Réseaux Ethernet"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Réseau Ethernet"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../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:171
+#: ../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:174
+#: ../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:177
+#: ../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:180
+#: ../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:184
+#: ../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:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Authentification DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Nouvelle connexion mobile (GSM)..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Vous êtes maintenant connecté au réseau GSM."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "Réseau GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "InfiniBand automatique"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "Réseaux InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Réseau InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "Réseaux InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "Réseau InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Vous êtes maintenant connecté au réseau InfiniBand."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Préparation de la connexion InfiniBand « %s »..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Configuration de la connexion InfiniBand « %s »..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Authentification nécessaire pour la connexion InfiniBand « %s »..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "Connexion InfiniBand « %s » active"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Vous êtes maintenant connecté au réseau en équipe."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Préparation de la connexion en équipe « %s »..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Configuration de la connexion en équipe « %s »..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Authentification nécessaire pour la connexion en équipe « %s »..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Connexion en équipe « %s » active"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Vous êtes maintenant connecté au VLAN."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Préparation de la connexion VLAN « %s »..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Configuration de la connexion VLAN « %s »..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Authentification nécessaire pour la connexion VLAN « %s »..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "Connexion VLAN « %s » active"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Se connecter à un réseau Wi-Fi invisible..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Créer un _nouveau réseau Wi-Fi..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(aucun)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Réseaux Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Réseau Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 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:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "le Wi-Fi est désactivé"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 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:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Plus de réseaux"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Réseaux Wi-Fi disponibles"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 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:1242
+#: ../src/applet-device-wifi.c:1364
 #, 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:1273
+#: ../src/applet-device-wifi.c:1399
 #, 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:1276
+#: ../src/applet-device-wifi.c:1402
 #, 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:1279
+#: ../src/applet-device-wifi.c:1405
 #, 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:1282
+#: ../src/applet-device-wifi.c:1408
 #, 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:1303
+#: ../src/applet-device-wifi.c:1419
 #, 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:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Connexion au réseau Wi-Fi « %s » active"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "L'activation de la connexion a échoué"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "L'ajout de la nouvelle connexion a échoué"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX mobile (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX mobile"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "le WiMAX est désactivé"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "le WiMAX est désactivé par un commutateur matériel"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Vous êtes maintenant connecté au réseau WiMAX."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Connexion mobile « %s » active : (%d %%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "itinérance"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Erreur lors de l'affichage des informations de connexion :"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP dynamique"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adresses"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Aucune"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (par défaut)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Inconnue"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "inconnu"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "inconnu"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "Adresse IP :"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Inconnue"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Adresse IP :"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Adresse de broadcast :"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Masque de sous-réseau :"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Route par défaut :"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Masque de sous-réseau :"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "Wi-Fi 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Général"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interface :"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Adresse matérielle :"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Pilote :"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Vitesse :"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Sécurité :"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR :"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID :"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Route par défaut :"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignoré"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Type de VPN :"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Passerelle pour le VPN"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Nom d'utilisateur pour le VPN :"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Bannière pour le VPN :"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Connexion de base :"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Inconnue"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Aucune connexion valide active trouvée !"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1144,102 +932,109 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "et beaucoup d'autres contributeurs et traducteurs de la communauté"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 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:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Site Web de NetworkManager"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Ressources manquantes"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Mot de passe du réseau mobile"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Un mot de passe est requis pour vous connecter à « %s »."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Déverrouillage SIM PIN requis"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 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:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
 "used."
 msgstr ""
-"La connexion mobile « %s » a besoin d'un code SIM PIN pour "
-"pouvoir être utilisé."
+"La connexion mobile « %s » a besoin d'un code SIM PIN pour pouvoir être "
+"utilisé."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Code PIN :"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Afficher le code PIN"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Déverrouillage SIM PUK requis"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 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:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
 "used."
 msgstr ""
-"La connexion mobile « %s » a besoin d'un code SIM PUK pour "
-"pouvoir être utilisé."
+"La connexion mobile « %s » a besoin d'un code SIM PUK pour pouvoir être "
+"utilisé."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Code PUK :"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Nouveau code PIN :"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Resaisissez le nouveau code PIN :"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Afficher les codes PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1249,18 +1044,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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Supprimer"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_norer automatiquement les routes obtenues"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1268,9 +1086,8 @@ 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:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1278,15 +1095,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Créer…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1339,48 +1156,41 @@ msgid "Bonded _connections:"
 msgstr "_Connexions liées :"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "_Mode :"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "M_ode :"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "_Modifier"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "_Supprimer"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Modifier"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "_Fréquence de contrôle :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "Nom de l'interface :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "Contrôle du _lien :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "Cibl_es ARP :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1388,19 +1198,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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Délai de c_onnexion :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Délai de _déconnexion :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Principal :"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1408,12 +1218,30 @@ 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: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:"
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "octets"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 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:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Priorité :"
 
@@ -1425,44 +1253,89 @@ msgstr "Mode en épin_gle :"
 msgid "Bridged _connections:"
 msgstr "Pon_t entre connexions :"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "Dél_ai d'acheminement :"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "Délai _hello :"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Activer le _réseau"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Activer _STP (protocole Spanning Tree)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Durée maximum :"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_Durée de vie :"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatique"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "par défaut"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adresse"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adresse"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "N'importe quel appareil"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "La mise à jour des informations d'authentification de connexion a échoué en "
@@ -1563,79 +1436,79 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Contrôle du flux des priorités"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 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:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Priorité :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0 :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1 :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2 :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3 :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4 :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5 :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6 :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7 :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Classe du trafic :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Bande passante stricte :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Bande passante prioritaire :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Bande passante du groupe :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "Identifiant du groupe :"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 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:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1645,25 +1518,25 @@ msgstr ""
 "priorités peut utiliser pour la liaison. La somme allouée à tous les groupes "
 "doit faire 100%."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 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:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 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:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1676,7 +1549,7 @@ 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:4
+#: ../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
@@ -1684,8 +1557,9 @@ msgid "Sho_w password"
 msgstr "A_fficher le mot de passe"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1697,7 +1571,8 @@ msgstr "_Mot de passe :"
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatique"
@@ -1752,18 +1627,18 @@ msgstr "Négociation aut_omatique"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "Adresse M_AC du périphérique :"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Service :"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "Adresse _MAC clonée :"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1774,19 +1649,54 @@ msgstr ""
 "fonctionnalité est connue sous le nom de clonage ou usurpation MAC. "
 "Exemple : 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "MT_U :"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "octets"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Par défaut"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorer"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Broadcast"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Mot de passe de la clé privée :"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1826,8 +1736,8 @@ msgstr "Automatique avec paramétrage manuel du DNS"
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manuel"
 
@@ -1838,8 +1748,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Partagé avec d'autres ordinateurs"
 
@@ -1853,7 +1763,7 @@ msgstr "_Méthode :"
 msgid "Addresses"
 msgstr "Adresses"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1863,8 +1773,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:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1872,25 +1782,25 @@ 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.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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:14
+#: ../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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Ser_veurs DNS :"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1898,11 +1808,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1911,13 +1821,13 @@ 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:19
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Routes…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Désactivé"
 
@@ -1929,7 +1839,7 @@ msgstr "Activé (adresse publique préférée)"
 msgid "Enabled (prefer temporary address)"
 msgstr "Activé (adresse temporaire préférée)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 "
@@ -1939,15 +1849,15 @@ 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:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "Extensions de confidentialité IPv6 :"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1957,71 +1867,38 @@ msgstr ""
 "configuration IPv6 échoue."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "N'importe lequel"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Préférer 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Préférer 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Préférer 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "N'utiliser que 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Basique"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "N_ombre :"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN :"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "Identifiant rés_eau :"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Type :"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Modifier..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN :"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "A_fficher les mots de passe"
 
@@ -2088,32 +1965,55 @@ msgid "_Teamed connections:"
 msgstr "_Connexions en équipe :"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "I_mporter une configuration en équipe à partir d'un fichier..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Importer une configuration en équipe à partir d'un fichier..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "Interface _parente :"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Nom de l'interface VLAN :"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "Adresse MA_C clonée :"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "Ident_ifiant VLAN :"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Numéro + du nom du périphérique"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + numéro"
 
@@ -2130,94 +2030,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastructure"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 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.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Taux :"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID :"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Canal :"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ban_de :"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "M_ode :"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID :"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Méthodes d'authentification autorisées"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2226,107 +2130,78 @@ msgstr ""
 "charge toutes les méthodes d'authentification. Si la connexion échoue, "
 "essayez d'en désactiver certaines."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "Adresse"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "Masque de réseau"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "Passerelle"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "Métrique"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "Préfixe"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Lien"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "En équipe"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Matériel"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Importer une configuration VPN enregistrée..."
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2334,29 +2209,79 @@ msgstr ""
 "La fenêtre d'édition de connexion n'a pas pu être initialisée en raison "
 "d'une erreur inconnue."
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Impossible de créer une nouvelle connexion"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "La suppression de la connexion a échoué"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Voulez-vous vraiment supprimer la connexion %s ?"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "Adresse"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Masque de réseau"
+
+#: ../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
+msgid "Gateway"
+msgstr "Passerelle"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Métrique"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Préfixe"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Modification de %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Modification de la connexion anonyme"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Nom de la connexion :"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Erreur lors de l'initialisation de l'éditeur"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "L'ajout de la connexion a échoué"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2364,175 +2289,213 @@ 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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Enregistrer toute modification apportée à cette connexion."
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Impossible de créer une connexion"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Impossible de modifier la connexion"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 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:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Erreur lors de l'initialisation de l'éditeur"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "L'ajout de la connexion a échoué"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "Erreur lors de l'enregistrement de la connexion"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "La propriété « %s » / « %s » n'est pas valide : %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "_Nom de la connexion :"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Exporter..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "jamais"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "maintenant"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Dernière utilisation"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Modifie la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "S'authentifier pour modifier la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Supprime la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "S'authentifier pour supprimer la connexion sélectionnée"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Aucun greffon VPN n'est installé."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Erreur lors de la création de la connexion"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Erreur lors de la modification de la connexion"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Sécurité 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 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:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Utiliser la sécurité 802.1_X pour cette connexion"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Impossible de charger l'interface utilisateur DCB."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Connexion lien %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Réseau Ethernet"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Réseau Wi-Fi"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Impossible de charger l'interface utilisateur du lien."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Principal :"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Connexion lien %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Impossible de charger l'interface utilisateur du pont."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Connexion pont %d"
@@ -2540,58 +2503,74 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Port du pont"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 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:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Impossible de charger l'interface utilisateur DCB."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Impossible de charger l'interface utilisateur DSL."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Connexion DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "Cette option verrouille cette connexion sur le périphérique réseau spécifié "
 "par son adresse MAC permanente saisie ici. Par exemple : 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Impossible de charger l'interface utilisateur Ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "Adresse _MAC clonée :"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2602,126 +2581,169 @@ 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD n'est pas lancé."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Impossible de charger l'interface utilisateur principale."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Impossible de charger l'interface utilisateur InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Connexion InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatique (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Adresses automatiques uniquement (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "Automatique (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "Adresses automatiques uniquement (PPP)"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "Automatique, adresses uniquement"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatique (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Adresses automatiques uniquement (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatique (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Adresses automatiques uniquement (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Lien-local uniquement"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Ser_veurs DNS supplémentaires :"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Do_maines de recherche supplémentaires :"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Modification des routes IPv4 pour %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Paramètres IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Impossible de charger l'interface utilisateur IPv4."
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "Automatique, adresses uniquement"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatique, DHCP uniquement"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Modification des routes IPv6 pour %s"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Paramètres IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Impossible de charger l'interface utilisateur IPv6."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Esclaves dupliqués"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, 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:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2730,25 +2752,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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "Esclave %s %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 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:370
+#: ../src/connection-editor/page-mobile.c:327
 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:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Sélection du type de fournisseur de connexion mobile"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2756,87 +2778,87 @@ 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:652
+#: ../src/connection-editor/page-mobile.c:561
 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, "
 "HSDPA, etc.)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 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:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "aucune"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Paramètres PPP"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Impossible de charger l'interface utilisateur PPP."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Sélectionnez le fichier à importer"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Erreur : le fichier ne contient pas de configuration JSON valide"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Impossible de charger l'interface utilisateur en équipe."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Connexion en équipe %d"
@@ -2844,47 +2866,56 @@ 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:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Port d'équipe"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (via « %s »)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Aucune connexion réseau"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Impossible de charger l'interface utilisateur VLAN."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Connexion VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Impossible de charger l'interface utilisateur VPN."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Impossible de trouver le service de greffon VPN pour « %s »."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Connexion VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2894,11 +2925,11 @@ msgstr ""
 "\n"
 "Erreur : aucun type de service VPN."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Sélectionner un type de connexion VPN"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2908,7 +2939,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:85
+#: ../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"
@@ -2916,73 +2947,93 @@ 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:201
+#: ../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)\""
+msgstr ""
+"Cette option verrouille cette connexion sur le périphérique réseau spécifié "
+"par son adresse MAC permanente saisie ici. Par exemple : 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Impossible de charger l'interface utilisateur Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "N'importe quel appareil"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Connexion Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "WEP dynamique (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA et WPA2 personnel"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA et WPA2 entreprise"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Sécurité Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 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-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "Impossible de charger l'interface utilisateur WiMAX."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Connexion WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Impossible d'importer la connexion VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2995,27 +3046,32 @@ msgstr ""
 "\n"
 "Erreur : %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Erreur inconnue"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Un fichier nommé « %s » existe déjà."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Remplacer"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Impossible d'exporter la connexion VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3026,11 +3082,11 @@ msgstr ""
 "\n"
 "Erreur : %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exporter la connexion VPN..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -3038,100 +3094,11 @@ msgstr ""
 "L'applet NetworkManager n'a pas pu trouver les ressources requises (le "
 "fichier .ui n'a pas été trouvé)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Configuration Bluetooth impossible (échec de connexion D-Bus : (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Configuration Bluetooth impossible (erreur de recherche de NetworkManager : "
-"(%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Utiliser un téléphone portable comme périphérique réseau (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Accéder à Internet à l'aide d'un téléphone portable (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Erreur : %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Échec de création de la connexion DUN : %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "Votre téléphone est prêt pour son utilisation"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "L'assistant de connexion mobile a été annulé"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Type d'équipement téléphonique inconnu (ni GSM, ni CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "type de modem inconnu."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "échec de connexion au téléphone."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "erreur lors de la modification de la connexion"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "déconnexion intempestive du téléphone."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "expiration de délai lors de la détection des détails du téléphone."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "Détection de la configuration du téléphone..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"L'adaptateur Bluetooth par défaut doit être activé avant de pouvoir "
-"configurer une connexion d'accès distant."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Échec de création de la connexion PAN : %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "Réseau %s"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Déverrouiller"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Déverrouiller automatiquement ce périphérique"
 
@@ -3139,33 +3106,36 @@ msgstr "Déverrouiller automatiquement ce périphérique"
 msgid "Connection Information"
 msgstr "Informations sur la connexion"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Connexions réseau actives"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
-"Votre connexion mobile est configurée avec les paramètres "
-"suivants :"
+msgstr "Votre connexion mobile est configurée avec les paramètres suivants :"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Votre périphérique :"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Votre fournisseur :"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Votre plan :"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3174,28 +3144,33 @@ msgid ""
 "Preferences menu."
 msgstr ""
 "Une connexion va maintenant être effectuée vers votre fournisseur de "
-"connexion mobile avec les paramètres que vous avez indiqués. "
-"Si la connexion échoue ou que vous n'avez pas accès aux ressources réseau, "
-"vérifiez une nouvelle fois les paramètres. Pour les modifier, choisissez "
-"« Connexions réseau » dans le menu Système > Préférences."
+"connexion mobile avec les paramètres que vous avez indiqués. Si la connexion "
+"échoue ou que vous n'avez pas accès aux ressources réseau, vérifiez une "
+"nouvelle fois les paramètres. Pour les modifier, choisissez « Connexions "
+"réseau » dans le menu Système > Préférences."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmation des paramètres de connexion mobile"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Pas dans la liste"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Choisissez votre plan :"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3208,68 +3183,84 @@ msgstr ""
 "Si vous avez des doutes sur le bon plan, interrogez votre fournisseur au "
 "sujet du nom du point d'accès (APN)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Choisissez votre plan de facturation"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Mon plan ne figure pas dans la liste..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Sélectionnez votre fournisseur dans la _liste :"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Fournisseur"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 ""
 "Je ne trouve pas mon fournisseur et je souhaite le saisir _manuellement :"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Fournisseur :"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 fournisseur utilise la technologie GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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 fournisseur utilise la technologie CDMA (1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Choisissez votre fournisseur"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../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:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Pays ou région"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Mon pays n'est pas dans la liste"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Périphérique GSM installé"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Périphérique CDMA installé"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3277,90 +3268,109 @@ msgstr ""
 "Cet assistant vous aide à configurer facilement une connexion mobile à large "
 "bande à un réseau cellulaire (3G)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Vous devez disposer des informations suivantes :"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Le nom de votre fournisseur"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Le nom de votre plan de facturation"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
-"Le nom du point d'accès (APN) de votre plan de facturation (dans "
-"certains cas)"
+"Le nom du point d'accès (APN) de votre plan de facturation (dans certains "
+"cas)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Créer une connexion pour cet appareil _mobile :"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "N'importe quel appareil"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Configuration d'une connexion mobile"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nouvelle connexion mobile"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Filaire"
+#: ../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 "Enregistrer le mot de passe seulement pour cet _utilisateur"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Enregistrer le mot de passe pour _tous les utilisateurs"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "Maillage OLPC"
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "De_mander ce mot de passe chaque fois"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#, fuzzy
+msgid "The password is not required"
+msgstr "Un mot de passe est requis pour vous connecter à « %s »."
 
-#: ../src/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "Mot de passe _secondaire :"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "Mot de passe _secondaire :"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+msgid "Sh_ow passwords"
+msgstr "A_fficher les mots de passe"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Se déconnecter"
+
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nouveau..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Aucune"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_réer"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3368,35 +3378,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/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Authentification nécessaire pour le réseau Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Authentification demandée par le réseau Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Création d'un nouveau réseau Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nouveau réseau Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connexion au réseau Wi-Fi invisible"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Réseau Wi-Fi invisible"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3404,31 +3414,55 @@ msgstr ""
 "Saisissez le nom et les détails de sécurité du réseau Wi-Fi invisible auquel "
 "vous voulez vous connecter."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "Mot de passe _secondaire :"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "A_fficher les mots de passe"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_Sécurité Wi-Fi :"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Co_nnexion :"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Ad_aptateur Wi-Fi :"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "Maillage OLPC"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3436,7 +3470,7 @@ msgstr ""
 "Ce programme fait partie de NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3444,138 +3478,151 @@ 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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "non activé"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "non enregistré"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Réseau domestique (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Réseau domestique"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "recherche"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "enregistrement refusé"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Réseau itinérant (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Réseau itinérant"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "Code PIN pour carte SIM « %s » sur « %s »"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Code PIN requis"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 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:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Connexion mobile « %s » active : (%d %%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "itinérance"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Connexion à %s"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Enregistrer le mot de passe seulement pour cet _utilisateur"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "Enregistrer le mot de passe pour _tous les utilisateurs"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificats DER ou PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Choisir un fichier PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Fichier PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Tous les fichiers"
 
@@ -3611,15 +3658,32 @@ msgstr "Authentification i_nterne :"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "P_ermettre le provisionnement PAC automatique"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Choisissez un certificat d'une autorité de certification..."
 
@@ -3647,15 +3711,46 @@ msgstr "Aucun certificat de CA n'est _requis"
 msgid "PEAP _version:"
 msgstr "Version de _PEAP :"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "De_mander ce mot de passe chaque fois"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Certificat du C_A :"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Les clés privées non chiffrées ne sont pas sûres."
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3669,11 +3764,11 @@ msgstr ""
 "\n"
 "(Vous pouvez protéger votre clé privée avec un mot de passe grâce à openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Choisissez votre certificat personnel..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Choisissez votre clé privée..."
 
@@ -3693,23 +3788,36 @@ msgstr "_Clé privée :"
 msgid "_Private key password:"
 msgstr "_Mot de passe de la clé privée :"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
@@ -3719,6 +3827,44 @@ msgstr "Protected EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Au_thentification :"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (par défaut)"
@@ -3743,6 +3889,292 @@ msgstr "A_fficher la clé"
 msgid "WEP inde_x:"
 msgstr "Inde_x WEP :"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Type :"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Activer la connexion mobile WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "_Aide"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Vous êtes maintenant connecté au réseau lié."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Préparation de la connexion liée « %s »..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Configuration de la connexion liée « %s »..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Authentification nécessaire pour la connexion liée « %s »..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Obtention d'une adresse pour « %s »..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Connexion liée « %s » active"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Vous êtes maintenant connecté au réseau pont."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Préparation de la connexion pont « %s »..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Configuration de la connexion pont « %s »..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Authentification nécessaire pour la connexion pont « %s »..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Connexion pont « %s » active"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Nouvelle connexion mobile (CDMA)..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Vous êtes maintenant connecté au réseau CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "Réseau CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Nouvelle connexion mobile (GSM)..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Vous êtes maintenant connecté au réseau GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "Réseau GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "InfiniBand automatique"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Réseaux InfiniBand (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Réseau InfiniBand (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Réseaux InfiniBand"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "Réseau InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Vous êtes maintenant connecté au réseau InfiniBand."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Préparation de la connexion InfiniBand « %s »..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Configuration de la connexion InfiniBand « %s »..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "Authentification nécessaire pour la connexion InfiniBand « %s »..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "Connexion InfiniBand « %s » active"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Vous êtes maintenant connecté au réseau en équipe."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Préparation de la connexion en équipe « %s »..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Configuration de la connexion en équipe « %s »..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Authentification nécessaire pour la connexion en équipe « %s »..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Connexion en équipe « %s » active"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Vous êtes maintenant connecté au VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Préparation de la connexion VLAN « %s »..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Configuration de la connexion VLAN « %s »..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Authentification nécessaire pour la connexion VLAN « %s »..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "Connexion VLAN « %s » active"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX mobile (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX mobile"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "le WiMAX est désactivé"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "le WiMAX est désactivé par un commutateur matériel"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Vous êtes maintenant connecté au réseau WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "inconnu"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "inconnu"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR :"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID :"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Mode :"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Adresse M_AC du périphérique :"
+
+#~ msgid "Any"
+#~ msgstr "N'importe lequel"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Préférer 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Préférer 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Préférer 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "N'utiliser que 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "I_mporter une configuration en équipe à partir d'un fichier..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastructure"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Erreur lors de l'enregistrement de la connexion"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "La propriété « %s » / « %s » n'est pas valide : %d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Automatique (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Adresses automatiques uniquement (PPP)"
+
+#~ msgid "Could not load WiMAX user interface."
+#~ msgstr "Impossible de charger l'interface utilisateur WiMAX."
+
+#~ msgid "WiMAX connection %d"
+#~ msgstr "Connexion WiMAX %d"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Configuration Bluetooth impossible (échec de connexion D-Bus : (%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Configuration Bluetooth impossible (erreur de recherche de "
+#~ "NetworkManager : (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Utiliser un téléphone portable comme périphérique réseau (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Accéder à Internet à l'aide d'un téléphone portable (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Erreur : %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Échec de création de la connexion DUN : %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Votre téléphone est prêt pour son utilisation"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "L'assistant de connexion mobile a été annulé"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Type d'équipement téléphonique inconnu (ni GSM, ni CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "type de modem inconnu."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "échec de connexion au téléphone."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "erreur lors de la modification de la connexion"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "déconnexion intempestive du téléphone."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "expiration de délai lors de la détection des détails du téléphone."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Détection de la configuration du téléphone..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "L'adaptateur Bluetooth par défaut doit être activé avant de pouvoir "
+#~ "configurer une connexion d'accès distant."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Échec de création de la connexion PAN : %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Réseau %s"
+
 #~ msgid "Primary DNS:"
 #~ msgstr "DNS primaire :"
 
diff --git a/po/gd.po b/po/gd.po
index 67c46863..0733b769 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eog\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
-"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-09-22 22:35+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-09-23 12:07+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
@@ -22,7 +21,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-09-15 06:24+0000\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Lìonra"
 
@@ -134,46 +133,90 @@ msgstr ""
 "Tagh TRUE air a shon mur eil thu ag iarraidh rabhaidhean mu theisteanasan CA "
 "ann an ceum 2 dhen dearbhadh EAP."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Aplaid NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Aplaid NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Dearbhadh 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+#, fuzzy
+msgid "C_onnect"
+msgstr "Ceangailte"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "Ainm an _lìonraidh:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr "ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr "tèarainte."
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Cha b' urrainn dhuinn an ceangal a chur ris/a chur an gnìomh"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Mearachd neo-aithnichte"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Dh'fhàillig an ceangal"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Cha b' urrainn dhuinn an ceangal ris an uidheam a bhriseadh"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Cha b' urrainn dhuinn an ceangal a bhriseadh"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Dh'fhàillig gnìomhachadh a' cheangail"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Na seall an teachdaireachd seo a-rithist"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -184,7 +227,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:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +237,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:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -205,7 +248,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:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -215,7 +258,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:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -225,7 +268,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:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -235,7 +278,7 @@ msgstr ""
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach do thòisich an t-"
 "seirbheis VPN."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -245,7 +288,7 @@ msgstr ""
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's nach robh rùintean VPN "
 "dligheach ann."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -255,7 +298,7 @@ msgstr ""
 "Dh'fhàillig an ceangal VPN \"%s\" a chionn 's gun robh na rùintean VPN mì-"
 "dhligheach."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -264,7 +307,7 @@ msgstr ""
 "\n"
 "Dh'fhàillig an ceangal VPN \"%s\"."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -275,7 +318,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:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +327,7 @@ msgstr ""
 "\n"
 "Bhris an ceangal VPN \"%s\" a chionn 's gun do stad an t-seirbheis VPN."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -293,7 +336,7 @@ msgstr ""
 "\n"
 "Bhris an ceangal VPN \"%s\"."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -304,19 +347,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Chaidh an ceangal VPN a stèidheachadh.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Teachdaireachd clàradh a-steach VPN"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Dh'fhàillig an ceangal VPN"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -330,7 +373,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -343,522 +386,311 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "chan eil an t-uidheam deiseil (bathar-an-sàs a dhìth)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "chan eil an t-uidheam deiseil"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "chan eil ceangal ann tuilleadh"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Cuir crìoch air a' cheangal"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "chan eil an t-uidheam fo stiùireadh"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Chan eil uidheaman lìonraidh ri làimh"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_Ceanglaicheann VPN"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Rèitich VPN..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Cuir crìoch air a' cheangal ris a' VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Chan eil an NetworkManager 'na ruith..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Chaidh lìonraidhean a chur à comas"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Cuir lìonraidhean a_n comas"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Cuir an comas _WiFi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Cuir an comas bann-leathann _mobile"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Cuir an comas bann-leathann WiMA_X"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Cuir an comas na _brathan"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Fiosrachadh mun cheangal"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Deasaich na ceanglaichean..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "_Cobhair"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Mu dhèidhinn"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Tha thu air ceangal a dhèanamh ri \"%s\"."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Chan eil ceangal ann tuilleadh"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Bhris an ceangal lìonraidh."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Ag ullachadh a' cheangail lìonraidh \"%s\"..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, 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:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Ag iarraidh seòladh lìonraidh airson \"%s\"..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Tha an ceangal lìonraidh \"%s\" beò"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "A' tòiseachadh a' cheangail VPN \"%s\"..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, 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:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Ag iarraidh seòladh VPN airson \"%s\"..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Tha an ceangal VPN  \"%s\" gnìomhach"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Chan eil ceangal ris an lìonra"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Aplaid NetworkManager"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Ri làimh"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Chaidh ceangal a dhèanamh"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Tha thu air ceangal a dhèanamh ris an lìonra bannaichte."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Ag ullachadh a' cheangail bhannaichte \"%s\"..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "A' rèiteachadh a' cheangail bhannaichte \"%s\"..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr ""
-"Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal bannaichte a "
-"dhèanamh ri \"%s\"..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Ag iarraidh seòladh airson \"%s\"..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Tha an ceangal bannaichte \"%s\" gnìomhach"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Tha thu air ceangal a dheànamh ris an lìonra drochaidichte."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Ag ullachadh a' cheangail dhrochaidichte \"%s\"..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "A' rèiteachadh ceangail dhrochaidichte \"%s\"..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr ""
-"Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal drochaidichte a "
-"dhèanamh ri \"%s\"..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Tha an ceangal drochaidichte \"%s\" gnìomhach"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Tha am PUK cearr; cuir fios gun t-solaraiche agad."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "A' cur a' chòd a bheir a' ghlais dheth..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Bann-leathann mobile (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Bann-leathann mobile"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Ri làimh"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Ceangal bann-leathainn mobile ùr..."
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Chaidh ceangal a dhèanamh"
+
+#: ../src/applet-device-broadband.c:816
 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:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Lìonra bann-leathainn mobile."
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 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:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 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:103
+#: ../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:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Ag ullachadh a' cheangail bhann-leathainn mobile \"%s\"..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "A' rèiteachadh a' cheangail bhann-leathainn mobile \"%s\"..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Tha an ceangal bann-leathann mobile \"%s\" gnìomhach"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Ceangal bann-leathann mobile (CDMA) ùr..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Tha thu air ceangal a dhèanamh ris an lìonra CDMA."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "Lìonra CDMA."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet fèin-obrachail"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Lìonraidhean Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Lìonra Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Lìonraidhean Ethernet"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Lìonra Ethernet"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../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:171
+#: ../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:174
+#: ../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:177
+#: ../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:180
+#: ../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:184
+#: ../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:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Dearbhadh  DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Ceangal bann-leathainn mobile (GSM) ùr..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Tha thu air ceangal a dhèanamh ris an lìonra GSM."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "Lìonra GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "InfiniBand fèin-obrachail"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "Lìonraidhean InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Lìonra InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "Lìonraidhean InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "Lìonra InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Tha thu air ceangal a dhèanamh ris an lìonra InfiniBand."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Ag ullachadh a' cheangail InfiniBand \"%s\"..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "A' rèiteachadh ceangail InfiniBand \"%s\"..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr ""
-"Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal a dhèanamh ris a' "
-"InfiniBand \"%s\"..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "Tha an ceangal InfiniBand \"%s\" gnìomhach"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Tha thu air ceangal a dhèanamh ris an lìonra sgioba."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Ag ullachadh a' cheangail sgioba \"%s\"..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "A' rèiteachadh a' cheangail sgioba \"%s\"..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr ""
-"Tha feum air dearbhadh a' chleachdaiche airson a' cheangail sgioba \"%s\"..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Tha an ceangal sgioba \"%s\" gnìomhach"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Tha thu air ceangal a dhèanamh ris a' VLAN."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Ag ullachadh a' cheangail VLAN \"%s\"..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "A' rèiteachadh a' cheangail VLAN \"%s\"..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr ""
-"Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal a dhèanamh ris a' "
-"VLAN \"%s\"..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "Tha an ceangal VLAN  \"%s\" gnìomhach"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Ceangail ri lìonra WiFi falaichte..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Cruthaich lìonra WiFi ù_r..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(chan eil gin)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Lìonraidhean WiFi (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Lìonra WiFi (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Lìonra WiFi"
@@ -866,296 +698,244 @@ msgstr[1] "Lìonraidhean WiFi"
 msgstr[2] "Lìonraidhean WiFi"
 msgstr[3] "Lìonraidhean WiFi"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Tha WiFi à comas"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Chaidh am WiFi a chur à comas le suidse chruaidh"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Barrachd lìonraidhean"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Lìonraidhean WiFi a tha ri làimh"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr ""
 "Cleachd clàr-taice nan lìonraidhean gus ceangal a dhèanamh ri lìonra WiFi"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Tha thu air ceangal a dhènamh ris an lìonra Wi-Fi \"%s\"."
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Ag ullachadh ceangal lìonraidh WiFi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "A' rèiteachadh ceangail lìonra WiFi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, 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 WiFi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Ag iarraidh seòladh lìonra WiFi airson \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Tha an ceangal lìonra WiFi \"%s\" gnìomhach: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Tha an ceangal lìonra WiFi \"%s\" gnìomhach"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Dh'fhàillig gnìomhachadh a' cheangail"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Cha b' urrainn dhuinn ceangal ùr a chur ris"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Bann-leathann mobile WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "Bann-leathann mobile WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "Tha WiMAX à comas"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "Chaidh WiMAX a chur à comas le suidse chruaidh"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Tha thu air ceangal a dhèanamh ris an lìonra WiMAX."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, 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/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "air fàrsan"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Mearachd a' taisbeanadh fiosrachadh a' cheangal:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamic WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Seòlaidhean"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (bun-roghainn)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Chan eil fhios dè an t-astar"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "neo-aithnichte"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "neo-aithnichte"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "Seòladh IP:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Neo-aithnichte"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Seòladh IP:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Seòladh craolaidh:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Subnet Mask:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Neo-aithnichte"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "An t-slighe bhunaiteach:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Subnet Mask:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Coitcheann"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Eadar-aghaidh:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Seòladh bathair-chruaidh:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Draibhear:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Astar:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Tèarainteachd:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "An t-slighe bhunaiteach:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Air a leigeil seachad"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Seòrsa a' VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Bealach VPN:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Ainm-chleachdaiche VPN:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Bratach VPN:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Ceangal bunasach:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Neo-aithnichte"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Cha deach ceangal gnìomhach dligheach a lorg!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1163,44 +943,44 @@ msgstr ""
 "Còir-lethbhreac  © 2005-2008 Novell, Inc.\n"
 "agus iomadh com-pàirtiche coimhearsnachd agus eadar-theangadairean"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 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:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Làrach-lìn NetworkManager"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Goireasan a tha a dhìth"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Facail-faire lìonra bann-leathainn mobile"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, 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:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Facal-faire:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Feumaidh tu a' ghlais a thoirt far an SIM le PIN"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 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:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1210,25 +990,25 @@ msgstr ""
 "mobile \"%s\" mus gabh a chleachdadh."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Còd PIN :"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Seall an còd PIN"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Feumaidh tu a' ghlais a thoirt far an SIM le PUK"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 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:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1238,27 +1018,34 @@ msgstr ""
 "mobile \"%s\" mus gabh a chleachdadh."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Còd PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Còd PIN ùr:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 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:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Seall còdaichean PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1268,19 +1055,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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Sguab às"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 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:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1288,9 +1098,8 @@ msgstr ""
 "Ma tha seo an comas, cha dèid an ceangal seo a chleachdadh idir mar an "
 "ceangal lìonraidh bunaiteach."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1298,15 +1107,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Cruthaich..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1360,48 +1169,41 @@ msgid "Bonded _connections:"
 msgstr "_Ceanglaichean bannaichte:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "_Modh:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "M_odh:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "D_easaich"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "_Sguab às"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "D_easaich"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Marasgladh an _triceid:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "Ainm na h-_eadar-aghaidh:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "Marasgladh a’ _cheangail:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "_Targaidean ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1409,19 +1211,19 @@ 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Dàil a' cheangail _suas:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Dàil a' cheangal _a-nuas:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Prìomh uidheam:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1429,12 +1231,30 @@ 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "baidhtean"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 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:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Prìomhachas:"
 
@@ -1446,44 +1266,89 @@ msgstr "Modh _Hairpin:"
 msgid "Bridged _connections:"
 msgstr "_Ceanglaichean drochaidichte:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "_Dàil adhairt:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "Àm _fàilteachaidh:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Cuir lìonraidhean a_n comas"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Cuir an comas _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "Aois as _motha:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "Àm _aoiseachaidh:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "fèin-obrachail"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "bun-roghainn"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Seòladh"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Seòladh"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Uidheam sam bith"
+
+#: ../src/connection-editor/ce-page.c:591
 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 "
@@ -1584,79 +1449,79 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Smachd srutha a' phrìomhachais"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 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:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Prìomhachas:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Clas trafaige:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Leud-banna teann:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Prìomhachas an leud-banna:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Leud-banna a' bhuidhinn:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "ID a' bhuidhinn:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 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:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1666,25 +1531,25 @@ 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 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:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 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:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1697,7 +1562,7 @@ 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:4
+#: ../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
@@ -1705,8 +1570,9 @@ 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:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1718,7 +1584,8 @@ msgstr "_Facal-faire:"
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
@@ -1773,18 +1640,18 @@ msgstr "Co-rèitich gu fèi_n-obrachail"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "Seòladh MAC an _uidheim:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Seirbheis:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "Seòladh MAC c_lònaichte:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1795,19 +1662,54 @@ msgstr ""
 "gnìomhach air. Canar clònachadh MAC no spoofing ris, mar eisimpleir "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "baidhtean"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Bun-roghainn"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Leig seachad"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Craoladh"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Facal-faire na h-iuchrach _phrìobhaideach"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1846,8 +1748,8 @@ msgstr "Gu fèin-obrachail le roghainnean DNS làimhe"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "A làimh"
 
@@ -1858,8 +1760,8 @@ msgstr "Link-Local"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Co-roinnte ri coimpiutairean eile"
 
@@ -1873,7 +1775,7 @@ msgstr "_Dòigh:"
 msgid "Addresses"
 msgstr "Seòlaidhean"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1883,8 +1785,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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1892,25 +1794,25 @@ msgstr ""
 "Cleachdar àrainnean-lìn nuair a thathar a' fuasgladh ainmean òstairean. "
 "Cleachd cromagan gus diofar àrainnean-lìn a sgaradh o chèile."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Fri_thealaichean DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1919,11 +1821,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1932,13 +1834,13 @@ msgstr ""
 "dhan cheangal coileanadh ma dh'fhàilligeas an rèiteachadh IPv4 ach ma thèid "
 "leis an rèiteachadh IPv6."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_ Rùtaichean..."
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "À comas"
 
@@ -1950,7 +1852,7 @@ msgstr "An comas ('s fhearr leis seòladh poblach)"
 msgid "Enabled (prefer temporary address)"
 msgstr "An comas ('s fhearr leis seòladh sealach)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 "
@@ -1960,15 +1862,15 @@ msgstr ""
 "thathar a' fuasgladh ainmean òstairean. 'S e an eadar-aghaidh a cheanglas a "
 "bhios san sgòp aig seòlaidhean ionadail a' cheangail gu fèin-obrachail."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 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.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1978,71 +1880,38 @@ msgstr ""
 "leis an rèiteachadh IPv4."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Gin dhiubh"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Cleachd 3G (UMTS/HSPA) seach càch"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Cleachd 2G (GPRS/EDGE) seach càch"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Cleachd 4G (LTE) seach càch"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Na cleachd ach 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Bunasach"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Ài_reamh:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Adhartach"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "ID an _lìonraidh:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Seòrsa:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Atharraich..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "Sea_ll na faclan-faire"
 
@@ -2108,32 +1977,55 @@ msgid "_Teamed connections:"
 msgstr "_Ceanglaichean sgioba:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "Io_n-phortaich rèiteachadh sgioba o fhaidhle..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Ion-phortaich rèiteachadh sgioba o fhaidhle..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "Eadar-aghaidh _pàraint:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, 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:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "Seòladh MAC _clònaichte"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "ID _VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Ainm ⁊ àireamh an uidheim"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" ⁊ àireamh"
 
@@ -2150,94 +2042,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Bun-structar"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 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.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Reat:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "S_eanail:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ban_n:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "M_odh:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Dòighean dearbhaidh a tha ceadaichte"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2246,107 +2142,78 @@ msgstr ""
 "dearbhaidh sam bith. Ma dh'fhàilligeas na ceanglaichean, feuch is cuir à "
 "comas cuid dhe na dòighean."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "Seòladh"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "Masg-lìn"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "Bealach"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "Meatraig"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "Ro-leasachan"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "WiFi"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Bann"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Sgioba"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Drochaid"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Bathar-cruaidh"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Biortail"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Ion-phortaich rèiteachadh VPN a chaidh a shàbhaladh..."
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2354,30 +2221,80 @@ msgstr ""
 "Cha b' urrainn dhuinn còmhradh deasaiche nan ceanglaichean a thòiseachadh "
 "air sgàth mearachd neo-aithnichte."
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Cha b' urrainn dhuinn an ceangal ùr a chruthachadh"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Dh'fhàillig sguabadh às a' cheangail"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "Seòladh"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Masg-lìn"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:842
+#: ../src/connection-editor/ip6-routes-dialog.c:784
+#: ../src/connection-editor/page-ip4.c:1106
+#: ../src/connection-editor/page-ip6.c:1104
+msgid "Gateway"
+msgstr "Bealach"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Meatraig"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Ro-leasachan"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "A' deasachadh %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "A' deasachadh ceangal gun ainm"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Ainm a' cheangail:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Mearachd a' tòiseachadh an deasaiche"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Cha b' urrainn dhuinn an ceangal a chur ris"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2385,70 +2302,65 @@ 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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Sàbhail"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 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:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Cha b' urrainn dhuinn an ceangal a chruthachadh"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Cha b' urrainn dhuinn an ceangal a dheasachadh"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 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:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Mearachd a' tòiseachadh an deasaiche"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Cha b' urrainn dhuinn an ceangal a chur ris"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "Mearachd a' sàbhaladh a' cheangail"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Tha an roghainn \"%s\" / \"%s\" mì-dhligheach: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "_Ainm a' cheangail:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "Às-p_hortaich"
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "chan ann idir"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "an-dràsta"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2457,7 +2369,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:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2466,7 +2378,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:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2475,7 +2387,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:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2484,7 +2396,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:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2493,84 +2405,127 @@ 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:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Ainm"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Cleachdadh mu dheireadh"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Deasaich an ceangal a thagh thu"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 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:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Sguab às an ceangal a thagh thu"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 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:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Cha deach plugan VPN a stàladh."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Mearachd a' cruthachadh a' cheangail"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Mearachd a' deasachadh a' cheangail"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Tèarainteachd 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 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:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Cleachd tèarainteachd 802.1_X airson a' cheangail seo."
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche DCB a luchdadh."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Ceangal banntach %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Lìonra Ethernet"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Lìonra WiFi"
+
+#: ../src/connection-editor/page-bond.c:447
 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:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Prìomh uidheam:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Ceangal banntach %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 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:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Ceangal drochaide %d"
@@ -2578,62 +2533,78 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Port drochaide"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 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:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 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:139
+#: ../src/connection-editor/page-dsl.c:129
 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:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Ceangal DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "Tha an roghainn seo a' glasadh a' cheangail seo ri uidheam an lìonraidh a "
 "chaidh a shònrachadh leis an t-seòladh MAC bhuan aige a chaidh a chur a-"
 "steach an-seo. Ball-eisimpleir: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 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:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "Seòladh MAC c_lònaichte:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:55
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Bun-roghainn"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2644,127 +2615,170 @@ 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "Chan eil FirewallD a' ruith."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 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:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 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:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Ceangal nfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Fèin-obrachail (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Seòlaidhean (VPN) fèin-obrachail a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "Fèin-obrachail (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "Seòlaidhean (PPP) fèin-obrachail a-mhàin"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "Gu fèin-obrachail, seòlaidhean a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Fèin-obrachail (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Seòlaidhean (PPPoE) fèin-obrachail a-mhàin"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Fèin-obrachail (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 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:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Link-Local a-mhàin"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Fri_thealaichean DNS a bharrachd:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Àrainnean-lìn l_uirg a bharrachd:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "A' deasachadh rùtaichean IPv4 airson %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Roghainnean IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche IPv4 a luchdadh."
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "Gu fèin-obrachail, seòlaidhean a-mhàin"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Leig seachad"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Gu fèin-obrachail, DHCP a-mhàin"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "A' deasachadh rùtaichean IPv6 airson %s"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Roghainnean IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Cha b' urrainn duinn eadar-aghaidh cleachdaiche IPv6 a luchdadh."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Dùblaich tràillean"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, 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:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2773,27 +2787,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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s tràill %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 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:370
+#: ../src/connection-editor/page-mobile.c:327
 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:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Tagh seòrsa solaraiche a' bhann-leathainn mobile"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2801,89 +2815,89 @@ 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:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Tha an solaraiche agam a' cleachdadh teicneolas stèidhichte air _GSM (m.e. "
 "GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 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:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "chan eil gin"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Roghainnean PPP"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche PPP a luchdadh."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../src/connection-editor/page-team.c:98
+#: ../src/connection-editor/page-team-port.c:71
+#: ../src/connection-editor/vpn-helpers.c:165
 msgid "Select file to import"
 msgstr "Tagh am faidhle a tha ri ion-phortadh"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Mearachd: chan eil rèiteachadh JSON dligheach am broinn an fhaidhle"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 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:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Ceangal sgioba %d"
@@ -2891,11 +2905,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:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Port an sgioba"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 msgid "Could not load team port user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh airson port sgioba a' chleachdaiche a "
@@ -2904,36 +2918,45 @@ 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (tro \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Chan eil ceangal ris an lìonra"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche VLAN a luchdadh."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Ceangal VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche a luchdadh."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Cha b' urrainn dhuinn an t-seirbheis plugan VPN airson \"%s\" a lorg."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Ceangal VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2943,11 +2966,11 @@ msgstr ""
 "\n"
 "Mearachd: às aonais seòrsa seirbheis VPN."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Tagh seòrsa a' cheangail VPN"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2957,7 +2980,7 @@ 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:85
+#: ../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"
@@ -2966,75 +2989,96 @@ msgstr ""
 "(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:201
+#: ../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)\""
+msgstr ""
+"Tha an roghainn seo a' glasadh a' cheangail seo ri uidheam an lìonraidh a "
+"chaidh a shònrachadh leis an t-seòladh MAC bhuan aige a chaidh a chur a-"
+"steach an-seo. Ball-eisimpleir: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche WiFi a luchdadh."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Uidheam sam bith"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Ceangal WiFi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Dynamic WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ⁊ WPA2 pearsanta"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Cha b' urrainn an eadar-aghaidh cleachdaiche airson tèarainteachd WiFi a "
 "luchdadh; tha roghainn WiFi a dhith."
 
-#: ../src/connection-editor/page-wifi-security.c:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Tèarainteachd WiFi"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "Cha b' urrainn dhuinn an eadar-aghaidh cleachdaiche airson tèarainteachd "
 "WiFi a luchdadh."
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "Cha b' urrainn dhuinn eadar-aghaidh cleachdaiche WiMAX a luchdadh."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Ceangal WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Chan urrainn dhuinn an ceangal VPN ion-phortadh"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3047,27 +3091,32 @@ msgstr ""
 "\n"
 "Mearachd: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Mearachd neo-aithnichte"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, 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:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Cuir 'na àite"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Chan urrainn dhuinn an ceangal VPN às-phortadh"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3078,11 +3127,11 @@ msgstr ""
 "\n"
 "Mearachd: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Às-phortaich ceangal VPN..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -3090,102 +3139,11 @@ msgstr ""
 "Cha b' urrainn dhan aplaid NetworkManager cuid a ghoireasan a lorg air a "
 "bheil feum (cha deach am faidhle .ui a lorg)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Cha ghabh Bluetooth a rèiteachadh (cha b' urrainn dhuinn ceangal ri D-Bus: "
-"(%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Cha ghabh Bluetooth a rèiteachadh (mearachd a' lorg NetworkManager: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Cleachd am fòn-làimhe agad mar uidheam lìonraidh (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr ""
-"Faigh cothrom air an eadar-lìon a' cleachdadh an fhòn-làimhe agad (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Mearachd: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Dh'fhàillig cruthachadh a' cheangail DUN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "Tha fòn agad deiseil gus a chleachdadh a-nis!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Sguireadh dhen draoidh mobile"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr ""
-"Seòrsa de dh'uidheam fòn nach aithne dhuinn (chan e GSM no CDMA a tha ann)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "seòrsa de mhòdam nach aithne dhuinn."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "cha b' urrainn dhuinn ceangal ris an fhòn."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "mearachd a' faighinn a' cheangail bus"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "bhris an ceangal ris an fhòn gu h-obann."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "dh'fhalbh an ùine oirnn nuair a bha sinn a' lorg rèiteachadh an fhòn."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "A' lorg rèiteachadh an fhòn..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Feumaidh tu am freagarraichear bunaiteach Bluetooth a chur an comas mus "
-"suidhich thu ceangal Dial-Up."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Dh'fhàillig cruthachadh a' cheangail PAN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "Lìonra %s"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Thoir a' ghlas dheth"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Thoir a' ghlais far an uidheim seo gu fèin-obrachail"
 
@@ -3193,32 +3151,37 @@ msgstr "Thoir a' ghlais far an uidheim seo gu fèin-obrachail"
 msgid "Connection Information"
 msgstr "Fiosrachadh mun cheangal"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Ceanglaichean lìonraidh a tha an gnìomh"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "An t-uidheam agad:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "An solaraiche agad:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Am plana agad:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3232,23 +3195,28 @@ msgstr ""
 "Gus roghainnean a' cheangail bhann-leathainn mobile agad atharrachadh, tagh "
 "\"Ceanglaichean lìonraidh\" on chlàr-taice \"Siostam\" » \"Roghainnean\"."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Neo-liostaichte"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../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/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3262,70 +3230,86 @@ msgstr ""
 "Mur eil thu cinnteach dè am plana a tha agad, iarr fiosrachadh mu APN a' "
 "phlana agad."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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/libnm-gtk/nm-mobile-wizard.c:563
+#: ../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/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Tagh an solaraiche aga o _liosta:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Solaraiche"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 ""
 "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:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Solaraiche:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 ""
 "Tha an solaraiche agam a' cleachdadh teicneolas GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Tagh an solaraiche agad"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3333,89 +3317,108 @@ msgstr ""
 "Bheir an cuidiche seo cobhair dhut ceangal bann-leathainn mobile a "
 "stèidheachadh ri lìonra mobile (3G)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../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:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../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."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../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"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(uaireannan) am plana bileachadh bann-leathainn APN (Access Point Name) agad"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Uidheam sam bith"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../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"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Ceangal bann-leathainn mobile ùr"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Uèirichte"
+#: ../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 "Na glèidh am facal-faire ach airson a' _chleachdaiche seo"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Glèidh am facal-faire airson n_a h-uile cleachdaiche"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Iarr a_m facal-faire seo gach turas"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#, fuzzy
+msgid "The password is not required"
+msgstr "Tha feum air facail-faire mus gabh ceangal a dhèanamh ri \"%s\"."
 
-#: ../src/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../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/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Facal-faire dàrnach:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../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/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Cuir crìoch air a' cheangal"
+
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Ùr..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Chan eil gin"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_ruthaich"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3423,35 +3426,35 @@ msgstr ""
 "Tha feum air faclan-faire no iuchraichean crioptachaidh mus fhaighear "
 "cothrom air an lìonra WiFi \"%s\"."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Tha feum air dearbhadh lìonra WiFi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Tha an lìonra WiFi ag iarraidh dearbhadh"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Cruthaich lìonra WiFi ùr"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Lìonra WiFi ùr"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Cuir a-steach ainm airson an lìonra WiFi a tha thu airson cruthachadh."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Ceangail ri lìonra WiFi falaichte"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Lìonra WiFi falaichte"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3459,31 +3462,55 @@ msgstr ""
 "Cuir a-steach ainm agus fiosrachadh tèarainteachd an lìonraidh WiFi "
 "fhalaichte a tha thu airson ceangal ris."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Facal-faire dàrnach:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "Sea_ll na faclan-faire"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_Tèarainteachd WiFi:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "C_eangal:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptar WiFi:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Cleachdadh:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3491,7 +3518,7 @@ msgstr ""
 "Tha am prògram seo 'na phàirt de NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3499,139 +3526,152 @@ msgstr ""
 "Cha deach a dhealbhadh mar eadar-obrachadh command-line ach airson a ruith "
 "air deasg GNOME."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "à comas"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "gun chlàradh"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Lìonra-dachaigh (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Lìonra-dachaigh"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "'ga lorg"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "chaidh an clàradh a dhiùltadh"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Lìonra  air fàrsan (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Lìonra  air fàrsan"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, 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:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Tha feum air còd PIN"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 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:619
+#, 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:622
+msgid "roaming"
+msgstr "air fàrsan"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "ceangal %s"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Na glèidh am facal-faire ach airson a' _chleachdaiche seo"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "Glèidh am facal-faire airson n_a h-uile cleachdaiche"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Teisteanasan DER no PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Tagh faidhle PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Faidhlichean PAC  (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "A h-uile faidhle"
 
@@ -3667,15 +3707,32 @@ msgstr "_Inner Authentication:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Ceadaich PAC _Provisioning fèin-obrachail"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Tagh teisteanas Certificate Authority..."
 
@@ -3703,15 +3760,46 @@ msgstr "Chan eil teisteanas CA _riatanach"
 msgid "PEAP _version:"
 msgstr "_Tionndadh PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Iarr a_m facal-faire seo gach turas"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Teisteanas C_A:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Chan eil iuchraichean prìobhaideach gun chrioptachadh tèarainte"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3727,11 +3815,11 @@ msgstr ""
 "(Faodaidh tu an iuchair phrìobhaideach agad a dhìon le facal-faire le "
 "openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Tagh an teisteanas pearsanta agad..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Tagh an iuchair phrìobhaideach agad..."
 
@@ -3751,23 +3839,36 @@ msgstr "_Iuchair phrìobhaideach"
 msgid "_Private key password:"
 msgstr "Facal-faire na h-iuchrach _phrìobhaideach"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
@@ -3777,6 +3878,44 @@ msgstr "Protected EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "De_arbhadh:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (Bun-roghainn)"
@@ -3801,6 +3940,306 @@ msgstr "Se_all an iuchair"
 msgid "WEP inde_x:"
 msgstr "Clàr-a_mais WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Seòrsa:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Cuir an comas bann-leathann WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "_Cobhair"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Tha thu air ceangal a dhèanamh ris an lìonra bannaichte."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Ag ullachadh a' cheangail bhannaichte \"%s\"..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "A' rèiteachadh a' cheangail bhannaichte \"%s\"..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr ""
+#~ "Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal bannaichte a "
+#~ "dhèanamh ri \"%s\"..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Ag iarraidh seòladh airson \"%s\"..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Tha an ceangal bannaichte \"%s\" gnìomhach"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Tha thu air ceangal a dheànamh ris an lìonra drochaidichte."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Ag ullachadh a' cheangail dhrochaidichte \"%s\"..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "A' rèiteachadh ceangail dhrochaidichte \"%s\"..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr ""
+#~ "Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal drochaidichte a "
+#~ "dhèanamh ri \"%s\"..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Tha an ceangal drochaidichte \"%s\" gnìomhach"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Ceangal bann-leathann mobile (CDMA) ùr..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Tha thu air ceangal a dhèanamh ris an lìonra CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "Lìonra CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Ceangal bann-leathainn mobile (GSM) ùr..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Tha thu air ceangal a dhèanamh ris an lìonra GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "Lìonra GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "InfiniBand fèin-obrachail"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Lìonraidhean InfiniBand (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Lìonra InfiniBand (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Lìonraidhean InfiniBand"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "Lìonra InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Tha thu air ceangal a dhèanamh ris an lìonra InfiniBand."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Ag ullachadh a' cheangail InfiniBand \"%s\"..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "A' rèiteachadh ceangail InfiniBand \"%s\"..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr ""
+#~ "Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal a dhèanamh ris "
+#~ "a' InfiniBand \"%s\"..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "Tha an ceangal InfiniBand \"%s\" gnìomhach"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Tha thu air ceangal a dhèanamh ris an lìonra sgioba."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Ag ullachadh a' cheangail sgioba \"%s\"..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "A' rèiteachadh a' cheangail sgioba \"%s\"..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr ""
+#~ "Tha feum air dearbhadh a' chleachdaiche airson a' cheangail sgioba \"%s"
+#~ "\"..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Tha an ceangal sgioba \"%s\" gnìomhach"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Tha thu air ceangal a dhèanamh ris a' VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Ag ullachadh a' cheangail VLAN \"%s\"..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "A' rèiteachadh a' cheangail VLAN \"%s\"..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr ""
+#~ "Tha feum air dearbhadh a' chleachdaiche mus gabh ceangal a dhèanamh ris "
+#~ "a' VLAN \"%s\"..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "Tha an ceangal VLAN  \"%s\" gnìomhach"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Bann-leathann mobile WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Bann-leathann mobile WiMAX"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "Tha WiMAX à comas"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "Chaidh WiMAX a chur à comas le suidse chruaidh"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Tha thu air ceangal a dhèanamh ris an lìonra WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "neo-aithnichte"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "neo-aithnichte"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Modh:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Seòladh MAC an _uidheim:"
+
+#~ msgid "Any"
+#~ msgstr "Gin dhiubh"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Cleachd 3G (UMTS/HSPA) seach càch"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Cleachd 2G (GPRS/EDGE) seach càch"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Cleachd 4G (LTE) seach càch"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Na cleachd ach 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "Io_n-phortaich rèiteachadh sgioba o fhaidhle..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "Bun-structar"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Mearachd a' sàbhaladh a' cheangail"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Tha an roghainn \"%s\" / \"%s\" mì-dhligheach: %d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Fèin-obrachail (PPP)"
+
+#~ 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)."
+#~ msgstr ""
+#~ "Cha ghabh Bluetooth a rèiteachadh (cha b' urrainn dhuinn ceangal ri D-"
+#~ "Bus: (%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Cha ghabh Bluetooth a rèiteachadh (mearachd a' lorg NetworkManager: (%s) "
+#~ "%s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Cleachd am fòn-làimhe agad mar uidheam lìonraidh (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr ""
+#~ "Faigh cothrom air an eadar-lìon a' cleachdadh an fhòn-làimhe agad (DUN)"
+
+#~ 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!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Sguireadh dhen draoidh mobile"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr ""
+#~ "Seòrsa de dh'uidheam fòn nach aithne dhuinn (chan e GSM no CDMA a tha ann)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "seòrsa de mhòdam nach aithne dhuinn."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "cha b' urrainn dhuinn ceangal ris an fhòn."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "mearachd a' faighinn a' cheangail bus"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "bhris an ceangal ris an fhòn gu h-obann."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr ""
+#~ "dh'fhalbh an ùine oirnn nuair a bha sinn a' lorg rèiteachadh an fhòn."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "A' lorg rèiteachadh an fhòn..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Feumaidh tu am freagarraichear bunaiteach Bluetooth a chur an comas mus "
+#~ "suidhich thu ceangal Dial-Up."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Dh'fhàillig cruthachadh a' cheangail PAN: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Lìonra %s"
+
 #~ msgid "Primary DNS:"
 #~ msgstr "A' phrìomh DNS:"
 
@@ -3834,12 +4273,6 @@ msgstr "Clàr-a_mais WEP:"
 #~ msgid "Wired network"
 #~ msgstr "Lìonra uèir"
 
-#~ msgid "ad-hoc"
-#~ msgstr "ad-hoc"
-
-#~ msgid "secure."
-#~ msgstr "tèarainte."
-
 #~ msgid "WiMAX network"
 #~ msgstr "Lìonra WiMAX"
 
diff --git a/po/gl.po b/po/gl.po
index c81e27e0..05ed29da 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-01 21:43+0200\n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-07-01 21:44+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Red"
 
@@ -136,46 +136,90 @@ msgstr ""
 "Estabelecer isto a certo para desactivar as notificacións sobre certificados "
 "CA na fase 2 da autenticación EAP."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Miniaplicación NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Miniaplicación NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticación 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "C_onectar"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "Nome da _rede:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Produciuse un erro ao engadir/activar a conexión"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Fallou na conexión"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Produciuse un erro ao desconectar o dispositivo"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Produciuse un erro ao desconectar"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Produciuse un erro ao activar a conexión"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Non mostrar esta mensaxe outra vez"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -185,7 +229,7 @@ msgstr ""
 "\n"
 "A conexión VPN '%s' fallou porque se interrompeu a conexión de rede."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +238,7 @@ msgstr ""
 "\n"
 "A conexión VPN '%s' fallou porque o servizo VPN se detivo inesperadamente."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -205,7 +249,7 @@ msgstr ""
 "A conexión VPN '%s' fallou porque o servizo VPN devolveu unha configuración "
 "non válida."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -215,7 +259,7 @@ msgstr ""
 "A conexión VPN '%s' fallou porque a tentativa de conexión excedeu o tempo de "
 "espera."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -224,7 +268,7 @@ msgstr ""
 "\n"
 "A conexión VPN '%s' fallou porque o servizo VPN non comezou a tempo."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -234,7 +278,7 @@ msgstr ""
 "A conexión VPN '%s' fallou porque produciuse un erro ao iniciar o servizo "
 "VPN."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -243,7 +287,7 @@ msgstr ""
 "\n"
 "A conexión VPN '%s' fallou porque non había contrasinais VPN válidos."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -252,7 +296,7 @@ msgstr ""
 "\n"
 "A conexión VPN '%s' fallou porque había contrasinais VPN non válidos."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -261,7 +305,7 @@ msgstr ""
 "\n"
 "A conexión VPN '%s' fallou."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -271,7 +315,7 @@ msgstr ""
 "\n"
 "A conexión VPN '%s' desconectouse porque se interrompeu a conexión de rede."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -280,7 +324,7 @@ msgstr ""
 "\n"
 "A conexión VPN '%s' desconectouse porque se detivo o servizo VPN."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -289,7 +333,7 @@ msgstr ""
 "\n"
 "A conexión VPN '%s' desconectouse."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -300,19 +344,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "A conexión VPN estabelecida correctamente.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Mensaxe de inicio de sesión VPN"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Fallou a conexión VPN"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -326,7 +370,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -339,804 +383,548 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "o dispositivo non está listo (falta o firmware)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "o dispositivo non está listo"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconectado"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "o dispositivo non está xestionado"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Non hai dispositivos de rede dispoñíbeis"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Conexións _VPN"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Configurar VPN…"
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Desconectar VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "O NetworkManager non se está executando…"
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Rede desactivada"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Activar a _rede"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Activar sen _fíos"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Activar a banda larga _móbil"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Activar a banda larga móbil WiMA_X"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Activar n_otificacións"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Información da conexión"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Editar as conexións…"
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "_Axuda"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Agora está conectado a '%s'."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "A conexión de rede foi desconectada."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Preparando a conexión de rede '%s'…"
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Requírese unha autenticación de usuario para a conexión de rede '%s'…"
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Solicitando un enderezo de rede para '%s'…"
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "A conexión de rede '%s' está activa"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Iniciando a conexión de rede VPN '%s'…"
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Requírese unha autenticación de usuario para a conexión VPN '%s'…"
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Solicitando un enderezo VPN para '%s'…"
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "A conexión VPN '%s' está activa"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Sen conexión de rede"
 
-#: ../src/applet.c:3628
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Miniaplicación NetworkManager"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Dispoñíbl"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Estabeleceuse a conexión"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Agora está conectado á rede «bonded»."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Preparando a conexión bond '%s'…"
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Configurando a conexión bond '%s'…"
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Requírese unha autenticación de usuario para a conexión bond '%s'…"
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Solicitando un enderezo para '%s'…"
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "A conexión bond '%s' está activa"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Agora está conectado á rede «bridged» ."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Preparando a conexión bridge '%s'…"
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Configurando a conexión bridge '%s'…"
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Requírese unha autenticación de usuario para a conexión bridge '%s'…"
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "A conexión bridge '%s' está activa"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 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:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Enviando código de desbloqueo…"
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda larga móbil (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Banda larga móbil"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Dispoñíbl"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Nova conexión de banda larga móbil…"
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Estabeleceuse a conexión"
+
+#: ../src/applet-device-broadband.c:816
 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:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Rede de banda larga móbil."
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Agora está rexistrado na rede de casa. "
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Agora está rexistrado nunha rede de «roaming»."
 
-#: ../src/applet-device-bt.c:103
+#: ../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:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Preparando a conexión de banda larga móbil '%s'…"
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Configurando a conexión de banda larga móbil '%s'…"
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
 "Requírese unha autenticación de usuario para a conexión de banda larga móbil "
 "'%s'…"
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "A conexión de banda larga móbil '%s' está activa"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "NovacConexión de banda larga móbil automática (CDMA)…"
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Agora está conectado á rede CDMA."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "Rede CDMA."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automático"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Redes con fíos (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Rede con fíos (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Redes con fíos"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Rede con fíos"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../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:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Preparando a conexión de rede con fíos «%s»…"
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Configurando a conexión de rede con fíos «%s»…"
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Requírese autenticación de usuario para a rede con fíos '%s'…"
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Solicitando un enderezo de rede con fíos para «%s»…"
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "A conexión de rede con fíos «%s» está activa"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticación DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Nova conexión de banda larga móbil automática (GSM)…"
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Agora está conectado á rede GSM."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "Rede GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "InfiniBand automática"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "Redes InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Rede InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "Redes InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "Rede InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Agora está conectado á rede InfiniBand."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Preparando a conexión InfiniBand '%s'…"
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Configurando a conexión InfiniBand '%s'…"
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr ""
-"Requírese unha autenticación de usuario para a conexión InfiniBand «%s»…"
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "A conexión InfiniBand '%s' está activa"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Agora está conectado á rede de equipo."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Preparando a conexión de equipo '%s'…"
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Configurando a conexión de equipo '%s'…"
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr ""
-"Requírese unha autenticación de usuario para a conexión de equipo '%s'…"
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "A conexión de equipo '%s' está activa"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Agora está conectado á rede VLAN."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Preparando a conexión VLAN '%s'…"
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Configurando a conexión VLAN '%s'…"
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Requírese unha autenticación de usuario para a conexión VLAN '%s'…"
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "A conexión VLAN '%s' está activa"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Conectarse a unha rede sen fíos oculta…"
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Crear unha rede sen fíos _nova…"
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ningunha)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Redes sen fíos (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rede sen fíos (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 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:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "A rede sen fíos está desactivada"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Rede sen fíos desactivada polo interruptor físico"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Máis redes"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Redes sen fíos dispoñíbeis"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 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:1242
+#: ../src/applet-device-wifi.c:1364
 #, 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:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Preparando a conexión de rede sen fíos «%s»…"
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, 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:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr ""
 "Requírese autenticación de usuario para a conexión de rede sen fíos «%s»…"
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, 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:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "A conexión de rede sen fíos '%s' está activa: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "A conexión de rede sen fíos '%s' está activa"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Produciuse un erro ao activar a conexión"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Produciuse un erro ao engadir a nova conexión"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Banda larga móbil WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "Banda larga móbil WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "a rede WiMAX está desactivada"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "a rede WiMAX está desactivada por un interruptor de hardware"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Agora está conectado á rede WiMAX."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, 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/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "roaming"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Produciuse un erro ao mostrar a información de conexión:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP dinámica"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Enderezos"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ningunha"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (predeterminada)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "descoñecido"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "descoñecido"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "Enderezo IP:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Enderezo IP:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Enderezo broadcast:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Máscara de subrede:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Camiño predeterminado:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Máscara de subrede:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Xeral"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Enderezo de hardware:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Controlador:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Seguranza:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Camiño predeterminado:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Tipo de VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Pasarela do VPN:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Nome de usuario da VPN:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Mensaxe da VPN:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Conexión base:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Descoñecida"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Non se atoparon conexións activas válidas!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1144,44 +932,44 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "e moitos outros contribuíntes e tradutores da comunidade"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 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:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Sitio web do NetworkManager"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Faltan recursos"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Contrasinal de rede de banda larga móbil"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Requírese un contrasinal para conectarse a '%s'."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Requírese un código PIN de desbloqueo"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 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:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1191,25 +979,25 @@ msgstr ""
 "usalo."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Código PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Mostrar o código PIN"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Requírese un código PUK"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 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:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1219,27 +1007,34 @@ msgstr ""
 "usalo."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Código PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Código PIN novo:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 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:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Mostrar os códigos PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1249,27 +1044,49 @@ msgstr ""
 "O enderezo IP identifica o seu computador na rede. Prega o botón «Engadir» "
 "para engadir un enderezo IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Eliminar"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_norar os camiños obtidos automaticamente"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 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:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1277,15 +1094,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Crear…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1338,48 +1155,41 @@ msgid "Bonded _connections:"
 msgstr "_Conexións unidas (bonded):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "_Modo:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "M_odo:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "_Editar"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "_Eliminar"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Editar"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Frecuencia de _monitorización:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "Nome da _interface:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "Monitorización _ligazón:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "_Obxectivos ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1387,19 +1197,19 @@ 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Atraso da li_gazón>"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Atraso da _desligazón:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Primario:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1407,12 +1217,30 @@ 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: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:"
+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
+msgid "bytes"
+msgstr "bytes"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 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:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
@@ -1424,44 +1252,89 @@ msgstr "Modo _horquilla:"
 msgid "Bridged _connections:"
 msgstr "_Conexións mediante bridge:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "Atraso da _redirección:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "Tempo de _hello:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Activar a _rede"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Activar _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "Idade _máxima:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "Tempo de _envecellamento:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automático"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "predeterminado"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Enderezo"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Enderezo"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Calquera dispositivo"
+
+#: ../src/connection-editor/ce-page.c:591
 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 "
@@ -1562,77 +1435,77 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Prioridade do fluxo de control"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 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:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Prioridade:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Clase de tráfico:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Ancho de banda estrito:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Prioridade do ancho de banda:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Ancho de bando do grupo:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "ID do grupo:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 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:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1641,25 +1514,25 @@ msgstr ""
 "Escriba o porcentaxe de ancho de banda permitido para cada grupo de "
 "prioridade. A suma de todos os grupos debe ser o 100% total."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 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:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 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:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1672,7 +1545,7 @@ 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:4
+#: ../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
@@ -1680,8 +1553,9 @@ 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:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1693,7 +1567,8 @@ msgstr "_Contrasinal:"
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automático"
@@ -1748,18 +1623,18 @@ msgstr "Negociar aut_omaticamente"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "Enderezo _MAC do dispositivo:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Servizo:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "Enderezo MAC _clonado:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1769,19 +1644,54 @@ msgstr ""
 "dispositivo de rede na que está activada esta conexión. Esta característica "
 "coñécese como clonado de MAC ou spoofing. Por exemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "bytes"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Predeterminado"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorar"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Broadcast"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Contrasinal de chave _privada:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1820,8 +1730,8 @@ msgstr "Automático con configuración de DNS manual"
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manual"
 
@@ -1833,8 +1743,8 @@ msgstr "Link-Local"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Compartida con outros computadores"
 
@@ -1848,7 +1758,7 @@ msgstr "_Método:"
 msgid "Addresses"
 msgstr "Enderezos"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1858,8 +1768,8 @@ msgstr ""
 "personalizar a configuración do seu equipo. Se quere usar un identificador "
 "de cliente 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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1867,25 +1777,25 @@ 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
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Servidores _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1894,11 +1804,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.h:17
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Require enderezo IPv_4 para que esta conexión complete"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1906,13 +1816,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Camiños…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Desactivado"
 
@@ -1924,7 +1834,7 @@ msgstr "Activado (preferir enderezos públicos)"
 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.h:17
 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 "
@@ -1935,15 +1845,15 @@ msgstr ""
 "múltiples. Os enderezos de ligazón local restrinxiranse automaticamente á "
 "interface de conexión."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 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.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Require enderezo IPv_6 para que esta conexión complete"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1952,71 +1862,38 @@ msgstr ""
 "a configuración IPv6 falla pero a IPv4 ten éxito."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Calquera"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Preferir 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Preferir 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Preferir 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Usar só 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Básico"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Nú_mero:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "ID de r_ede:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Tipo:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Cambiar…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "Mos_trar os contrasinais"
 
@@ -2083,32 +1960,55 @@ msgid "_Teamed connections:"
 msgstr "_Conexións de equipo:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "Importar unha configuración de equipo desde un ficheiro…"
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Importar unha configuración de equipo desde un ficheiro…"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "Interface _superior:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Nome da interface VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "Enderezo MAC _clonado:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "_ID VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Nome do dispositivo + número"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + número"
 
@@ -2125,94 +2025,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infraestrutura"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 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.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Velocidade:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "C_anle:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ban_da:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "M_odo:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Métodos de autenticación permitidos"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensíbel Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2221,107 +2125,78 @@ msgstr ""
 "métodos de autenticación. Se fallan as conexións, tente desactivar a "
 "compatibilidade con algúns métodos."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "Enderezo"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "Máscara de rede"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "Pasarela"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "Métrica"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "Prefixo"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Cableada"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Sen fíos"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Equipo"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Importar unha configuración VPN gardada…"
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2329,29 +2204,79 @@ msgstr ""
 "Non foi posíbel inicializar o diálogo do editor de conexións por mor dun "
 "erro descoñecido."
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Non foi posíbel crear a nova conexión"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Fallou a eliminación da conexión"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "Enderezo"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Máscara de rede"
+
+#: ../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
+msgid "Gateway"
+msgstr "Pasarela"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Métrica"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Prefixo"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Editando %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Editando unha conexión sen nome"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Nome da conexión:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Produciuse un erro ao inicializar o editor"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Fallou a inserción da conexión"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2359,173 +2284,211 @@ 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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Gardar calquera cambio feito nesta conexión."
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Non foi posíbel crear a conexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Non foi posíbel editar a conexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 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:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Produciuse un erro ao inicializar o editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Fallou a inserción da conexión"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "Produciuse un erro ao gardar a conexión"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "A propiedade «%s» / «%s» non é válida: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "_Nome da conexión:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "E_xportar…"
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nunca"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "agora"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Último uso"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Editar a conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentíquese para editar a conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Eliminar a conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentíquese para eliminar a conexión seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Non hai ningún engadido de VPN instalado."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Non sei como crear as conexións «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Produciuse un erro ao crear a conexión"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Produciuse un erro ao editar a conexión"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Non foi posíbel atopar unha conexión co UUID «%s»"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Seguridade 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 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:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Usar a seguridade 802.1_X para esta conexión"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Non foi posíbel cargar a interface de usuario de DCB."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Conexión Bond %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Rede con fíos"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Rede sen fíos"
+
+#: ../src/connection-editor/page-bond.c:447
 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:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Primario:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Conexión Bond %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 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:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Conexión bridge %d"
@@ -2533,58 +2496,74 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Porto bridge"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 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:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 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:139
+#: ../src/connection-editor/page-dsl.c:129
 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:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexión DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "Esta opción bloquea esta conexión ao dispositivo de rede especificado polo "
 "enderezo MAC introducido aquí. Por exemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Non foi posíbel cargar a interface de usuario cableada."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Cableada"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "Enderezo MAC _clonado:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:55
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2594,125 +2573,168 @@ 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD non se está executando."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Non foi posíbel cargar a interface de usuario Xeral."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Non foi posíbel cargar a interface de usuario InfiniBand"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Conexión InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automático (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Só enderezos automáticos (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "Automático (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "Só enderezos automáticos (PPP)"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "Automático, só enderezos"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automático (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Só enderezos automáticos (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automático (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Só enderezos automáticos (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Só ligazón local"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Servidores _DNS adicionais:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Dominios de _busca adicionais:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editando os camiños IPv4 para %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Configuración IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Non foi posíbel cargar a inferface de usuario IPv4."
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "Automático, só enderezos"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automático , só DHCP"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editando os camiños IPv6 para %s"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Configuración IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Non foi posíbel cargar a interface de usuario IPv6."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Duplicar escravos"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, 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:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2721,25 +2743,25 @@ msgstr ""
 "Os escravos «%s» e «%s» aplícanse a portos virtuais distingos («%s» e «%s») "
 "do mesmo dispositivo físico."
 
-#: ../src/connection-editor/page-master.c:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s esclavo %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 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:370
+#: ../src/connection-editor/page-mobile.c:327
 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:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Seleccione o tipo de provedor de banda larga móbil"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2747,87 +2769,87 @@ msgstr ""
 "Seleccione a tecnoloxía que emprega o seu provedor de banda larga móbil. Se "
 "non está seguro, pregúntelle ao seu provedor."
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 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, "
 "UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 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:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ningunha"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Configuración de PPP"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Non foi posíbel cargar a interface de usuario PPP."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Seleccione o ficheiro para importar"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Erro: o ficheiro non contén unha configuración JSON válida"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 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:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Conexión de equipo %d"
@@ -2835,47 +2857,56 @@ 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:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Porto de equipo"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (mediante \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Sen conexión de rede"
+
+#: ../src/connection-editor/page-vlan.c:596
 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:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Conexión VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Non foi posíbel cargar a interface de usuario VPN."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Non foi posíbel atopar o engadido de servizo de VPN para '%s'."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexión VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2885,11 +2916,11 @@ msgstr ""
 "\n"
 "Erro: non existe o tipo de servizo VPN."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Seleccione un tipo de conexión VPN"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2899,7 +2930,7 @@ msgstr ""
 "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/page-wifi.c:85
+#: ../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"
@@ -2907,73 +2938,93 @@ msgstr ""
 "Esta opción bloquea esta conexión ao punto de acceso sen fíos (AP) "
 "especificado polo BSSID introducido aquí. Por exemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"Esta opción bloquea esta conexión ao dispositivo de rede especificado polo "
+"enderezo MAC introducido aquí. Por exemplo: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 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:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Calquera dispositivo"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Conexión sen fíos %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Chave WEP de 40/128 bits (Hexadecimal ou ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "WEP dinámica (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Persoal"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Empresarial"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Seguranza sen fíos"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 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-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "Non foi posíbel cargar a interface de usuario WiMAX."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Conexión WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Non é posíbel importar a conexión VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2986,25 +3037,30 @@ msgstr ""
 "\n"
 "Erro: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Erro descoñecido"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Xa existe un ficheiro chamado «%s\"."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "Substituí_r"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Non é posíbel exportar a conexión VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3015,11 +3071,11 @@ msgstr ""
 "\n"
 "Erro: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exportar conexión VPN…"
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -3027,101 +3083,11 @@ msgstr ""
 "O miniaplicativo NetworkManager non puido atopar algúns recursos requiridos "
 "(non se atopou o ficheiro .ui)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"A configuración de Bluetooth non é posíbel (Non foi posíbel conectarse a D-"
-"Bus: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Non é posíbel a configuración de Bluetooth (produciuse un erro ao buscar o "
-"NetworkManager: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Usar o seu teléfono móbil como un dispositivo de rede (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Acceder a Internet usando o seu teléfono móbil (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Erro: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Produciuse un erro ao crear a conexión DUN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "O seu teléfono está listo para usarse"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Cancelouse o asistente móbil"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Tipo de dispositivo de teléfono descoñecido (non é GSM nin CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "tipo de módem descoñecido."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "produciuse un erro ao conectar co teléfono."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "Produciuse un erro ao obter a conexión do bus"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "o teléfono desconectouse de forma inesperada."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "expirou o tempo ao detectar os detalles do teléfono."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "Detectando a configuración do teléfono…"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"O adaptador de Bluetooth predeterminado debe estar activado antes de "
-"configurar unha conexión de rede de marcado telefónico."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Produciuse un erro ao crear unha conexión PAN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "Rede %s"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "Desbloq_uear"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Bloquear automaticamente este dispositivo"
 
@@ -3129,11 +3095,12 @@ msgstr "Bloquear automaticamente este dispositivo"
 msgid "Connection Information"
 msgstr "Información de conexión"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Conexións de rede activas"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
@@ -3141,21 +3108,25 @@ msgstr ""
 "preferenzas:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "O seu dispositivo:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "O seu plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3169,23 +3140,28 @@ msgstr ""
 "preferenzas de conexión da banda larga móbil, escolla «Conexións de rede» "
 "desde o menú Sistema >> Preferenzas."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirme as preferenzas da conexión de banda larga móbil"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Sen listar"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../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/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3197,67 +3173,83 @@ msgstr ""
 "\n"
 "Se non está seguro do seu plan pregúntelle ao seu provedor do seu plan APN."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "O meu plan non está listado…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provedor"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 puiden atopar o meu provedor e desexo inserilo _manualmente:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Provedor:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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 estado do seu provedor"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3265,90 +3257,109 @@ 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/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Vostede precisará a seguinte información:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "O nome do seu provedor de banda larga"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(nalgúns casos) O seu APN do plan de facturación de banda larga (Access "
 "Point Name)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Crear unha conexión para es_te dispositivo de banda larga móbil:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Calquera dispositivo"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nova conexión de banda larga móbil"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Con fíos"
+#: ../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 "Gardar o contrasinal só para este _usuario"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Almacenar o contrasinal para _todos os usuarios"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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 este contrasinal cada vez"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#, fuzzy
+msgid "The password is not required"
+msgstr "Requírese un contrasinal para conectarse a '%s'."
 
-#: ../src/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "Contrasinal _secundario:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "Contrasinal _secundario:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+msgid "Sh_ow passwords"
+msgstr "M_ostrar os contrasinais"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Desconectar"
+
+#: ../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/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nova…"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ningún"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3356,35 +3367,35 @@ msgstr ""
 "Son necesarios contrasinais ou chaves de cifrado para acceder á rede sen "
 "fíos «%s»."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Requírese a autenticación para a rede sen fíos"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "A rede sen fíos require autenticación"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Crear unha rede sen fíos"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Rede sen fíos nova"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Conectarse a unha rede sen fíos oculta"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Rede sen fíos oculta"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3392,31 +3403,55 @@ msgstr ""
 "Escriba o nome e os detalles de seguranza da rede sen fíos á que se quere "
 "conectarse."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "Contrasinal _secundario:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "M_ostrar os contrasinais"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_Seguranza sen fíos:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Co_nexión:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptador sen fíos:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3424,7 +3459,7 @@ msgstr ""
 "Este programa é un compoñente de NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3432,138 +3467,151 @@ 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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "desactivado"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "non rexistrado"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Rede doméstica (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Rede doméstica"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "buscando"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "denegouse o rexistro"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Rede roaming (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Rede roaming"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "Código PIN para a tarxeta SIM «%s» en «%s»"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Requírese un código PIN"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 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:619
+#, 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:622
+msgid "roaming"
+msgstr "roaming"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Conexión %s"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Gardar o contrasinal só para este _usuario"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "Almacenar o contrasinal para _todos os usuarios"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificados DER ou PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Seleccionar un ficheiro PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Ficheiros PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Todos os ficheiros"
 
@@ -3599,15 +3647,32 @@ msgstr "Autenticación i_nterna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir a provisión PAC _automática"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Seleccionar un certificado de Autoridade de Certificación…"
 
@@ -3635,15 +3700,46 @@ msgstr "Ningún certificado CA é _requirido"
 msgid "PEAP _version:"
 msgstr "Versión _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "_Preguntar este contrasinal cada vez"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Certificado C_A:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "As chaves privadas sen cifrar son inseguras"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3657,11 +3753,11 @@ msgstr ""
 "\n"
 "(Pode protexer a súa chave privada con un contrasinal con openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Seleccione o seu certificado persoal…"
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Seleccione a súa chave privada…"
 
@@ -3681,23 +3777,36 @@ msgstr "_Chave privada:"
 msgid "_Private key password:"
 msgstr "Contrasinal de chave _privada:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "RÁPIDO"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "TLS por medio de túnel"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protexido (PEAP)"
 
@@ -3707,6 +3816,44 @@ msgstr "EAP protexido (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Autenticación:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (Predeterminada)"
@@ -3731,6 +3878,296 @@ msgstr "Mo_strar a chave"
 msgid "WEP inde_x:"
 msgstr "Índic_e WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Activar a banda larga móbil WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "_Axuda"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Agora está conectado á rede «bonded»."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Preparando a conexión bond '%s'…"
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Configurando a conexión bond '%s'…"
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Requírese unha autenticación de usuario para a conexión bond '%s'…"
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Solicitando un enderezo para '%s'…"
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "A conexión bond '%s' está activa"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Agora está conectado á rede «bridged» ."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Preparando a conexión bridge '%s'…"
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Configurando a conexión bridge '%s'…"
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr ""
+#~ "Requírese unha autenticación de usuario para a conexión bridge '%s'…"
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "A conexión bridge '%s' está activa"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "NovacConexión de banda larga móbil automática (CDMA)…"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Agora está conectado á rede CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "Rede CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Nova conexión de banda larga móbil automática (GSM)…"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Agora está conectado á rede GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "Rede GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "InfiniBand automática"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Redes InfiniBand (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Rede InfiniBand (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Redes InfiniBand"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "Rede InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Agora está conectado á rede InfiniBand."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Preparando a conexión InfiniBand '%s'…"
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Configurando a conexión InfiniBand '%s'…"
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr ""
+#~ "Requírese unha autenticación de usuario para a conexión InfiniBand «%s»…"
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "A conexión InfiniBand '%s' está activa"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Agora está conectado á rede de equipo."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Preparando a conexión de equipo '%s'…"
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Configurando a conexión de equipo '%s'…"
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr ""
+#~ "Requírese unha autenticación de usuario para a conexión de equipo '%s'…"
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "A conexión de equipo '%s' está activa"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Agora está conectado á rede VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Preparando a conexión VLAN '%s'…"
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Configurando a conexión VLAN '%s'…"
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Requírese unha autenticación de usuario para a conexión VLAN '%s'…"
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "A conexión VLAN '%s' está activa"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Banda larga móbil WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Banda larga móbil WiMAX"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "a rede WiMAX está desactivada"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "a rede WiMAX está desactivada por un interruptor de hardware"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Agora está conectado á rede WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "descoñecido"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "descoñecido"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Modo:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Enderezo _MAC do dispositivo:"
+
+#~ msgid "Any"
+#~ msgstr "Calquera"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Preferir 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Preferir 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Preferir 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Usar só 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "Importar unha configuración de equipo desde un ficheiro…"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infraestrutura"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Produciuse un erro ao gardar a conexión"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "A propiedade «%s» / «%s» non é válida: %d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Automático (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Só enderezos automáticos (PPP)"
+
+#~ msgid "Could not load WiMAX user interface."
+#~ msgstr "Non foi posíbel cargar a interface de usuario WiMAX."
+
+#~ msgid "WiMAX connection %d"
+#~ msgstr "Conexión WiMAX %d"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "A configuración de Bluetooth non é posíbel (Non foi posíbel conectarse a "
+#~ "D-Bus: (%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Non é posíbel a configuración de Bluetooth (produciuse un erro ao buscar "
+#~ "o NetworkManager: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Usar o seu teléfono móbil como un dispositivo de rede (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Acceder a Internet usando o seu teléfono móbil (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Erro: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Produciuse un erro ao crear a conexión DUN: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "O seu teléfono está listo para usarse"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Cancelouse o asistente móbil"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Tipo de dispositivo de teléfono descoñecido (non é GSM nin CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "tipo de módem descoñecido."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "produciuse un erro ao conectar co teléfono."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "Produciuse un erro ao obter a conexión do bus"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "o teléfono desconectouse de forma inesperada."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "expirou o tempo ao detectar os detalles do teléfono."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Detectando a configuración do teléfono…"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "O adaptador de Bluetooth predeterminado debe estar activado antes de "
+#~ "configurar unha conexión de rede de marcado telefónico."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Produciuse un erro ao crear unha conexión PAN: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Rede %s"
+
 #~ msgid "Primary DNS:"
 #~ msgstr "DNS primario:"
 
diff --git a/po/gu.po b/po/gu.po
index 4e5c11a8..af2d7c31 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-09-01 10:08+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -21,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "નેટવર્ક"
 
@@ -44,8 +43,6 @@ msgstr "જોડાયેલ સૂચનાઓને નિષ્ક્રિ�
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
 #, fuzzy
-#| msgid ""
-#| "Set this to TRUE to disable notifications when connecting to a network."
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "જ્યારે નેટવર્ક ને જોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE તરીકે સુયોજિત "
@@ -57,24 +54,18 @@ msgstr "જોડાયેલ નહિં હોય તેવી સૂચન�
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
 #, fuzzy
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
-msgid "Set this to true to disable notifications when disconnecting from a network."
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "જ્યારે નેટવર્ક માંથી જોડાણને તોડી રહ્યા હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE "
 "તરીકે સુયોજિત કરો."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
-#| msgid "Disable connected notifications"
 msgid "Disable VPN notifications"
 msgstr "VPN સૂચનાઓને નિષ્ક્રિય કરો"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:6
 #, fuzzy
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -88,11 +79,10 @@ msgstr "નેટવર્ક ઉપલબ્ધ સૂચનાઓને દા
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
 #, fuzzy
-#| msgid ""
-#| "Set this to TRUE to disable notifications when wireless networks are "
-#| "available."
-msgid "Set this to true to disable notifications when Wi-Fi networks are available."
-msgstr "જ્યારે નેટવર્કો ઉપલ્બધ હોય ત્યારે સૂચનાઓને નિષ્ક્રિય કરવા માટે આને TRUE તરીકે સુયોજિત કરો."
+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
 msgid "Stamp"
@@ -108,9 +98,8 @@ msgstr "WiFi બનાવવાનું નિષ્ક્રિય કરો"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
 #, fuzzy
-#| msgid ""
-#| "Set to TRUE to disable creation of adhoc networks when using the applet."
-msgid "Set to true to disable creation of adhoc networks when using the applet."
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "જ્યારે એપલેટ ને વાપરી રહ્યા હોય ત્યારે adhoc નેટવર્કોને બનાવવાનું નિષ્ક્રિય કરવા માટે આને "
 "TRUE તરીકે સુયોજિત કરો."
@@ -124,7 +113,6 @@ msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:15
-#| msgid "Choose CA Certificate"
 msgid "Ignore CA certificate"
 msgstr "CA પ્રમાણપત્રને અવગણો"
 
@@ -140,47 +128,90 @@ msgid ""
 "authentication."
 msgstr ""
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
-#| msgid "Wired 802.1X authentication"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "નેટવર્ક વ્યવસ્થાપક"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "નેટવર્ક વ્યવસ્થાપક"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X સત્તાધિકરણ"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "જોડાવો (_o)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "નેટવર્ક નામ (_N):"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "જોડાણને ઉમેરવાનું/સક્રિય કરવામાં નિષ્ફળ"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "અજ્ઞાત ભૂલ"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "જોડાણ નિષ્ફળ"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "ઉપકરણનું જોડાણ તોડવામાં નિષ્ફળતા"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "નિષ્ફળતા જોડાયેલ નથી"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "જોડાણ સક્રિયકરણ નિષ્ફળ"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "ફરીથા આ સંદેશને બતાવો નહિં"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -190,7 +221,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે નેટવર્ક જોડાણ એ અટકેલ હતા."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -199,7 +230,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે VPN સેવા અનિચ્છનીય રીતે અટકેલ છે."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -209,7 +240,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે VPN સેવા એ અયોગ્ય રૂપરેખાંકન પાછુ લાવેલ છે."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -218,7 +249,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે જોડાણ પ્રયત્ન કરવાનો સમય સમાપ્ત થયેલ છે."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -227,7 +258,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે VPN સેવા સમય પર શરૂ થઇ ન હતી."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -236,7 +267,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે VPN સેવા શરૂ કરતી વખતે નિષ્ફળ."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -245,7 +276,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ કારણ કે VPN ગુપ્તતાઓ યોગ્ય ન હતી."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -254,7 +285,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ અયોગ્ય ગુપ્તતાઓને કારણે."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -263,7 +294,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' નિષ્ફળ."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -273,7 +304,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' જોડાયેલ નથી કારણ કે નેટવર્ક જોડાણ અટકેલ હતુ."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -282,7 +313,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' જોડાયેલ નથી કારણ કે VPN સેવા અટકેલ છે."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -291,7 +322,7 @@ msgstr ""
 "\n"
 "VPN જોડાણ '%s' જોડાયેલ નથી."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -299,19 +330,19 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr ""
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN પ્રવેશ સંદેશ"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN જોડાણ નિષ્ફળ"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -324,7 +355,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -337,869 +368,551 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "ઉપકરણ તૈયાર નથી (ગેરહાજર ફર્મવેર)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "ઉપકરણ તૈયાર નથી"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "જોડાયેલ નથી"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "જોડાણ તોડી નાંખો"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "ઉપકરણ સંચાલિત નથી"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "નેટવર્ક ઉપકરણો ઉપલ્બધ નથી"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "VPN જોડાણો (_V)"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "VPN ને રૂપરેખાંકિત કરો (_C)..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "VPN નુ જોડાણ તોડી નાંખો (_D)..."
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "નેટવર્ક વ્યવસ્થાપક ચાલતું નથી..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "નેટવર્કીંગ નિષ્ક્રિય થયેલ છે"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "નેટવર્કીંગને સક્રિય કરો (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
-#| msgid "Enable _Wireless"
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi ને સક્રિય કરો ( _W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "મોબાઇલ બ્રોડબેન્ડ ને સક્રિય કરો (_M)"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMAX મોબાઇલ બ્રોડબેન્ડને સક્રિય કરો (_X)"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "સૂચનાઓને સક્રિય કરો (_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "જોડાણ જાણકારી (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "જોડાણોમાં ફેરફાર કરો..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "મદદ (_H)"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "વિશે (_A)"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "તમે હવે '%s' માં જોડાયેલ છો."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "જોડાયેલ નથી"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "નેટવર્ક જોડાણ ને બિનજોડાણ કરી દેવામાં આવ્યુ છે."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "નેટવર્ક જોડાણ '%s' ને તૈયાર કરી રહ્યા છે..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "નેટવર્ક જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણની જરૂર છે..."
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' માટે નેટવર્ક સરનામાંની માંગણી કરી રહ્યા છે..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "નેટવર્ક જોડાણ '%s' સક્રિય છે"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN જોડાણ '%s' ને શરૂ કરી રહ્યા છે..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણની જરૂર છે..."
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s' માટે VPN સરનામાંનું સૂચન કરી રહ્યા છે..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN જોડાણ '%s' સક્રિય છે"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "નેટવર્ક જોડાણ નથી"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager એપ્લેટ"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "ઉપલબ્ધ"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "જોડાણ સ્થાપિત થયેલ છે"
-
-#: ../src/applet-device-bond.c:90
-#| msgid "You are now connected to the wired network."
-msgid "You are now connected to the bonded network."
-msgstr "તમે હવે બોન્ડ થયેલ નેટવર્ક સાથે જોડાયેલ છે."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing bond connection '%s'..."
-msgstr "બોન્ડ જોડાણ '%s' ની તૈયારી કરી રહ્યા છે..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-#| msgid "Configuring mobile broadband connection '%s'..."
-msgid "Configuring bond connection '%s'..."
-msgstr "બોન્ડ જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for bond connection '%s'..."
-msgstr "બોન્ડ જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણ જરૂરી..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-#| msgid "Requesting a VPN address for '%s'..."
-msgid "Requesting address for '%s'..."
-msgstr "'%s' માટે સરનામાંને સૂચિત કરી રહ્યા છે..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Bond connection '%s' active"
-msgstr "બોન્ડ જોડાણ '%s' સક્રિય"
-
-#: ../src/applet-device-bridge.c:90
-#| msgid "You are now connected to the wired network."
-msgid "You are now connected to the bridged network."
-msgstr "તમે હવે બ્રિજ થયેલ નેટવર્કમાં જોડાયેલ છે."
-
-#: ../src/applet-device-bridge.c:114
-#, fuzzy, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing bridge connection '%s'..."
-msgstr "નેટવર્ક જોડાણ '%s' ને તૈયાર કરી રહ્યા છે..."
-
-#: ../src/applet-device-bridge.c:117
-#, fuzzy, c-format
-#| msgid "Configuring wired network connection '%s'..."
-msgid "Configuring bridge connection '%s'..."
-msgstr "વાયરવાળુ નેટવર્ક જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "બ્રિજ જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણ જરૂરી..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Bridge connection '%s' active"
-msgstr "બ્રિજ જોડાણ '%s' સક્રિય"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "ખોટો PUK કોડ; મહેરબાની કરીને તમારા પોષણકર્તાનો સંપર્ક કરો."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "તાળુ ખૂલેલ કોડને મોકલી રહ્યા છે..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "મોબાઇલ બ્રોડબેન્ડ (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "મોબાઇલ બ્રોડબેન્ડ"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "ઉપલબ્ધ"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 #, fuzzy
-#| msgid "New Mobile Broadband Connection"
 msgid "New Mobile Broadband connection..."
 msgstr "નવું મોબાઇલ બ્રોડબેન્ડ જોડાણ"
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "જોડાણ સ્થાપિત થયેલ છે"
+
+#: ../src/applet-device-broadband.c:816
 #, fuzzy
-#| msgid "You are now connected to the mobile broadband network."
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "તમે હવે મોબાઇલ બ્રોડબૅન્ડ  નેટવર્ક સાથે જોડાયેલ છો."
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 #, fuzzy
-#| msgid "Mobile broadband network password"
 msgid "Mobile Broadband network."
 msgstr "મોબાઇલ બ્રોડબેન્ડ નેટવર્ક પાસવર્ડ"
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "તમે હવે ઘર નેટવર્ક પર રજીસ્ટર થયેલ છે."
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "તમે હવે રોમિંગ નેટવર્ક પર રજીસ્ટર થયેલ છે."
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "તમે હવે મોબાઇલ બ્રોડબૅન્ડ  નેટવર્ક સાથે જોડાયેલ છો."
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "મોબાઇલ બ્રોડબેન્ડ જોડાણ '%s' ની તૈયારી કરી રહ્યા છે..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "મોબાઇલ બ્રોડબેન્ડ જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "મોબાઇલ બ્રોડબેન્ડ જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણ જરૂરી..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "મોબાઇલ બ્રોડબેન્ડ જોડાણ '%s' સક્રિય"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "નવું મોબાઇલ બ્રોડબેન્ડ (CDMA) જોડાણ..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "તમે હવે CDMA નેટવર્ક સાથે જોડાયેલ છો."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "CDMA નેટવર્ક."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "સ્વયં ઇથરનેટ"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, fuzzy, c-format
-#| msgid "Wired Networks (%s)"
 msgid "Ethernet Networks (%s)"
 msgstr "વાયરલેસ નેટવર્કો (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, fuzzy, c-format
-#| msgid "Wired Network (%s)"
 msgid "Ethernet Network (%s)"
 msgstr "વાયરવાળા નેટવર્ક (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 #, fuzzy
-#| msgid "Wired Networks"
 msgid "Ethernet Networks"
 msgstr "વાયરવાળા નેટવર્કો"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 #, fuzzy
-#| msgid "Wired Network"
 msgid "Ethernet Network"
 msgstr "વાયરવાળુ નેટવર્ક"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 #, fuzzy
-#| msgid "You are now connected to the wired network."
 msgid "You are now connected to the ethernet network."
 msgstr "તમે હવે વાયરવાળુ નેટવર્ક સાથે જોડાયેલ છો."
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, fuzzy, c-format
-#| msgid "Preparing wired network connection '%s'..."
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "વાયરવાળુ નેટવર્ક જોડાણ '%s' ની તૈયારી કરી રહ્યા છે..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, fuzzy, c-format
-#| msgid "Configuring wired network connection '%s'..."
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "વાયરવાળુ નેટવર્ક જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, fuzzy, c-format
-#| msgid "User authentication required for wired network connection '%s'..."
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "વાયરવાળુ નેટવર્ક જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણની જરૂર છે..."
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, fuzzy, c-format
-#| msgid "Requesting a wired network address for '%s'..."
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' માટે વાયરવાળુ નેટવર્ક સરનામું સૂચન કરી રહ્યુ છે..."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
-#| msgid "Wired network connection '%s' active"
 msgid "Ethernet network connection '%s' active"
 msgstr "ઇથરનેટ નેટવર્ક જોડાણ '%s' સક્રિય"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL સત્તાધિકરણ"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "નવું મોબાઇલ બ્રોડબેન્ડ (GSM) જોડાણ..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "તમે હવે GSM નેટવર્ક સાથે જોડાયેલ છો."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "CDMA નેટવર્ક."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr ""
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-#| msgid "Wired Networks (%s)"
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand નેટવર્ક (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-#| msgid "Wired Network (%s)"
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand નેટવર્ક (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-#| msgid "Wired Networks"
-msgid "InfiniBand Networks"
-msgstr "InfiniBand નેટવર્ક"
-
-#: ../src/applet-device-infiniband.c:99
-#| msgid "Wired Network"
-msgid "InfiniBand Network"
-msgstr "InfiniBand નેટવર્ક"
-
-#: ../src/applet-device-infiniband.c:143
-#, fuzzy
-#| msgid "You are now connected to the wired network."
-msgid "You are now connected to the InfiniBand network."
-msgstr "તમે હવે વાયરવાળુ નેટવર્ક સાથે જોડાયેલ છો."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "InfiniBand જોડાણ '%s' ને તૈયારી કરી રહ્યા છે..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-#| msgid "Configuring mobile broadband connection '%s'..."
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "InfiniBand જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "InfiniBand જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણ જરૂરી..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand જોડાણ '%s' સક્રિય"
-
-#: ../src/applet-device-team.c:86
-#| msgid "You are now connected to the wired network."
-msgid "You are now connected to the teamed network."
-msgstr "તમે હવે જૂથ થયેલ નેટવર્ક સાથે જોડાયેલ છે."
-
-#: ../src/applet-device-team.c:110
-#, fuzzy, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing team connection '%s'..."
-msgstr "નેટવર્ક જોડાણ '%s' ને તૈયાર કરી રહ્યા છે..."
-
-#: ../src/applet-device-team.c:113
-#, fuzzy, c-format
-#| msgid "Configuring wired network connection '%s'..."
-msgid "Configuring team connection '%s'..."
-msgstr "વાયરવાળુ નેટવર્ક જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
-
-#: ../src/applet-device-team.c:116
-#, fuzzy, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for team connection '%s'..."
-msgstr "VPN જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણની જરૂર છે..."
-
-#: ../src/applet-device-team.c:123
-#, fuzzy, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Team connection '%s' active"
-msgstr "VPN જોડાણ '%s' સક્રિય છે"
-
-#: ../src/applet-device-vlan.c:204
-#, fuzzy
-#| msgid "You are now connected to the CDMA network."
-msgid "You are now connected to the VLAN."
-msgstr "તમે હવે CDMA નેટવર્ક સાથે જોડાયેલ છો."
-
-#: ../src/applet-device-vlan.c:228
-#, fuzzy, c-format
-#| msgid "Starting VPN connection '%s'..."
-msgid "Preparing VLAN connection '%s'..."
-msgstr "VPN જોડાણ '%s' ને શરૂ કરી રહ્યા છે..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-#| msgid "Starting VPN connection '%s'..."
-msgid "Configuring VLAN connection '%s'..."
-msgstr "VLAN જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "VLAN જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણની જરૂર છે..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "VLAN connection '%s' active"
-msgstr "VLAN જોડાણ '%s' સક્રિય"
-
-#: ../src/applet-device-wifi.c:96
-#| msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "છુપાયેલ Wi-Fi નેટવર્ક સાથે જોડાવો (_C)..."
 
-#: ../src/applet-device-wifi.c:147
-#| msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "નવાં Wi-Fi નેટવર્કને બનાવો (_N)..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(કંઇ નહિં)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
-#| msgid "Wired Networks (%s)"
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi નેટવર્ક (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
-#| msgid "Wired Network (%s)"
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi નેટવર્ક (%s)"
 
-#: ../src/applet-device-wifi.c:773
-#| msgid "Wired Network"
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi નેટવર્ક"
 msgstr[1] "Wi-Fi નેટવર્કો"
 
-#: ../src/applet-device-wifi.c:802
-#| msgid "WiMAX is disabled"
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi નિષ્ક્રિય થયેલ છે"
 
-#: ../src/applet-device-wifi.c:803
-#| msgid "WiMAX is disabled by hardware switch"
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "હાર્ડવેર સ્વિચ દ્દારા Wi-Fi નિષ્ક્રિય થયેલ છે"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "વધારે નેટવર્કો"
 
-#: ../src/applet-device-wifi.c:1042
-#| msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi નેટવર્ક ઉપલબ્ધ"
 
-#: ../src/applet-device-wifi.c:1043
-#| msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Wi-Fi નેટવર્ક સાથે જોડાવા માટે નેટવર્ક મેનુને વાપરો"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
-#| msgid "You are now connected to the wireless network '%s'."
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "તમે હવે Wi-Fi નેટવર્ક '%s' સાથે જોડાયેલ છે."
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
-#| msgid "Preparing network connection '%s'..."
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Wi-Fi નેટવર્ક જોડાણ '%s' ની તૈયારી કરી રહ્યા છે..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
-#| msgid "Configuring wired network connection '%s'..."
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Wi-Fi નેટવર્ક જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
-#| msgid "User authentication required for wireless network '%s'..."
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Wi-Fi નેટવર્ક '%s' માટે વપરાશકર્તા સત્તાધિકરણ જરૂરી..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
-#| msgid "Requesting a network address for '%s'..."
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "'%s' માટે Wi-Fi નેટવર્ક સરનામાંને સૂચિત કરી રહ્યા છે..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
-#| msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wi-Fi નેટવર્ક જોડાણ '%s' સક્રિય: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
-#| msgid "Wired network connection '%s' active"
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi નેટવર્ક જોડાણ '%s' સક્રિય"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "જોડાણને સક્રિય કરવામાં નિષ્ફળતા"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "નવા જોડાણને ઉમેરવામાં નિષ્ફળતા"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX મોબાઇલ બ્રોડબેન્ડ (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX મોબાઇલ બ્રોડબેન્ડ"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX નિષ્ક્રિય થયેલ છે"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "હાર્ડવેર સ્વિચ દ્દારા WiMAX નિષ્ક્રિય થયેલ છે"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "તમે હવે WiMAX નેટવર્ક સાથે જોડાયેલ છો."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "મોબાઇલ બ્રોડબેન્ડ જોડાણ '%s' સક્રિય: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "રોમિંગ"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "જોડાણ જાણકારીને દેખાડવામાં ભૂલ:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "ડાયનેમિક WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "સરનામું"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
-#| msgctxt "Wifi/wired security"
-#| msgid "None"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "કંઇ નહિં"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (મૂળભૂત)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "અજ્ઞાત"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "અજ્ઞાત"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP સરનામું:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP સરનામું:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "બ્રોડકાસ્ટ સરનામું:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "સબનેટ માસ્ક:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "મૂળભૂત માર્ગ:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "સબનેટ માસ્ક:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ઇથરનેટ (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "સામાન્ય"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "ઇન્ટરફેસ:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "હાર્ડવેર સરનામું:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ડ્રાઇવર:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "ઝડપ:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "સુરક્ષા:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "મૂળભૂત માર્ગ:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "અવગણેલ"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN પ્રકાર:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN ગેટવે:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN વપરાશકર્તાનામ:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN બૅનર:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "આધાર જોડાણ:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "યોગ્ય સક્રિય જોડાણ શોધાયુ નથી!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1207,41 +920,42 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "અને ઘણા બીજા સમુદાયનાં ફાળકો અને અનુવાદકો"
 
-#: ../src/applet-dialogs.c:987
-msgid "Notification area applet for managing your network devices and connections."
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
 msgstr "તમારા નેટવર્ક ઉપકરણો અને જોડાણો ને સંચાલિત કરવા માટે સૂચના વિસ્તાર એપલેટ."
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "નેટવર્ક વ્યવસ્થાપક વેબસાઇટ"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "ગુમ થયેલ સ્ત્રોતો"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "મોબાઇલ બ્રોડબેન્ડ નેટવર્ક પાસવર્ડ"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "પાસવર્ડ ને '%s' માં જોડાવાની જરૂરિયાત છે."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "પાસવર્ડ:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN તાળુ ખોલવુ જરૂરી"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN તાળુ ખોલવુ જરૂરી"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1249,25 +963,25 @@ msgid ""
 msgstr "તે વાપરી શકે તે પહેલાં મોબાઇલ બ્રોડબેન્ડ ઉપકરણ '%s' ને SIM PIN કોડની જરૂર છે."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN કોડ:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "PIN કોડ બતાવો"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK તાળુ ખોલવુ જરૂરી"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK તાળુ ખોલવુ જરૂરી"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1275,27 +989,34 @@ msgid ""
 msgstr "તે વાપરી શકે તે પહેલાં મોબાઇલ બ્રોડબેન્ડ ઉપકરણ '%s' ને SIM PUK કોડની જરૂર છે."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK કોડ:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "નવો PIN કોડ:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "નવા PIN કોડને પુન:દાખલ કરો:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK કોડ બતાવો"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1305,26 +1026,48 @@ msgstr ""
 "IP સરનામાંઓ નેટવર્ક પર તમારા કૉમ્પ્યુટરને ઓળખે છે.  IP સરનામાંને ઉમેરવા માટે \"Add\" બટન "
 "પરક્લિક કરો."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "કાઢી નાંખો (_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "આપમેળે મેળવેલ માર્ગોને અવગણો (_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "તેનાં નેટવર્ક પર સ્ત્રોતો માટે ફક્ત આ જોડાણને વાપરો (_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "જો સક્રિય થયેલ હોય તો, આ જોડાણ એ મૂળભૂત નેટવર્ક જોડાણ તરીકે કદી વપરાશે નહિં."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1332,21 +1075,16 @@ msgstr "જો સક્રિય થયેલ હોય તો, આ જોડ�
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "બનાવો..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
-#| msgid "Choose a VPN Connection Type"
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "જોડાણ પ્રકારને પસંદ કરો"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 #, fuzzy
-#| msgid ""
-#| "Select the type of VPN you wish to use for the new connection.  If the "
-#| "type of VPN connection you wish to create does not appear in the list, "
-#| "you may not have the correct VPN plugin installed."
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1370,7 +1108,6 @@ msgid "XOR"
 msgstr "XOR"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:4
-#| msgid "Broadcast Address:"
 msgid "Broadcast"
 msgstr "બ્રોડકાસ્ટ"
 
@@ -1380,102 +1117,109 @@ msgstr "802.3ad"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:6
 msgid "Adaptive transmit load balancing"
-msgstr ""
+msgstr "અનૂકુલનશીલ ટ્રાન્સમિટ લોડ સંતુલન"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:7
 msgid "Adaptive load balancing"
-msgstr ""
+msgstr "અનૂકુલનશીલ લોડ સંતુલન"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:8
 msgid "MII (recommended)"
 msgstr "MII (અગ્રહણીય)"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:9
-#| msgid "EAP"
 msgid "ARP"
 msgstr "ARP"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:10
-#| msgid "Base Connection:"
 msgid "Bonded _connections:"
 msgstr "બોન્ડ થયેલ જોડાણ (_c):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-#| msgid "M_ode:"
-msgid "_Mode:"
-msgstr "સ્થિતિ (_M):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "સ્થિતિ (_o):"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "ફેરફાર કરો (_E)"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "કાઢી નાંખો (_D)"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "ફેરફાર કરો (_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
-msgstr ""
+msgstr "આવૃત્તિ દેખરેખ (_f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
-#| msgid "Interface:"
+#: ../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:"
 msgstr "ઇન્ટરફેસ નામ (_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
-msgstr ""
+msgstr "કડી દેખરેખ (_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
-msgstr ""
+msgstr "ARP લક્ષ્ય (_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
-msgstr ""
+msgstr "કડી ચાલુ થવામાં વિલંબ (_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
-msgstr ""
+msgstr "કડી બંધ થવામાં વિલંબ (_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-#| msgid "Primary DNS:"
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "પ્રાથમિક (_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "બાઇટો"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
-#| msgid "S_ecurity:"
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "પ્રાધાન્ય (_P):"
 
@@ -1484,53 +1228,96 @@ msgid "_Hairpin mode:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:1
-#| msgid "Base Connection:"
 msgid "Bridged _connections:"
 msgstr "બ્રિજ થયેલ જોડાણો (_c):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "નેટવર્કીંગને સક્રિય કરો (_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "આપોઆપ"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "મૂળભૂત"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "સરનામું"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "સરનામું"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "કોઇપણ ઉપકરણ"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "અજ્ઞાત ભૂલ દરમ્યાન જોડાણ ગુપ્તતાઓને સુધારવા માટે નિષ્ફળ."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:1
-#| msgid "Use 802.1_X security for this connection"
 msgid "Use Data Center Bridging (DCB) for this connection"
 msgstr "આ જોડાણ માટે Data Center Bridging (DCB) ને વાપરો"
 
@@ -1625,98 +1412,96 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "પ્રાધાન્ય પ્રવાહ નિયંત્રણ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "પ્રાધાન્ય:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-#| msgid "2"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-#| msgid "3"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-#| msgid "4"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "જૂથ ID:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 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:44
-msgid "Enter the percentage of priority group bandwidth each user priority may use."
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1729,7 +1514,7 @@ 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:4
+#: ../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
@@ -1737,8 +1522,9 @@ msgid "Sho_w password"
 msgstr "પાસવર્ડને બતાવો (_w)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1750,7 +1536,8 @@ msgstr "પાસવર્ડ (_P):"
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "આપોઆપ"
@@ -1805,18 +1592,18 @@ msgstr "સ્વયંકરાર (_o)"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "ઉપકરણ MAC સરનામું (_D):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "સેવા (_S):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "ક્લોન કરેલ MAC સરનામું (_l):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1826,26 +1613,60 @@ msgstr ""
 "હાર્ડવેર સરનામાં તરીકે વાપરેલ હશે. આ લક્ષણ MAC ક્લોનિંગ અને સ્પુફીંગ તરીકે જાણીતુ છે.  "
 "ઉદાહરણ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "MTU (_M):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "બાઇટો"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "મૂળભૂત"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "અવગણો"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "બ્રોડકાસ્ટ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "ખાનગી કી પાસવર્ડ (_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-general.ui.h:2
-#| msgid "You are now connected to the wired network."
 msgid "All _users may connect to this network"
 msgstr "બધા વપરાશકર્તાઓ આ નેટવર્કમાં જોડાઇ શકે છે (_u)"
 
@@ -1859,16 +1680,15 @@ msgstr "ફાયરવોલ ઝોન (_z):"
 
 #: ../src/connection-editor/ce-page-infiniband.ui.h:1
 msgid "_Transport mode:"
-msgstr ""
+msgstr "ટ્રાન્સપોર્ટ સ્થિતિ (_T):"
 
 #. IP-over-InfiniBand "datagram mode"
 #: ../src/connection-editor/ce-page-infiniband.ui.h:6
 msgid "Datagram"
-msgstr ""
+msgstr "ડેટાગ્રામ"
 
 #. IP-over-InfiniBand "connected mode"
 #: ../src/connection-editor/ce-page-infiniband.ui.h:8
-#| msgid "C_onnect"
 msgid "Connected"
 msgstr "જોડાયેલ"
 
@@ -1879,8 +1699,8 @@ msgstr "મેન્યુઅલ DNS સુયોજનો સાથે આપ�
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "જાતે"
 
@@ -1891,8 +1711,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "બીજા કૉમ્પ્યુટરો સાથે વહેંચાયેલ છે"
 
@@ -1906,7 +1726,7 @@ msgstr "પદ્દતિ (_M):"
 msgid "Addresses"
 msgstr "સરનામું"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1916,8 +1736,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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1925,25 +1745,25 @@ msgstr ""
 "ડોમેઇન વાપરેલ છે જ્યારે યજમાન નામોને સુધારી રહ્યા હોય. ઘણાબધા ડોમેઇનને અલગ કરવા માટે "
 "અલ્પવિરામોને વાપરો."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "DNS સર્વરો (_D):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1951,11 +1771,11 @@ msgstr ""
 "યજમાનોને સુધારવા માટે વાપરેલ ડોમેઇન નામ સર્વરોનાં IP સરનામાંઓ. ઘણાબધા ડોમેઇન નામ સર્વર "
 "સરનામાંઓને અલગ કરવા માટે અલ્પવિરામને વાપરો."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1963,13 +1783,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "રસ્તો (_R)..."
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "નિષ્ક્રિય થયેલ"
 
@@ -1981,10 +1801,7 @@ msgstr ""
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#| msgid ""
-#| "IP addresses of domain name servers used to resolve host names. Use "
-#| "commas to separate multiple domain name server addresses."
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 +1810,15 @@ msgstr ""
 "યજમાનોને સુધારવા માટે વાપરેલ ડોમેઇન નામ સર્વરોનાં IP સરનામાંઓ. ઘણાબધા ડોમેઇન નામ સર્વર "
 "સરનામાંઓને અલગ કરવા માટે અલ્પવિરામને વાપરો.`"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 ખાનગી ઍક્સટેન્શન (_p):"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2010,72 +1827,38 @@ msgstr ""
 "છે જો IPv6 રૂપરેખાંકન નિષ્ફળ જાય તો પરંતુ IPv4 રૂપરેખાંકન સફળ થાય છે."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "કોઇપણ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3G પસંદ કરો (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2G પસંદ કરો (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-#| msgid "Prefer 3G (UMTS/HSPA)"
-msgid "Prefer 4G (LTE)"
-msgstr "4G પસંદ કરો (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "ફક્ત 4G (LTE) ને વાપરો"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "મૂળભૂત"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "નંબર (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "ઉન્નત"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "APN (_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "નેટવર્ક ID (_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "પ્રકાર (_T):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "બદલો..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "PIN (_I):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "રોમિંગની પરવાનગી આપો જો ઘરનું નેટવર્ક ઉપલબ્ધ ન હોય તો (_r)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "પાસવર્ડોને બતાવો (_w)"
 
@@ -2137,42 +1920,62 @@ msgid "_Import team configuration from a file..."
 msgstr "ફાઇલમાંથી જૂથ રૂપરેખાંકનને આયાત કરો (_I)..."
 
 #: ../src/connection-editor/ce-page-team.ui.h:1
-#| msgid "Base Connection:"
 msgid "_Teamed connections:"
 msgstr "જૂથ થયેલ જોડાણો (_T):"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "ફાઇલમાંથી જૂથ રૂપરેખાંકનને આયાત કરો (_m)"
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "ફાઇલમાંથી જૂથ રૂપરેખાંકનને આયાત કરો (_I)..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
-#| msgid "Interface:"
 msgid "_Parent interface:"
 msgstr "મુખ્ય ઇન્ટરફેસ (_P):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN ઇન્ટરફેસ નામ (_n):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#| msgid "C_loned MAC address:"
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "ક્લોન કરેલ MAC સરનામું (_C):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN id (_i):"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
-msgid "Device name + number"
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
 msgstr ""
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
 #: ../src/connection-editor/ce-page-vlan.ui.h:10
-msgid "\"vlan\" + number"
+msgid "_Loose binding"
 msgstr ""
 
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
+msgid "Device name + number"
+msgstr "ઉપકરણ નામ + નંબર"
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr "\"vlan\" + નંબર"
+
 #: ../src/connection-editor/ce-page-wifi-security.ui.h:1
 msgid "S_ecurity:"
 msgstr "સુરક્ષા (_e):"
@@ -2186,94 +1989,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "ઇન્ફ્રાસ્ટ્રક્ચર"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "ટ્રાન્સમિશન પાવર (_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "દર (_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "ચેનલ (_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Band (_d):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "સ્થિતિ (_o):"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SSID (_I):"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "પરવાનગી આપેલ સત્તાધિકરણ પદ્દત્તિઓ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "EAP (_E)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "વધારી શકાય તેવુ સત્તાધિકરણ પ્રોટોકોલ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "PAP (_P)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "પાસવર્ડ સત્તાધિકરણ પ્રોટોકોલ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "CHAP (_H)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "શરતી હેન્ડશેક સત્તાધિકરણ પ્રોટોકોલ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "MSCHAP (_M)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "માઇક્રોસોફ્ટ શરતી હેન્ડશેક સત્તાધિકરણ પ્રોટોકોલ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v2 (_2)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "માઇક્રોસોફ્ટ શરતી હેન્ડશેક સત્તાધિકરણ પ્રોટોકોલ આવૃત્તિ 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2281,536 +2088,633 @@ msgstr ""
 "મોટાભાગની સ્થિતિઓમાં, પોષણકર્તાનાં PPP સર્વરો એ બધી સત્તાધિકરણ પદ્દતિઓને આધાર આપશે. "
 "જો જોડાણો નિષ્ફળ થાય તો, અમુક પદ્દતિઓ માટે આધારને નિષ્ક્રિય કરવાનું પ્રયત્ન કરો."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "સરનામું"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "નેટમાસ્ક"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "ગેટવે"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "મેટ્રીક"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "ઉપસર્ગ"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
-#| msgid "Auto Ethernet"
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "ઇથરનેટ"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "બ્લુટુથ"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "ઇન્ફિનિબેન્ડ"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "બોન્ડ"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "જૂથ"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "બ્રિજ"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
-#| msgid "Hardware Address:"
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "હાર્ડવેર"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "વર્ચ્યુઅલ"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
-#| msgid "Export VPN connection..."
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "સંગ્રહ થયેલ VPN રૂપરેખાંકનને આયાત કરો..."
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "અજ્ઞાત ભૂલ દરમ્યાન જોડાણ સંપાદક સંવાદને પ્રારંભ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "નવા જોડાણમાં બનાવી શકાયુ નહિં"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "જોડાણ કાઢી નાખવાનું નિષ્ફળ"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "તમે ખરેખર જોડાણ %s ને કાઢી નાંખવાની ઇચ્છા રાખો છો?"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "સરનામું"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "નેટમાસ્ક"
+
+#: ../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
+msgid "Gateway"
+msgstr "ગેટવે"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "મેટ્રીક"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "ઉપસર્ગ"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "%s માં ફેરફાર કરી રહ્યા છે"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "નામ વગરનાં જોડાણમાં ફેરફાર કરી રહ્યા છે"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "જોડાણ નામ (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "સંપાદકને પ્રારંભ કરતી વખતે ભૂલ"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "જોડાણ ઉમેરવાનું નિષ્ફળ"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "સંગ્રહો (_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "આ જોડાણ માટે કરેલ કોઇપણ બદલાવોને સંગ્રહો."
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "આ મશીન નાં બધા વપરાશકર્તાઓ માટે આ જોડાણને સંગ્રહ કરવા માટે સત્તાધિકરણ કરો."
 
-#: ../src/connection-editor/nm-connection-editor.c:436
-#| msgid "Could not create new connection"
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "જોડાણને બનાવી શક્યા નહિં"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "જોડાણમાં ફેરફાર કરી શકાયુ નહિં"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
-#| msgid "Error creating connection editor dialog."
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "જોડાણ સંપાદક સંવાદને બનાવતી વખતે અજ્ઞાત ભૂલ."
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "સંપાદકને પ્રારંભ કરતી વખતે ભૂલ"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "જોડાણ ઉમેરવાનું નિષ્ફળ"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "જોડાણને સંગ્રહ કરી રહ્યા હોય ત્યારે ભૂલ"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "ગુણધર્મ '%s' / '%s' અયોગ્ય છે: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "જોડાણ નામ (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#| msgid "E_xport"
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "નિકાસ કરો (_E)..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "કદી નહિં"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "હવે"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d મિનિટ પહેલા"
 msgstr[1] "%d મિનિટો પહેલા"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d કલાક અગાઉ"
 msgstr[1] "%d કલાકો અગાઉ"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d મહિનાં અગાઉ"
 msgstr[1] "%d મહિનાઓ અગાઉ"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d વર્ષ અગાઉ"
 msgstr[1] "%d વર્ષો અગાઉ"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "નામ"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "છેલ્લે વપરાયેલ"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "પસંદ થયેલ જોડાણમાં ફેરફાર કરો"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "પસંદ થયેલ જોડાણમાં ફેરફાર કરવા માટે સત્તાધિકરણ કરો"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "પસંદ થયેલ જોડાણને કાઢી નાંખો"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "પસંદ થયેલ જોડાણને કાઢી નાંખવા માટે સત્તાધિકરણ કરો"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "VPN પ્લગઇન સ્થાપિત થયેલ નથી."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "જાણતા નથી કેવી રીતે '%s' જોડાણોને બનાવવા"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "જોડાણને બનાવતી વખતે ભૂલ"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "જોડાણમાં ફેરફાર કરતી વખતે ભૂલ"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID '%s' સાથે જોડાણને શોધી શક્યા નથી"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x સુરક્ષા"
 
-#: ../src/connection-editor/page-8021x-security.c:123
-#| msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "802.1x સુરક્ષા વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "આ જોડાણ માટે 802.1X સુરક્ષાને વાપરો (_X)"
 
-#: ../src/connection-editor/page-bond.c:436
-#| msgid "Could not load wired user interface."
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "DCB વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "બ્લુટુથ ઉપકરણને શોધી શક્યા નહિં."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "બોન્ડ જોડાણ %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "બ્લુટુથ"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "વાયરવાળુ નેટવર્ક"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Wi-Fi નેટવર્ક"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "બોન્ડ વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "પ્રાથમિક (_P):"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
-#| msgid "Wired connection %d"
 msgid "Bond connection %d"
 msgstr "બોન્ડ જોડાણ %d"
 
-#: ../src/connection-editor/page-bridge.c:211
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "બ્રિજ વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
-#| msgid "Wired connection %d"
 msgid "Bridge connection %d"
 msgstr "બ્રિજ જોડાણ %d"
 
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "બ્રિજ પોર્ટ"
 
-#: ../src/connection-editor/page-bridge-port.c:117
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "બ્રિજ પોર્ટ વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
-#| msgid "Could not load DSL user interface."
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "DCB વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL વપરાશકર્તા ઇન્ટરફેસને લોડ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL જોડાણ %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 સરનામાં દ્દારા સ્પષ્ટ થયેલ નેટવર્ક ઉપકરણ માટે આ જોડાણને "
 "તાળુ મારે છે.  ઉદાહરણ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "ઇથરનેટ વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "ઇથરનેટ"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "ક્લોન કરેલ MAC સરનામું (_l):"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
-#| msgid "Wired connection %d"
 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "મૂળભૂત"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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:57
-#| msgid "NetworkManager is not running..."
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD ચાલી રહ્યુ નથી."
 
-#: ../src/connection-editor/page-general.c:330
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "સામાન્ય વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-infiniband.c:162
-#| msgid "Could not load WiFi user interface."
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
-#| msgid "Wired connection %d"
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand જોડાણ %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "સ્વયં (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "ફક્ત સ્વયં (VPN) સરનામાંઓ"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "સ્વયં (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "ફક્ત સ્વયં (PPP) સરનામાંઓ"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "ફક્ત સ્વયં સરનામાંઓ"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "સ્વયં (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "ફક્ત સ્વયં (PPPoE) સરનામાંઓ"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "સ્વયં (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "ફક્ત સ્વયં (DHCP) સરનામાંઓ"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "ફક્ત સ્થાનીય કડી કરો"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
-#| msgid "DNS ser_vers:"
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "વધારાનાં DNS સર્વરો (_v):"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
-#| msgid "S_earch domains:"
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "વધારાનાં શોધ ડોમેઇન (_e):"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s માટે IPv4 માર્ગોને ફેરફાર કરી રહ્યા છે"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 સુયોજનો"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 વપરાશકર્તા ઇન્ટરફેલને લોડ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "ફક્ત સ્વયં સરનામાંઓ"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "અવગણો"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "સ્વયં, DHCP ફક્ત"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s માટે IPv6 માર્ગોને ફેરફાર કરી રહ્યા છે"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 સુયોજનો"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 વપરાશકર્તા ઇન્ટરફેસને લોડ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "નકલી સ્લેવ"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, 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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s સ્લેવ %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "મોબાઇલ બ્રોડબેન્ડ વપરાશકર્તા ઇન્ટરફેસને લોડ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "બિનઆધારભૂત મોબાઇલ બ્રોડબેન્ડ જોડાણ પ્રકાર."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "મોબાઇલ બ્રોડબેન્ડ પોષણકર્તા પ્રકારને પસંદ કરો"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2818,139 +2722,144 @@ msgstr ""
 "તમારા મોબાઇલ બ્રોડબેન્ડ પોષણકર્તા વાપરે છે તેને પસંદ કરો.  જો તમે ચોક્કસ ન હોય તો, "
 "તમારા પોષણકર્તાને પૂછો."
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "મારો પોષણકર્તા એ GSM-આધારિત ટેકનોલોજી ને વાપરે છે (_G) (એટલે કે. GPRS, EDGE, UMTS, "
 "HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr "મારો પોષણકર્તા એ CDMA-આધારિત ટેકનોલોજી ને વાપરે છે (_D) (એટલે કે. 1xRTT, EVDO)"
+msgstr ""
+"મારો પોષણકર્તા એ CDMA-આધારિત ટેકનોલોજી ને વાપરે છે (_D) (એટલે કે. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "કંઇ નહિં"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP સુયોજનો"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP વપરાશકર્તા ઇન્ટરફેસને લોડ કરી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "આયાત કરવા માટે ફાઇલને પસંદ કરો"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "ભૂલ: ફાઇલ યોગ્ય JSON રૂપરેખાંકનને સમાવતુ નથી"
 
-#: ../src/connection-editor/page-team.c:247
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "જૂથ વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
-#| msgid "Wired connection %d"
 msgid "Team connection %d"
 msgstr "જૂથ જોડાણ %d"
 
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "જૂથ પોર્ટ"
 
-#: ../src/connection-editor/page-team-port.c:159
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (\"%s\" મારફતે)"
 
-#: ../src/connection-editor/page-vlan.c:489
-#| msgid "Could not load IPv4 user interface."
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "નેટવર્ક જોડાણ નથી"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "vlan વપરાશકર્તા ઇન્ટરફેસ લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
-#| msgid "VPN connection %d"
 msgid "VLAN connection %d"
 msgstr "VLAN જોડાણ %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' માટે VPN પ્લગઇન સેવાને શોધી શકાયુ નહિં."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN જોડાણ %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2960,11 +2869,11 @@ msgstr ""
 "\n"
 "Error: VPN સેવા પ્રકાર નથી."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "VPN જોડાણ પ્રકારને પસંદ કરો"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2974,11 +2883,8 @@ msgstr ""
 "ઇચ્છતા હોય તો VPN જોડાણનો પ્રકાર યાદીમાં દેખાતો નથી, તમારી પાસે યોગ્ય VPN પ્લગઇન "
 "સ્થાપિત થયેલ નથી."
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../src/connection-editor/page-wifi.c:77
 #, fuzzy
-#| msgid ""
-#| "This option locks this connection to the wireless access point (AP) "
-#| "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
 msgid ""
 "This option locks this connection to the Wi-Fi access point (AP) specified "
 "by the BSSID entered here.  Example: 00:11:22:33:44:55"
@@ -2986,78 +2892,91 @@ msgstr ""
 "અહિંયા દાખલ થયેલ BSSID દ્દારા સ્પષ્ટ થયેલ વાયરલેસ પ્રવેશ બિંદુ (AP) માટે આ જોડાણને તાળુ "
 "મારે છે.  ઉદાહરણ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"આ વિકલ્પ એ અહિંયા દાખલ થયેલ MAC સરનામાં દ્દારા સ્પષ્ટ થયેલ નેટવર્ક ઉપકરણ માટે આ જોડાણને "
+"તાળુ મારે છે.  ઉદાહરણ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
-#| msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "WiFi વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "કોઇપણ ઉપકરણ"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
-#| msgid "Wired connection %d"
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi જોડાણ %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-બીટ પાસફ્રેઝ"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "ગતિક WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 વ્યક્તિગત"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 એન્ટરપ્રાઇઝ"
 
-#: ../src/connection-editor/page-wifi-security.c:391
-#| msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
-#| msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi સુરક્ષા"
 
-#: ../src/connection-editor/page-wifi-security.c:404
-#| msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi સુરક્ષા વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
 
-#: ../src/connection-editor/page-wimax.c:128
-#| msgid "Could not load WiFi user interface."
-msgid "Could not load WiMAX user interface."
-msgstr "WiMAX વપરાશકર્તા ઇન્ટરફેસને લાવી શક્યા નહિં."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-#| msgid "Wired connection %d"
-msgid "WiMAX connection %d"
-msgstr "WiMAX જોડાણ %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN જોડાણને આયાત કરી શકાતુ નથી"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3069,25 +2988,30 @@ msgstr ""
 "\n"
 "ભૂલ: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "અજ્ઞાત ભૂલ"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "નામ થયેલ ફાઇલ \"%s\" પહેલેથી જ અસ્તિત્વ ધરાવે છે."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "બદલો (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN જોડાણનું નિકાસ કરી શકાતુ નથી"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3098,110 +3022,21 @@ msgstr ""
 "\n"
 "ભૂલ: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN જોડાણની નિકાસ કરો..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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 "NetworkManager એપ્લેટ અમુક જરૂરી સ્રોતો શોધી શકી નહિં (.ui ફાઇલ મળ્યુ નથી)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "બ્લુટુથ રૂપરેખાંકન શક્ય નથી (D-Bus સાથે જોડાવામાં નિષ્ફળતા: (%s) %s)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, fuzzy, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgid "Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "બ્લુટુથ રૂપરેખાંકન શક્ય નથી (NetworkManager ને શોધવા દરમ્યાન ભૂલ: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "નેટવર્ક ઉપકરણ તરીકે તમારો મોબાઇલ ફોનને વાપરો (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "તમારાં મોબાઇલ ફોનની મદદથી ઇન્ટરન્ટને વાપરો (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "ભૂલ: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "DUN જોડાણને બનાવવામાં નિષ્ફળતા: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "તમારો ફોન એ હવે વાપરવા માટે તૈયાર છે!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "મોબાઇલ વિઝાર્ડ રદ કરાયેલ હતી"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "અજ્ઞાત ફોન ઉપકરણ પ્રકાર (GSM અથવા CDMA નથી)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "અજ્ઞાત મોડેમ પ્રકાર."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "ફોન ને જોડવામાં નિષ્ફળ."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-#| msgid "Error editing connection"
-msgid "error getting bus connection"
-msgstr "બસ જોડાણને મેળવવામાં ભૂલ"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "ફોન માંથી અનિચ્છનીય રીતે જોડાણ તૂટેલ છે."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "ફોન વિગતોને શોધવા દરમ્યાન સમય સમાપ્ત."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "ફોન રૂપરેખાંકનને શોધી રહ્યા છે..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"ડાયલ-અપ નેટવર્કિંગ જોડાણનું સુયોજન કરતા પહેલાં મૂળભૂત બ્લુટુથ ઍડપ્ટર એ સક્રિય થયેલ હોવુ જ "
-"જોઇએ."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "PAN જોડાણને બનાવવામાં નિષ્ફળતા: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "%s નેટવર્ક"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "તાળુ ખોલો (_U)"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "આપમેળે આ ઉપકરણનું તાળુ ખોલો"
 
@@ -3209,30 +3044,36 @@ msgstr "આપમેળે આ ઉપકરણનું તાળુ ખોલ�
 msgid "Connection Information"
 msgstr "જોડાણ જાણકારી"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "નેટવર્ક જોડાણો સક્રિય કરો"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
-msgid "Your mobile broadband connection is configured with the following settings:"
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "તમારુ ઉપકરણ:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "તમારો પોષણકર્તા:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "તમારો પ્લાન:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3245,23 +3086,28 @@ msgstr ""
 "તો, તમારા સુયોજનોને બે વાર ચકાસો.  તમારા મોબાઇલ બ્રોડબેન્ડ જોડાણ સુયોજનોને બદલવા "
 "માટે, સિસ્ટમ >> પસંદગીઓ મેનુ માંથી \"Network Connections\" ને પસંદ કરો."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "મોબાઇલ બ્રોડબેન્ડ સુયોજનોની ખાતરી કરો"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "યાદી ન થયેલ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "તમારા પ્લાનને પસંદ કરો (_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3274,67 +3120,84 @@ msgstr ""
 "જો તમારા પ્લાનની ખાતરી ન હોય તો મહેરબાની કરીને તમારા પ્લાનનાં APN માટે તમારા "
 "પોષણકર્તાને પૂછો."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "તમારા બિલીંગ પ્લાનને પસંદ કરો"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "મારો પ્લાન યાદી થયેલ નથી..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "પોષણકર્તા"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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):"
+msgstr ""
+"હું મારા પોષણકર્તાને શોધી શકતો નથી અને હું તેને જાતે જ દાખલ કરવા ઇચ્છા રાખુ છુ (_m):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "પોષણકર્તા:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "તમારા પોષણકર્તાને પસંદ કરો"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ) યાદી:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "દેશ અથવા પ્રાન્ત (પ્રદેશ)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "મારો દેશ યાદી થયેલ નથી"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "સ્થાપિત થયેલ GSM ઉપકરણ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "સ્થાપિત થયેલ CDMA ઉપકરણ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3342,169 +3205,197 @@ msgstr ""
 "આ મદદકર્તા એ તમને સેલ્યુલર (3G) નેટવર્કમાં મોબાઇલ બ્રોડબેન્ડ જોડાણને સુયોજન કરવાનું સરળ "
 "બનાવવા માટે મદદ કરે છે."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "તમારે નીચેની જાણકારીની જરૂર પડશે:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "તમારુ બ્રોડબેન્ડ પોષણકર્તાનું નામ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "તમારુ બ્રોડબેન્ડ બિલીંગ પ્લાન નામ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "આ મોબાઇલ બ્રોડબેન્ડ ઉપકરણ માટે જોડાણને બનાવો (_t):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "કોઇપણ ઉપકરણ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "મોબાઇલ બ્રોડબેન્ડ (CDMA) જોડાણ ને સુયોજિત કરો"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "નવું મોબાઇલ બ્રોડબેન્ડ જોડાણ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "વાયરવાળુ"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "બ્લુટુથ"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC મેશ"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "ગૌણ પાસવર્ડ (_S):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "ગૌણ પાસવર્ડ (_S):"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %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/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "નવું..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "કંઇ નહિં"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "બનાવો (_r)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
-#| msgid ""
-#| "Passwords or encryption keys are required to access the wireless network "
-#| "'%s'."
-msgid "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "પાસવર્ડ અથવા એનક્રિપ્શન કીને Wi-Fi નેટવર્ક '%s' ને વાપરવાની જરૂર છે."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
-#| msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi નેટવર્ક સત્તાધિકરણ જરૂરી"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
-#| msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi નેટવર્ક દ્દારા સત્તાધિકરણ જરૂરી"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
-#| msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "નવાં Wi-Fi નેટવર્કને બનાવો"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
-#| msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "નવું Wi-Fi નેટવર્ક"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
-#| msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Wi-Fi નેટવર્ક માટે નામને દાખલ કરો જે તમે બનાવવા ઇચ્છો છો."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
-#| msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "છુપાયેલ Wi-Fi નેટવર્ક સાથે જોડાવો"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
-#| msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "છુપાયેલ Wi-Fi નેટવર્ક"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 #, fuzzy
-#| msgid ""
-#| "Enter the name and security details of the hidden wireless network you "
-#| "wish to connect to."
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
-msgstr "તમે તેમાં જોડાવવા માંગો છો તે છુપાયેલ વાયરલેસ નેટવર્કનાં નામ અને સુરક્ષા વિગતોને દાખલ કરો."
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#| msgid "_Password:"
-msgid "_Secondary Password:"
-msgstr "ગૌણ પાસવર્ડ (_S):"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-#| msgid "Sho_w passwords"
-msgid "Sh_ow passwords"
-msgstr "પાસવર્ડોને બતાવો (_o)"
+msgstr ""
+"તમે તેમાં જોડાવવા માંગો છો તે છુપાયેલ વાયરલેસ નેટવર્કનાં નામ અને સુરક્ષા વિગતોને દાખલ કરો."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
-#| msgid "Wireless _security:"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "વાયરલેસ સુરક્ષા (_s):"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "જોડાણ (_n):"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-#| msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi એડપ્ટર (_a):"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC મેશ"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "વપરાશ:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3512,148 +3403,158 @@ msgstr ""
 "આ પ્રક્રિયા એ NetworkManager નો ઘટક છે (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
-#| msgid "HSPA"
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "સક્રિય થયેલ નથી"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "રજીસ્ટર થયેલ નથી"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ઘર નેટવર્ક (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "ઘર નેટવર્ક"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "શોધી રહ્યા છે"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "રજીસ્ટ્રેશન નામંજૂર થયેલ છે"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (રોમિંગ)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "રોમિંગ નેટવર્ક (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "રોમિંગ નેટવર્ક"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "'%s' પર SIM કાર્ડ '%s' માટે PIN કોડ"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN કોડની જરૂરિયાત છે"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "મોબાઇલ બ્રોડબેન્ડ ઉપકરણ માટે PIN કોડની જરૂર છે"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "મોબાઇલ બ્રોડબેન્ડ જોડાણ '%s' સક્રિય: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "રોમિંગ"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
-#| msgid "Base Connection:"
 msgid "%s connection"
 msgstr "%s જોડાણ"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "આ વપરાશકર્તા માટે ફક્ત પાસવર્ડને સંગ્રહો (_u)"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "બધા વપરાશકર્તાઓ માટે પાસવર્ડને સંગ્રહો (_a)"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
-#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER અથવા PEM પ્રમાણપત્રો (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "PAC ફાઇલને પસંદ કરો..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC ફાઇલો (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "બધી ફાઇલો"
 
@@ -3689,15 +3590,32 @@ msgstr "આંતરિક સત્તાધિકરણ (_I):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "આપોઆપ PAC બચાવ માટે પરવાનગી આપે છે (_v)"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Certificate Authority પ્રમાણપત્ર ને પસંદ કરો..."
 
@@ -3718,7 +3636,6 @@ msgstr "CA પ્રમાણપત્ર (_A):"
 #: ../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
-#| msgid "C_A certificate:"
 msgid "No CA certificate is _required"
 msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
 
@@ -3726,15 +3643,46 @@ msgstr "CA પ્રમાણપત્ર જરૂરી નથી (_r)"
 msgid "PEAP _version:"
 msgstr "PEAP આવૃત્તિ (_v):"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "દરેક સમયે આ પાસવર્ડ માટે પૂછો (_k)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "CA પ્રમાણપત્ર (_A):"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "એનક્રિપ્ટ ન થયેલ ખાનગી કીઓ અસુરક્ષિત છે"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3748,11 +3696,11 @@ msgstr ""
 "\n"
 "(તમે openssl સાથે તમારી ખાનગી કીને પાસવર્ડ-સુરક્ષિત કરી શકો છો)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "તમારુ વ્યક્તિગત પ્રમાણપત્રને પસંદ કરો..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "તમારી ખાનગી કીને પસંદ કરો..."
 
@@ -3772,23 +3720,36 @@ msgstr "ખાનગી કી (_k):"
 msgid "_Private key password:"
 msgstr "ખાનગી કી પાસવર્ડ (_P):"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "ટનલ થયેલ TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "સુરક્ષિત થયેલ EAP (PEAP)"
 
@@ -3798,6 +3759,44 @@ msgstr "સુરક્ષિત થયેલ EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "સત્તાધિકરણ (_t):"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (મૂળભૂત)"
@@ -3822,6 +3821,335 @@ msgstr "કીને બતાવો (_w)"
 msgid "WEP inde_x:"
 msgstr "WEP અનુક્રમણિકા (_x):"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "પ્રકાર (_T):"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "WiMAX મોબાઇલ બ્રોડબેન્ડને સક્રિય કરો (_X)"
+
+#~ msgid "_Help"
+#~ msgstr "મદદ (_H)"
+
+#~| msgid "You are now connected to the wired network."
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "તમે હવે બોન્ડ થયેલ નેટવર્ક સાથે જોડાયેલ છે."
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "બોન્ડ જોડાણ '%s' ની તૈયારી કરી રહ્યા છે..."
+
+#~| msgid "Configuring mobile broadband connection '%s'..."
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "બોન્ડ જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "બોન્ડ જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણ જરૂરી..."
+
+#~| msgid "Requesting a VPN address for '%s'..."
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "'%s' માટે સરનામાંને સૂચિત કરી રહ્યા છે..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "બોન્ડ જોડાણ '%s' સક્રિય"
+
+#~| msgid "You are now connected to the wired network."
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "તમે હવે બ્રિજ થયેલ નેટવર્કમાં જોડાયેલ છે."
+
+#, fuzzy
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "નેટવર્ક જોડાણ '%s' ને તૈયાર કરી રહ્યા છે..."
+
+#, fuzzy
+#~| msgid "Configuring wired network connection '%s'..."
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "વાયરવાળુ નેટવર્ક જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "બ્રિજ જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણ જરૂરી..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "બ્રિજ જોડાણ '%s' સક્રિય"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "નવું મોબાઇલ બ્રોડબેન્ડ (CDMA) જોડાણ..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "તમે હવે CDMA નેટવર્ક સાથે જોડાયેલ છો."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA નેટવર્ક."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "નવું મોબાઇલ બ્રોડબેન્ડ (GSM) જોડાણ..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "તમે હવે GSM નેટવર્ક સાથે જોડાયેલ છો."
+
+#~ msgid "GSM network."
+#~ msgstr "CDMA નેટવર્ક."
+
+#~| msgid "Wired Networks (%s)"
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand નેટવર્ક (%s)"
+
+#~| msgid "Wired Network (%s)"
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand નેટવર્ક (%s)"
+
+#~| msgid "Wired Networks"
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand નેટવર્ક"
+
+#~| msgid "Wired Network"
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand નેટવર્ક"
+
+#, fuzzy
+#~| msgid "You are now connected to the wired network."
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "તમે હવે વાયરવાળુ નેટવર્ક સાથે જોડાયેલ છો."
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand જોડાણ '%s' ને તૈયારી કરી રહ્યા છે..."
+
+#~| msgid "Configuring mobile broadband connection '%s'..."
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણ જરૂરી..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand જોડાણ '%s' સક્રિય"
+
+#~| msgid "You are now connected to the wired network."
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "તમે હવે જૂથ થયેલ નેટવર્ક સાથે જોડાયેલ છે."
+
+#, fuzzy
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "નેટવર્ક જોડાણ '%s' ને તૈયાર કરી રહ્યા છે..."
+
+#, fuzzy
+#~| msgid "Configuring wired network connection '%s'..."
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "વાયરવાળુ નેટવર્ક જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
+
+#, fuzzy
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "VPN જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણની જરૂર છે..."
+
+#, fuzzy
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Team connection '%s' active"
+#~ msgstr "VPN જોડાણ '%s' સક્રિય છે"
+
+#, fuzzy
+#~| msgid "You are now connected to the CDMA network."
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "તમે હવે CDMA નેટવર્ક સાથે જોડાયેલ છો."
+
+#, fuzzy
+#~| msgid "Starting VPN connection '%s'..."
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "VPN જોડાણ '%s' ને શરૂ કરી રહ્યા છે..."
+
+#~| msgid "Starting VPN connection '%s'..."
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "VLAN જોડાણ '%s' ને રૂપરેખાંકિત કરી રહ્યા છે..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "VLAN જોડાણ '%s' માટે વપરાશકર્તા સત્તાધિકરણની જરૂર છે..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN જોડાણ '%s' સક્રિય"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX મોબાઇલ બ્રોડબેન્ડ (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX મોબાઇલ બ્રોડબેન્ડ"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX નિષ્ક્રિય થયેલ છે"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "હાર્ડવેર સ્વિચ દ્દારા WiMAX નિષ્ક્રિય થયેલ છે"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "તમે હવે WiMAX નેટવર્ક સાથે જોડાયેલ છો."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "અજ્ઞાત"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "અજ્ઞાત"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~| msgid "M_ode:"
+#~ msgid "_Mode:"
+#~ msgstr "સ્થિતિ (_M):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "ઉપકરણ MAC સરનામું (_D):"
+
+#~ msgid "Any"
+#~ msgstr "કોઇપણ"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "3G પસંદ કરો (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "2G પસંદ કરો (GPRS/EDGE)"
+
+#~| msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "4G પસંદ કરો (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "ફક્ત 4G (LTE) ને વાપરો"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "ફાઇલમાંથી જૂથ રૂપરેખાંકનને આયાત કરો (_m)"
+
+#~ msgid "Infrastructure"
+#~ msgstr "ઇન્ફ્રાસ્ટ્રક્ચર"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "જોડાણને સંગ્રહ કરી રહ્યા હોય ત્યારે ભૂલ"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "ગુણધર્મ '%s' / '%s' અયોગ્ય છે: %d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "સ્વયં (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "ફક્ત સ્વયં (PPP) સરનામાંઓ"
+
+#~| msgid "Could not load WiFi 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 ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr "બ્લુટુથ રૂપરેખાંકન શક્ય નથી (D-Bus સાથે જોડાવામાં નિષ્ફળતા: (%s) %s)"
+
+#, fuzzy
+#~| msgid ""
+#~| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "બ્લુટુથ રૂપરેખાંકન શક્ય નથી (NetworkManager ને શોધવા દરમ્યાન ભૂલ: %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "નેટવર્ક ઉપકરણ તરીકે તમારો મોબાઇલ ફોનને વાપરો (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "તમારાં મોબાઇલ ફોનની મદદથી ઇન્ટરન્ટને વાપરો (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "ભૂલ: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "DUN જોડાણને બનાવવામાં નિષ્ફળતા: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "તમારો ફોન એ હવે વાપરવા માટે તૈયાર છે!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "મોબાઇલ વિઝાર્ડ રદ કરાયેલ હતી"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "અજ્ઞાત ફોન ઉપકરણ પ્રકાર (GSM અથવા CDMA નથી)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "અજ્ઞાત મોડેમ પ્રકાર."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "ફોન ને જોડવામાં નિષ્ફળ."
+
+#~| msgid "Error editing connection"
+#~ msgid "error getting bus connection"
+#~ msgstr "બસ જોડાણને મેળવવામાં ભૂલ"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ફોન માંથી અનિચ્છનીય રીતે જોડાણ તૂટેલ છે."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "ફોન વિગતોને શોધવા દરમ્યાન સમય સમાપ્ત."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "ફોન રૂપરેખાંકનને શોધી રહ્યા છે..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "ડાયલ-અપ નેટવર્કિંગ જોડાણનું સુયોજન કરતા પહેલાં મૂળભૂત બ્લુટુથ ઍડપ્ટર એ સક્રિય થયેલ હોવુ જ "
+#~ "જોઇએ."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "PAN જોડાણને બનાવવામાં નિષ્ફળતા: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s નેટવર્ક"
+
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "વાયરલેસ નેટવર્કો (%s)"
 
@@ -3900,9 +4228,6 @@ msgstr "WEP અનુક્રમણિકા (_x):"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "જાણતા નથી કેવી રીતે '%s' જોડાણોમાં ફેરફાર કરવો"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "બ્લુટુથ ઉપકરણને શોધી શક્યા નહિં."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "બ્લુટુથ રૂપરેખાંકન શક્ય નથી (D-Bus પ્રોક્સીને બનાવવામાં નિષ્ફળતા)."
 
@@ -3924,9 +4249,6 @@ msgstr "WEP અનુક્રમણિકા (_x):"
 #~ msgid "_Security:"
 #~ msgstr "સુરક્ષા (_S):"
 
-#~ msgid "Network Manager"
-#~ msgstr "નેટવર્ક વ્યવસ્થાપક"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "બીજી વાયરલેસ નેટવર્ક..."
 
diff --git a/po/he.po b/po/he.po
index 8956eb13..cdca235e 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-16 16:18+0200\n"
+"POT-Creation-Date: 2016-04-05 14:02+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,7 +19,7 @@ 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
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "רשת"
 
@@ -42,31 +42,40 @@ msgstr "Disable connected notifications"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
 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."
+msgstr ""
+"Set this to true to disable notifications when connecting to a network."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "Disable disconnected notifications"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
-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."
+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
 msgid "Disable VPN notifications"
 msgstr "Disable VPN notifications"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:6
-msgid "Set this to true to disable notifications when connecting to or disconnecting from a VPN."
-msgstr "Set this to true to disable notifications when connecting to or disconnecting from a VPN."
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+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
 msgid "Suppress networks available notifications"
 msgstr "Suppress networks available notifications"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
-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."
+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
 msgid "Stamp"
@@ -74,15 +83,18 @@ msgstr "Stamp"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:10
 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."
+msgstr ""
+"Used to determine whether settings should be migrated to a new version."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
 msgstr "Disable WiFi Create"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
-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."
+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
 msgid "Show the applet in notification area"
@@ -90,77 +102,123 @@ msgstr "Show the applet in notification area"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:14
 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."
+msgstr ""
+"Set to FALSE to disable displaying the applet in the notification area."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "Ignore CA certificate"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:16
-msgid "Set this to true to disable warnings about CA certificates in EAP authentication."
-msgstr "Set this to true to disable warnings about CA certificates in EAP authentication."
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:17
-msgid "Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication."
-msgstr "Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication."
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "מנהל הרשתות"
 
-#: ../src/8021x.ui.h:1
-#: ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "מנהל הרשתות"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "אימות 802.1X"
 
-#: ../src/8021x.ui.h:2
-#: ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "ה_תחברות"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "שם ה_רשת:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "ייעודי (Ad-hoc)"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "הוספת/הפעלת החיבור נכשלה"
 
-#: ../src/applet.c:576
-#: ../src/applet.c:620
-#: ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328
-#: ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "שגיאה בלתי מוכרת"
 
-#: ../src/applet.c:579
-#: ../src/applet.c:649
-#: ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "ההתקשרות נכשלה"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "ניתוק ההתקן נכשל"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "הניתוק נכשל"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "הפעלת החיבור נכשלה"
 
-#: ../src/applet.c:957
-#: ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "אין להציג הודעה זאת שוב"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the network connection was interrupted."
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
 msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל בגלל שחיבור הרשת נקטע."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -169,16 +227,17 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל בגלל ששירות ה־VPN הופסק בפתאומיות."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service returned invalid configuration."
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
 msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל בגלל ששירות ה־VPN החזיר תצורה לא תקינה."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -187,7 +246,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל משום שתם הזמן המוקצב לחיבור."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -196,7 +255,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל מכיוון ששירות ה־VPN לא התחיל בזמן."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -205,7 +264,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל מכיוון שהפעלת שירות ה־VPN נכשלה."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -214,7 +273,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל עקב העדר סודות VPN תקפים."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -223,7 +282,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל בגלל סודות VPN שגויים."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -232,16 +291,17 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נכשל."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' disconnected because the network connection was interrupted."
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
 msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' התנתק מכיוון שחיבור הרשת הופרע."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -250,7 +310,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' התנתק בגלל ששירות ה־VPN הופסק."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -259,7 +319,7 @@ msgstr ""
 "\n"
 "חיבור ה־VPN‏ '%s' נותק."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -270,21 +330,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "חיבור ה־VPN נוצר בהצלחה.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "הודעת כניסה ל־VPN"
 
-#: ../src/applet.c:1141
-#: ../src/applet.c:1149
-#: ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "חיבור VPN נכשל"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -297,7 +355,7 @@ msgstr ""
 "\n"
 "'%s'"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -310,858 +368,546 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "ההתקן אינו מוכן (חסרה קושחה)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "ההתקן אינו מוכן"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545
-#: ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119
-#: ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "מנותק"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "הנתקות"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "ההתקן לא מנוהל"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "לא נמצא התקן רשת זמין"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_חיבורי VPN"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "ה_גדרת VPN..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_ניתוק VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "מנהל הרשתות אינו פעיל..."
 
-#: ../src/applet.c:1970
-#: ../src/applet.c:2940
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "מנהל הרשתות כבוי"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "הפעלת _חיבורי רשת"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "הפעלת ת_קשורת רשת אלחוטית"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "הפעלת פס _רחב נייד"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "הפעלת פס _רחב נייד מ_סוג WiMAX"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "הפעלת הה_תרעות"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_פרטי החיבור"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "עריכת חיבורים..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "ע_זרה"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "על _אודות"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "התחברת כעת אל '%s'."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "נותק"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "חיבור הרשת נותק."
 
-#: ../src/applet.c:2802
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "חיבור הרשת '%s' בהכנות..."
 
-#: ../src/applet.c:2805
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "נדרש אימות משתמש עבור חיבור הרשת ‏'%s'..."
 
-#: ../src/applet.c:2808
-#: ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445
-#: ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "מתבקשת כתובת רשת עבור '%s'...."
 
-#: ../src/applet.c:2811
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "חיבור הרשת '%s' פעיל"
 
-#: ../src/applet.c:2894
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "חיבור ה־VPN ‏'%s' מופעל..."
 
-#: ../src/applet.c:2897
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "נדרש אימות משתמש עבור חיבור ה־VPN ‏'%s'..."
 
-#: ../src/applet.c:2900
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "מתבקשת כתובת VPN עבור ‏'%s'..."
 
-#: ../src/applet.c:2903
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "חיבור ה־VPN‏ '%s' פעיל"
 
-#: ../src/applet.c:2945
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "אין חיבור רשת"
 
-#: ../src/applet.c:3615
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "יישומון מנהל הרשתות"
 
-#: ../src/applet-device-bond.c:76
-#: ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:769
-#: ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301
-#: ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357
-#: ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72
-#: ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837
-#: ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "זמין"
-
-#: ../src/applet-device-bond.c:89
-#: ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:796
-#: ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340
-#: ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396
-#: ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85
-#: ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243
-#: ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "החיבור נוצר"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "התחברת כעת לרשת מאוגדת."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "חיבור הרשת המאוגד ‏'%s' בהכנה..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "חיבור הרשת המאוגד ‏'%s' מוגדר..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "נדרש אימות משתמש עבור חיבור הרשת המאוגד ‏'%s'..."
-
-#: ../src/applet-device-bond.c:123
-#: ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176
-#: ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "מתבקשת כתובת עבור ‏'%s'..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "החיבור המאוגד‏ '%s' פעיל"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "התחברת כעת אל הרשת המגושרת."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "חיבור הגשר ‏'%s' בהכנה..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "חיבור הגשר ‏'%s' מוגדר..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "נדרש אימות משתמש עבור חיבור הגשר ‏'%s'..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "חיבור הגשר‏ '%s' פעיל"
-
-#: ../src/applet-device-broadband.c:164
-#: ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "קוד ה־PUK שגוי; נא ליצור קשר עם הספק שלך."
 
-#: ../src/applet-device-broadband.c:206
-#: ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257
-#: ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "נשלח קוד שחרור..."
 
-#: ../src/applet-device-broadband.c:715
-#: ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303
-#: ../src/applet-dialogs.c:421
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "פס רחב נייד (%s)"
 
-#: ../src/applet-device-broadband.c:717
-#: ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "פס רחב נייד"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "זמין"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:782
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "חיבור פס רחב נייד חדש..."
 
-#: ../src/applet-device-broadband.c:797
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "החיבור נוצר"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "רשת הפס הרחב הנייד מחוברת כעת."
 
-#: ../src/applet-device-broadband.c:932
-#: ../src/applet-device-broadband.c:938
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "רשת פס רחב נייד."
 
-#: ../src/applet-device-broadband.c:933
-#: ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "נרשמת כעת לרשת הביתית."
 
-#: ../src/applet-device-broadband.c:939
-#: ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "נרשמת כעת לרשת נדידה."
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "רשת הפס הרחב הנייד מחוברת כעת."
 
-#: ../src/applet-device-bt.c:127
-#: ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "חיבור הפס הרחב הנייד '%s' בהכנות..."
 
-#: ../src/applet-device-bt.c:130
-#: ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "הגדרת התצורה של חיבור הפס הרחב הנייד '%s'..."
 
-#: ../src/applet-device-bt.c:133
-#: ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "נדרש אימות מהמשתמש עבור חיבור הפס הרחב הנייד '%s'..."
 
-#: ../src/applet-device-bt.c:140
-#: ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "חיבור הפס הרחב הנייד '%s' פעיל"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "חיבור פס רחב נייד (CDMA) חדש..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "התחברת כעת לרשת CDMA."
-
-#: ../src/applet-device-cdma.c:402
-#: ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "רשת CDMA."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "‏אתרנט אוטומטי"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "רשתות קוויות (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "רשת קווית (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "רשתות קוויות"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "רשת קווית"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "התחברת כעת לרשת הקווית."
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "חיבור הרשת הקווית '%s' בהכנות..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "תצורת חיבור הרשת הקווית '%s' מוגדרת..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "נדרש אימות מהמשתמש עבור חיבור הרשת הקווית '%s'..."
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "מתבקשת כתובת לרשת הקווית עבור '%s'...."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "החיבור לרשת הקווית '%s' פעיל"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "אימות DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "חיבור פס רחב נייד (GSM) חדש..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "התחברת כעת לרשת ה־GSM."
-
-#: ../src/applet-device-gsm.c:661
-#: ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "רשת GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "אינפיניבנד אוטומטי"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "רשתות אינפיניבנד (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "רשת אינפיניבנד (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "רשתות אינפיניבנד"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "רשת אינפיניבנד"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "התחברת כעת לרשת אינפיניבנד."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "חיבור האינפיניבנד ‏'%s' בהכנה..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "חיבור האינפיניבנד ‏'%s' מוגדר..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "נדרש אימות משתמש עבור חיבור האינפיניבנד ‏'%s'..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "חיבור האינפיניבנד '%s' פעיל"
-
-#: ../src/applet-device-team.c:86
-#, fuzzy
-msgid "You are now connected to the teamed network."
-msgstr "התחברת כעת לרשת הקווית."
-
-#: ../src/applet-device-team.c:110
-#, fuzzy, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "חיבור הגשר ‏'%s' בהכנה..."
-
-#: ../src/applet-device-team.c:113
-#, fuzzy, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "חיבור הגשר ‏'%s' מוגדר..."
-
-#: ../src/applet-device-team.c:116
-#, fuzzy, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "נדרש אימות משתמש עבור חיבור ה־VPN ‏'%s'..."
-
-#: ../src/applet-device-team.c:123
-#, fuzzy, c-format
-msgid "Team connection '%s' active"
-msgstr "חיבור ה־VPN‏ '%s' פעיל"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "התחברת כעת לרשת הווירטואלית."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "חיבור הרשת הווירטואלית ‏'%s' בהכנה..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "חיבור הרשת הווירטואלית ‏'%s' מוגדר..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "נדרש אימות משתמש עבור חיבור הרשת הווירטואלית ‏'%s'..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "חיבור הרשת הווירטואלית '%s' פעיל"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "ה_תחברות לרשת אלחוטית סמויה..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "יצירת רשת אלחוטית _חדשה..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(אין)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "רשתות אלחוטיות (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "רשת אלחוטית (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "רשת אלחוטית"
 msgstr[1] "רשתות אלחוטיות"
 msgstr[2] "2 רשתות אלחוטיות"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "הרשת האלחוטית מנוטרלת"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "התקשורת האלחוטית מנוטרלת באמצעות מתג חומרה"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "רשתות נוספות"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "רשתות אלחוטיות זמינות"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ניתן להשתמש בתפריט הרשתות כדי להתחבר לרשת אלחוטית"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "התחברת כעת לרשת האלחוטית '%s'."
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "חיבור הרשת '%s' בהכנות..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "תצורת חיבור הרשת האלחוטית '%s' מוגדרת..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "נדרש אימות מהמשתמש עבור חיבור הרשת האלחוטית '%s'..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "מתבקשת כתובת רשת אלחוטית עבור '%s'...."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "חיבור הרשת האלחוטית '%s' פעיל: %s ‏(%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "החיבור לרשת האלחוטית '%s' פעיל"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "הפעלת ההתקשרות נכשלה"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "הוספת החיבור החדש נכשלה"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "פס רחב נייד מסוג WiMAX‏ (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "פס רחב נייד מסוג WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "רשת ה־WiMAX כבויה"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "תקשורת ה־WiMAX מנוטרלת באמצעות מתג חומרה"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "התחברת כעת לרשת ה־WiMAX."
-
-#: ../src/applet-device-wimax.c:454
-#: ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "חיבור הפס הרחב הנייד '%s' פעיל: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457
-#: ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "נדידה"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "שגיאה בהצגת נתוני החיבור:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:918
-#: ../src/wireless-security/wireless-security.c:441
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "‏WEP דינמי"
 
-#: ../src/applet-dialogs.c:113
-#: ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "כתובות"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248
-#: ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "אין"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (בררת מחדל)"
 
-#: ../src/applet-dialogs.c:343
-#: ../src/applet-dialogs.c:481
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u מסל״ש"
 
-#: ../src/applet-dialogs.c:345
-#: ../src/applet-dialogs.c:483
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d דציבל"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "לא ידוע"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "כתובת IP:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "כתובת השידור:"
 
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "בלתי ידוע"
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "לא ידוע"
 
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "בלתי ידוע"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "מסכת רשת משנה:"
 
-#: ../src/applet-dialogs.c:407
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:423
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:429
-#: ../src/applet-dialogs.c:788
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "כללי"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "מנשק:"
 
-#: ../src/applet-dialogs.c:449
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "כתובת חומרה:"
 
 #. Driver
-#: ../src/applet-dialogs.c:457
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "מנהל התקן:"
 
-#: ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "מהירות:"
 
-#: ../src/applet-dialogs.c:496
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "אבטחה"
 
-#: ../src/applet-dialogs.c:509
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:522
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:550
-#: ../src/applet-dialogs.c:657
-msgid "IP Address:"
-msgstr "כתובת IP:"
-
-#: ../src/applet-dialogs.c:552
-#: ../src/applet-dialogs.c:568
-msgctxt "Address"
-msgid "Unknown"
-msgstr "לא ידוע"
-
-#: ../src/applet-dialogs.c:566
-msgid "Broadcast Address:"
-msgstr "כתובת השידור:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:575
-msgid "Subnet Mask:"
-msgstr "מסכת רשת משנה:"
-
-#: ../src/applet-dialogs.c:577
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "לא ידוע"
-
-#: ../src/applet-dialogs.c:585
-#: ../src/applet-dialogs.c:672
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "נתיב בררת המחדל:"
 
-#: ../src/applet-dialogs.c:597
-msgid "Primary DNS:"
-msgstr "כתובת DNS ראשית:"
-
-#: ../src/applet-dialogs.c:606
-msgid "Secondary DNS:"
-msgstr "כתובת DNS משנית:"
-
-#: ../src/applet-dialogs.c:616
-msgid "Ternary DNS:"
-msgstr "DNS שלישי:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:631
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "בהתעלמות"
 
-#: ../src/applet-dialogs.c:793
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "סוג ה־VPN:"
 
-#: ../src/applet-dialogs.c:800
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "שער הגישה ל־VPN:"
 
-#: ../src/applet-dialogs.c:806
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "שם המשתמש ב־VPN:"
 
-#: ../src/applet-dialogs.c:812
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "הכרזת ה־VPN:"
 
-#: ../src/applet-dialogs.c:818
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "התקשרות הבסיס:"
 
-#: ../src/applet-dialogs.c:820
-#: ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "לא ידוע"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:883
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "לא נמצאו חיבורים פעילים תקינים!"
 
-#: ../src/applet-dialogs.c:911
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1169,114 +915,158 @@ msgstr ""
 "כל הזכויות שמורות © 2008-2005 Novell בע״מ.\n"
 "ותורמים ומתרגמים רבים ומגוונים מהקהילה"
 
-#: ../src/applet-dialogs.c:914
-msgid "Notification area applet for managing your network devices and connections."
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
 msgstr "יישומון המנהל את התקני וחיבורי הרשת."
 
-#: ../src/applet-dialogs.c:916
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "אתר הבית של מנהל הרשתות"
 
-#: ../src/applet-dialogs.c:931
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "משאבים חסרים"
 
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "ססמת רשת פס רחב נייד"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "נדרשת ססמה כדי להתחבר ל־'%s'."
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "ססמה:‏"
 
-#: ../src/applet-dialogs.c:1261
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "נדרש שחרור ה־PIN של ה־SIM"
 
-#: ../src/applet-dialogs.c:1262
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "נדרש שחרור ה־PIN של ה־SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1264
+#: ../src/applet-dialogs.c:1339
 #, c-format
-msgid "The mobile broadband device '%s' requires a SIM PIN code before it can be used."
-msgstr "התקן הפס הרחב הנייד '%s' דורש את קוד ה־PIN של ה־SIM לפני שניתן יהיה להשתמש בו."
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
+"התקן הפס הרחב הנייד '%s' דורש את קוד ה־PIN של ה־SIM לפני שניתן יהיה להשתמש "
+"בו."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1266
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "קוד PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1270
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "הצגת קוד PIN"
 
-#: ../src/applet-dialogs.c:1272
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "נדרש שחרור ה־PUK של ה־SIM"
 
-#: ../src/applet-dialogs.c:1273
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "נדרש שחרור ה־PUK של ה־SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1275
+#: ../src/applet-dialogs.c:1350
 #, c-format
-msgid "The mobile broadband device '%s' requires a SIM PUK code before it can be used."
-msgstr "התקן הפס הרחב הנייד '%s' דורש את קוד ה־PUK של ה־SIM לפני שניתן יהיה להשתמש בו."
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr ""
+"התקן הפס הרחב הנייד '%s' דורש את קוד ה־PUK של ה־SIM לפני שניתן יהיה להשתמש "
+"בו."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1277
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "קוד PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1280
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "קוד PIN חדש:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1282
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "הזנת קוד ה־PIN החדש שוב:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1287
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "הצגת הקודים PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-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:2
 #: ../src/connection-editor/ce-ip6-routes.ui.h:2
-msgid "Ig_nore automatically obtained routes"
-msgstr "ה_תעלמות מנתיבים שהתקבלו אוטומטית"
+#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
 
 #: ../src/connection-editor/ce-ip4-routes.ui.h:3
 #: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "_Use this connection only for resources on its network"
-msgstr "_יש להשתמש בחיבור זה רק עבור משאבים ברשת הפרטי שלו"
+#: ../src/connection-editor/ce-page-ip4.ui.h:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
+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
-msgid "If enabled, this connection will never be used as the default network connection."
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "מ_חיקה"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr "אם נבחר, חיבור זה לא ישמש כחיבור בררת מחדל"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1284,23 +1074,25 @@ msgstr "אם נבחר, חיבור זה לא ישמש כחיבור בררת מח�
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "יצירה..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "נא לבחור את סוג החיבור"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
-"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."
+"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."
 msgstr ""
 "נא לבחור את סוג חיבור עבור ההתחברות החדשה.\n"
 "\n"
-"אם סוג חיבור המבוקש הוא VPN וה־VPN שברצונך ליצור אינו מופיע ברשימה, יתכן שלא מותקן אצלך תוסף ה־VPN המתאים."
+"אם סוג חיבור המבוקש הוא VPN וה־VPN שברצונך ליצור אינו מופיע ברשימה, יתכן שלא "
+"מותקן אצלך תוסף ה־VPN המתאים."
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
 msgid "Round-robin"
@@ -1343,74 +1135,91 @@ msgid "Bonded _connections:"
 msgstr "חיבורים מאו_גדים:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
 msgstr "מ_צב:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "_עריכה"
-
-#. Delete
 #: ../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:703
-msgid "_Delete"
-msgstr "מ_חיקה"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_עריכה"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "תדירות מ_עקב:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "מילישניות"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "שם המ_נשק:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "מ_עקב אחר קשר:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "י_עדי ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-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:20
+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:"
 msgstr "השהיית ה_פעלת החיבור:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "השהיית _ניתוק החיבור:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 #, fuzzy
 msgid "_Primary:"
 msgstr "כתובת DNS ראשית:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "The interface name of the primary device. If set, this device will always be the active slave when it is available."
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "בתים"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "_עלות נתיב:"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "עדיפות:"
 
@@ -1422,44 +1231,89 @@ msgstr "מצב _סיכה:"
 msgid "Bridged _connections:"
 msgstr "חיבורים מגושרים:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "השהיית ה_עברה:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "זמן _שלום:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "שנ׳"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "הפעלת _חיבורי רשת"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "ה_פעלת STP (פרוטוקול עץ משתרע)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "הגיל המ_רבי:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "גיל ההז_דקנות:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "אוטומטי"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "בררת מחדל"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "כתובת"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "כתובת"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "התקן כלשהו"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "אירע כשל בעדכון סודות החיבור עקב שגיאה בלתי ידועה."
 
@@ -1559,97 +1413,100 @@ msgstr ""
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "עדיפות:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 #, fuzzy
 msgid "2:"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 #, fuzzy
 msgid "3:"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 #, fuzzy
 msgid "4:"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 #, fuzzy
 msgid "Priority Bandwidth:"
 msgstr "עדיפות:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
-msgid "Enter the allowed link bandwidth percent each Priority Group may use.  The sum of all groups must total 100%."
+msgid ""
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:44
-msgid "Enter the percentage of priority group bandwidth each user priority may use."
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1662,7 +1519,7 @@ 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:4
+#: ../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
@@ -1670,8 +1527,9 @@ msgid "Sho_w password"
 msgstr "הצ_גת ססמה"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1683,7 +1541,8 @@ msgstr "_ססמה:"
 #: ../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-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "אוטומטי"
@@ -1738,34 +1597,74 @@ msgstr "משא ומתן _אוטומטי"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "כתובת ה־_MAC של ההתקן:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_שירות:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "כתובת ה־MAC המ_שוכפלת:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-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-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 ""
+"כתובת ה־MAC שהוזנה כאן תשמש ככתובת החומרה עבור התקן הרשת שחיבור זה מופעל "
+"דרכו. תכונה זו ידועה כשכפול או זיוף  MAC. לדוגמה: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "בתים"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "בררת מחדל"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "התעלמות"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "שידור"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "ססמת מפתח _פרטי:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1804,8 +1703,8 @@ msgstr "אוטומטי עם הגדרות DNS ידניות"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "ידני"
 
@@ -1816,144 +1715,154 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "משותף למחשבים אחרים"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_שיטה"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "כתובות"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-msgid "The DHCP client identifier allows the network administrator to customize your computer's configuration.  If you wish to use a DHCP client identifier, enter it here."
-msgstr "מזהה לקוח ה־DHCP מאפשר למנהל הרשת שלך להתאים את תצורת המחשב שלך. אם ברצונך להשתמש במזהה לקוח DHCP יש להזין אותו כאן."
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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 יש להזין אותו כאן."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "Domains used when resolving host names. Use commas to separate multiple domains."
-msgstr "שמות מתחם המשמשים לפתרון שמות מארחים. יש להשתמש בפסיקים כדי להפריד מספר שמות מתחם."
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+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.h:13
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "מתחמי _חיפוש:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "שרתי _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-msgid "IP addresses of domain name servers used to resolve host names. Use commas to separate multiple domain name server addresses."
-msgstr "כתובת IP של שמות מתחם המשתמשים לפתרון שמות מאחרים. יש להשתמש בפסיקים כדי להפריד מספר כתובות שמות מתחם."
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+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.h:17
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "יש צורך בחלוקת כתובות IPv_4 כדי להשלים חיבור זה"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
-msgid "When connecting to IPv6-capable networks, allows the connection to complete if IPv4 configuration fails but IPv6 configuration succeeds."
-msgstr "בעת התחברות לרשתות תומכות IPv6 השלמת החיבור תתאפשר אם תצורת ה־IPv4 תיכשל אך תצורת ה־IPv6 תצליח."
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_נתיבים…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#, fuzzy
-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 של שמות מתחם המשתמשים לפתרון שמות מאחרים. יש להשתמש בפסיקים כדי להפריד מספר כתובות שמות מתחם."
-
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "Require IPv_6 addressing for this connection to complete"
-msgstr "יש צורך בחלוקת כתובות IPv_6 כדי להשלים חיבור זה"
-
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
-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
-msgid "Any"
-msgstr "כלשהו"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "מנוטרל"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "העדפה ל־3G ‏(UMTS/HSPA)"
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 של שמות מתחם המשתמשים לפתרון שמות מאחרים. יש להשתמש בפסיקים כדי "
+"להפריד מספר כתובות שמות מתחם."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "העדפה ל־2G‏ (GPRS/EDGE)"
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "העדפה ל־4G‏ (LTE)"
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr "יש צורך בחלוקת כתובות IPv_6 כדי להשלים חיבור זה"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "יש להשתמש ב־4G בלבד (LTE)"
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+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:8
+#: ../src/connection-editor/ce-page-mobile.ui.h:1
 msgid "Basic"
 msgstr "בסיסי"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "מס_פר:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "‏_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "מזהה הר_שת:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_סוג:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "שינוי..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "מתן אפשרות ל_נדידה אם הרשת הביתית לא זמינה"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "הצ_גת ססמאות"
 
@@ -2022,7 +1931,7 @@ msgstr "חיבורים מאו_גדים:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
 #, fuzzy
-msgid "I_mport team configuration from a file..."
+msgid "Im_port team configuration from a file..."
 msgstr "יבוא תצורת חיבור VPN שנשמרה..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
@@ -2030,24 +1939,46 @@ msgid "_Parent interface:"
 msgstr "מ_נשק ההורה:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "שם מנשק ה־VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "כתובת ה־MAC המ_שוכפלת:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "מ_זהה ה־VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "שם ההתקן + מספר"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "„vlan“ + מספר"
 
@@ -2064,245 +1995,268 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "תשתית"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "ייעודי (Ad-hoc)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "עצ_מת השידור:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "מסל״ש"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_קצב:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "‏_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_ערוץ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_ערוץ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "מ_צב:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "שיטות האימות המורשות"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "פרוטוקול אימות בר הרחבה"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "פרוטוקול אימות סיסמה"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "פרוטוקול אימות אתגר לחיצת יד"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "פרוטוקול אימות אתגר לחיצת-יד של מיקרוסופט"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "פרוטוקול אימות אתגר לחיצת-יד של מיקרוסופט גירסה 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-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 של הספק יתמכו בכל שיטות האימות. אם החיבור נכשל, יש לנסות לבטל חלק מהשיטות."
-
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:887
-msgid "Address"
-msgstr "כתובת"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "מסכת רשת"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:921
-msgid "Gateway"
-msgstr "שער גישה"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "מטרית"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:904
-msgid "Prefix"
-msgstr "קידומת"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+"ברוב המקרים, שרתי ה־PPP של הספק יתמכו בכל שיטות האימות. אם החיבור נכשל, יש "
+"לנסות לבטל חלק מהשיטות."
 
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "רשת קווית"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465
-#: ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "רשת אלחוטית"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331
-#: ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433
-#: ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "מאגד"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244
-#: ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "גשר"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487
-#: ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "חומרה"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "וירטואלי"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "יבוא תצורת חיבור VPN שנשמרה..."
 
-#: ../src/connection-editor/new-connection.c:378
-msgid "The connection editor dialog could not be initialized due to an unknown error."
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
 msgstr "אתחול תיבת הדו־שיח של עורך ההתחברות לא צלח בשל שגיאה לא מוכרת."
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "לא ניתן ליצור חיבור חדש"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "מחיקת החיבור נכשלה"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "האם ברצונך למחוק את החיבור %s?"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "כתובת"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "מסכת רשת"
+
+#: ../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
+msgid "Gateway"
+msgstr "שער גישה"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "מטרית"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "קידומת"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "עריכת %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "עריכת חיבור ללא שם"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
-msgid "The connection editor could not find some required resources (the .ui file was not found)."
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_שם החיבור:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "שגיאה באתחול העורך"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "הוספת החיבור נכשלה"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_שמירה"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "שמירת שינויים כלשהם שנערכו לחיבור זה."
 
-#: ../src/connection-editor/nm-connection-editor.c:420
-msgid "_Save..."
-msgstr "_שמירה..."
-
 #: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "יש צורך באימות כדי לשמור את החיבור לכל המשתמשים במחשב."
@@ -2319,42 +2273,37 @@ msgstr "לא ניתן לערוך את החיבור"
 msgid "Unknown error creating connection editor dialog."
 msgstr "אירעה שגיאה בלתי ידועה בעת יצירת חלון עריכת החיבורים."
 
-#: ../src/connection-editor/nm-connection-editor.c:573
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "שגיאה באתחול העורך"
 
-#: ../src/connection-editor/nm-connection-editor.c:906
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "הוספת החיבור נכשלה"
 
-#: ../src/connection-editor/nm-connection-editor.c:946
-msgid "Error saving connection"
-msgstr "שגיאה בשמירת החיבור"
-
-#: ../src/connection-editor/nm-connection-editor.c:947
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "המאפיין '%s' ‏/ '%s' לא תקין: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "_שם החיבור:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "י_צוא..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "אף פעם"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "כעת"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2362,7 +2311,7 @@ msgstr[0] "לפני דקה"
 msgstr[1] "לפני %d דקות"
 msgstr[2] "לפני שתי דקות"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2370,7 +2319,7 @@ msgstr[0] "לפני שעה"
 msgstr[1] "לפני %d שעות"
 msgstr[2] "לפני שעתיים"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2378,7 +2327,7 @@ msgstr[0] "לפני יום"
 msgstr[1] "לפני %d ימים"
 msgstr[2] "לפני יומיים"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2386,7 +2335,7 @@ msgstr[0] "לפני חודש"
 msgstr[1] "לפני %d חודשים"
 msgstr[2] "לפני חודשיים"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2394,86 +2343,121 @@ msgstr[0] "לפני שנה"
 msgstr[1] "לפני %d שנים"
 msgstr[2] "לפני שנתיים"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "שם"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "שימוש אחרון"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "עריכת החיבור המסומן"
 
-#: ../src/connection-editor/nm-connection-list.c:688
-msgid "_Edit..."
-msgstr "_עריכה..."
-
-#: ../src/connection-editor/nm-connection-list.c:689
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "נדרש אימות כדי לערוך את החיבור המסומן"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "מחיקת החיבור המסומן"
 
-#: ../src/connection-editor/nm-connection-list.c:705
-msgid "_Delete..."
-msgstr "מ_חיקה..."
-
-#: ../src/connection-editor/nm-connection-list.c:706
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "נדרש אימות כדי למחוק את החיבור המסומן"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "לא הותקנו תוספי VPN."
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "לא ידוע כיצד ליצור חיבורים מסוג '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "שגיאה ביצירת החיבור"
 
-#: ../src/connection-editor/nm-connection-list.c:995
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "שגיאה בעריכת החיבור"
 
-#: ../src/connection-editor/nm-connection-list.c:996
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "לא נמצא חיבור עם המזהה הייחודי '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "אבטחת 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש של אבטחת 802.1x."
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "שימוש באבטחת _‎8021.X עבור חיבור זה"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "לא ניתן לטעון את מנשק המשתמש לחיבור DSL."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "לא ניתן למצוא התקן Bluetooth."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "חיבור מאוגד %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "רשת קווית"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "רשת אלחוטית"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש למאגד."
 
-#: ../src/connection-editor/page-bond.c:594
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "כתובת DNS ראשית:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "חיבור מאוגד %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לגישור."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "חיבור מגושר %d"
@@ -2481,288 +2465,358 @@ msgstr "חיבור מגושר %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "פתחת הגשר"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש של פתחת הגישור."
 
-#: ../src/connection-editor/page-dcb.c:607
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:609
+#: ../src/connection-editor/page-dcb.c:605
 #, fuzzy
 msgid "Could not load DCB user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לחיבור DSL."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לחיבור DSL."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "חיבור DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
-msgid "This option locks this connection to the network device specified by its permanent MAC address entered here.  Example: 00:11:22:33:44:55"
-msgstr "אפשרות זו נועלת חיבור זה להתקן הרשת שהוגדר על ידי כתובת ה־MAC הקבועה שצוינה להלן.  לדוגמה: 00:11:22:33:44:55"
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"אפשרות זו נועלת חיבור זה להתקן הרשת שהוגדר על ידי כתובת ה־MAC הקבועה שצוינה "
+"להלן.  לדוגמה: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לרשת קווית."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "רשת קווית"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "כתובת ה־MAC המ_שוכפלת:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "בררת מחדל"
 
-#: ../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:52
+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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "סוכן חומת האש אינו פעיל."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש הכללי."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לרשת InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "חיבור InfiniBand‏ %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "אוטומטי (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "כתובות אוטומטיות (VPN) בלבד"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "אוטומטי (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "כתובות אוטומטיות (PPP) בלבד"
+msgid "Automatic, addresses only"
+msgstr "אוטומטי כתובות בלבד"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "אוטומטי (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "כתובות אוטומטיות (PPPoE) בלבד"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "אוטומטי (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "כתובות אוטומטיות (DHCP) בלבד"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "קישוריות מקומית בלבד"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "מנוטרל"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "שרתי _DNS נוספים:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "מתחמי _חיפוש נוספים:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "עריכת נתיבי IPv4 עבור %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "הגדרות IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־IPv4."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "אוטומטי כתובות בלבד"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "התעלמות"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "אוטומטי, DHCP בלבד"
 
-#: ../src/connection-editor/page-ip6.c:819
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "עריכת נתיבי IPv6 עבור %s"
 
-#: ../src/connection-editor/page-ip6.c:969
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "הגדרות IPv6"
 
-#: ../src/connection-editor/page-ip6.c:971
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־IPv6."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
-msgid "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the same physical device."
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s מחפה על %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לרשת פס רחב אלחוטית."
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "סוג חיבור פס הנייד הרחב לא נתמך."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "בחירת סוג הפס הרחב הנייד"
 
-#: ../src/connection-editor/page-mobile.c:647
-msgid "Select the technology your mobile broadband provider uses.  If you are unsure, ask your provider."
-msgstr "נא לבחור את הטכנולוגיה בה משתמש ספק הפס הרחב הנייד שלך. במידה של חוסר ודאות, נא לשאול את הספק שלך."
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
+"נא לבחור את הטכנולוגיה בה משתמש ספק הפס הרחב הנייד שלך. במידה של חוסר ודאות, "
+"נא לשאול את הספק שלך."
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "הספק שלי משתמש בטכנולוגיה המבוססת על _CDMA ‏(לדוגמה 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:669
-#: ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672
-#: ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:248
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:298
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:264
-#: ../src/wireless-security/eap-method-ttls.c:281
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ללא"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "הגדרות PPP"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־PPP."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:234
+#: ../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 "בחירת קובץ לייבוא"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־vlan."
 
-#: ../src/connection-editor/page-team.c:346
+#: ../src/connection-editor/page-team.c:377
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "חיבור DSL %d"
@@ -2770,12 +2824,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:157
+#: ../src/connection-editor/page-team-port.c:151
 #, fuzzy
 msgid "Team Port"
 msgstr "פתחת הגשר"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש של פתחת הגישור."
@@ -2783,36 +2837,45 @@ 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "אין חיבור רשת"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־vlan."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "חיבור VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש ל־VPN."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "לא ניתן למצוא שירות תוסף VPN עבור '%s'."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "חיבור VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2822,86 +2885,119 @@ msgstr ""
 "\n"
 "שגיאה: אין סוג שירות VPN ."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "נא לבחור את סוג חיבור ה־VPN"
 
-#: ../src/connection-editor/page-vpn.c:276
-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 המתאים."
+#: ../src/connection-editor/page-vpn.c:255
+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 "
+"המתאים."
+
+#: ../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 ""
+"אפשרות זהו נועלת חיבור זה לנקודה הגישה האלחוטית (AP) שצוינה על ידי ה־BSSID "
+"שצוין כאן. לדוגמה: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:85
-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 "אפשרות זהו נועלת חיבור זה לנקודה הגישה האלחוטית (AP) שצוינה על ידי ה־BSSID שצוין כאן. לדוגמה: 00:11:22:33:44:55"
+#: ../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)\""
+msgstr ""
+"אפשרות זו נועלת חיבור זה להתקן הרשת שהוגדר על ידי כתובת ה־MAC הקבועה שצוינה "
+"להלן.  לדוגמה: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u מה״ץ)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש לרשת אלחוטית."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "התקן כלשהו"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "חיבור אלחוטי %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:892
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:901
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "ססמת WEP ‏bit-‏128"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../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)"
 msgstr "‏WEP דינאמי (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:945
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "‏WPA & WPA2 אישי"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:959
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "‏WPA & WPA2 עסקי"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
-msgstr "לא ניתן לטעון את מנשק המשתמש של אבטחת הרשת האלחוטית; חסרה הגדרה לרשת האלחוטית."
+msgstr ""
+"לא ניתן לטעון את מנשק המשתמש של אבטחת הרשת האלחוטית; חסרה הגדרה לרשת "
+"האלחוטית."
 
-#: ../src/connection-editor/page-wifi-security.c:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "אבטחת רשת אלחוטית"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "לא ניתן לטעון את מנשק המשתמש של אבטחת הרשת האלחוטית."
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "לא ניתן לטעון את מנשק המשתמש לרשת WiMAX."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "חיבור WiMAX‏ %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "לא ניתן לייבא חיבור VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../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"
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
 "\n"
 "Error: %s."
 msgstr ""
@@ -2909,25 +3005,30 @@ msgstr ""
 "\n"
 "שגיאה: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:284
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "שגיאה בלתי מוכרת"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "קובץ בשם \"%s\" כבר קיים."
 
-#: ../src/connection-editor/vpn-helpers.c:286
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "ה_חלפה"
 
-#: ../src/connection-editor/vpn-helpers.c:288
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:324
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "לא ניתן לייצא חיבור VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:326
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2938,100 +3039,21 @@ msgstr ""
 "\n"
 "שגיאה: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:361
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "יצוא חיבור VPN..."
 
-#: ../src/ethernet-dialog.c:92
-#: ../src/ethernet-dialog.c:100
-msgid "The NetworkManager Applet could not find some required resources (the .ui file was not found)."
+#: ../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 "יישומון מנהל הרשתות לא מצא חלק מהמשאבים הדרושים (קובץ ה־‎.ui לא נמצא)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "הגדרת ה־Bluetooth אינה אפשרית (ההתחברות ל־D-Bus נכשלה: (%s)‏ %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid "Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "הגדרת ה־Bluetooth אינה אפשרית (שגיאה במציאת מנהל הרשתות:‏ (%s)‏ %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "שימוש בטלפון הסלולרי שלך כהתקן רשת (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "גישה לאינטרנט באמצעות הטלפון הסלולרי שלך (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "שגיאה: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "אירע כשל ביצירת חיבור בהתקשרות: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:947
-msgid "Your phone is now ready to use!"
-msgstr "הטלפון שלך מוכן כעת לשימוש!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "האשף הסלולרי בוטל"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "סוג המכשיר אינו ידוע (לא GSM או CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "סוג המודם אינו ידוע."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:721
-#: ../src/gnome-bluetooth/nma-bt-device.c:727
-msgid "failed to connect to the phone."
-msgstr "אירע כשל בחיבור לטלפון"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:758
-msgid "unexpectedly disconnected from the phone."
-msgstr "החיבור לטלפון נותק באופן פתאומי."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:768
-msgid "timed out detecting phone details."
-msgstr "תם זמן ההמתנה לזיהוי פרטי הטלפון."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:779
-msgid "Detecting phone configuration..."
-msgstr "תצורת הטלפון מזוהה כעת..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:811
-msgid "error getting bus connection"
-msgstr "שגיאה בקבלת ההתחברות לאפיק"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:908
-msgid "The default Bluetooth adapter must be enabled before setting up a Dial-Up-Networking connection."
-msgstr "יש להפעיל את התקן ה־Bluetooth כבררת מחדל בטרם הגדרת חיבור לרשת בחיוג."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:945
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "אירע כשל ביצירת חיבור רשת במתחם המיידי: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:966
-#, c-format
-msgid "%s Network"
-msgstr "רשת %s"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_שחרור"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "שחרור מכשיר זה אוטומטית"
 
@@ -3039,408 +3061,510 @@ msgstr "שחרור מכשיר זה אוטומטית"
 msgid "Connection Information"
 msgstr "פרטי החיבור"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "חיבורי חשת פעילים"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
-msgid "Your mobile broadband connection is configured with the following settings:"
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "ההתקן שלך:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "הספק שלך:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "התכנית שלך:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
-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: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/libnm-gtk/nm-mobile-wizard.c:266
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "אישור הגדרות פס רחב נייד"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:330
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "לא רשום"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:461
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_בחירת התכנית שלך:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:485
+#: ../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/libnm-gtk/nm-mobile-wizard.c:505
+#: ../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"
+"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"
 "\n"
 "במקרה של חוסר ודאות בנוגע לתכנית, נא לפנות אל הספק לפרטים."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:512
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "בחירת תכנית החיוב"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:561
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "התכנית שלי לא מופיעה..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:714
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "בחירת הספק שלך מ_רשימה:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:727
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ספק"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:752
+#: ../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/libnm-gtk/nm-mobile-wizard.c:765
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "ספק:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:782
+#: ../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/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:795
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "בחירת הספק שלך"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "מדינה או רשימת אזורים:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "מדינה או אזור"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "המדינה שלי לא מופיעה"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1174
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "התקן GSM מותקן"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "התקן CDMA מותקן"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
-msgid "This assistant helps you easily set up a mobile broadband connection to a cellular (3G) network."
+#: ../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 "אשף זה עוזר בהגדרה פשוטה חיבור פס נייד רחב לרשת סלולרית (דור שלישי)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "המידע הבא יהיה דרוש לך:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "שם ספק רוחב הפס שלך"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "שם תכנית החיוב שלך"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
+#: ../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 "(בחלק מהמקרים) שם נקודת הגישה (Access Point Name) של תכנית החיוב שלך"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../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 "יצירת חיבור עבור התקן הפס הרחב הנייד ה_זה:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "התקן כלשהו"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "הגדרת חיבור פס רחב נייד"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "חיבור פס רחב נייד חדש"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304
-#: ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "קווי"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "רישות OLPC"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "ססמה מ_שנית:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "ססמה מ_שנית:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486
-#: ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../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
+#, 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/libnm-gtk/nm-wifi-dialog.c:435
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "חדש..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:875
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "אין"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "י_צירה"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1130
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
-msgid "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "נדרשים ססמאות או מפתחות הצפנה כדי לגשת לרשת האלחוטית '%s'."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1132
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "נדרש אימות לרשת האלחוטית"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1134
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "הרשת האלחוטית דורשת אימות"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "יצירת רשת אלחוטית חדשה"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "רשת אלחוטית חדשה"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "נא להזין את שם הרשת האלחוטית שברצונך ליצור."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "התחברות לרשת אלחוטית סמויה"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "רשת אלחוטית סמויה"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
-msgid "Enter the name and security details of the hidden Wi-Fi network you wish to connect to."
-msgstr "נא להקליד את השם ואת פרטי האבטחה של הרשת האלחוטית הסמויה שברצונך להתחבר אליה."
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "ססמה מ_שנית:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "הצ_גת ססמאות"
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"נא להקליד את השם ואת פרטי האבטחה של הרשת האלחוטית הסמויה שברצונך להתחבר אליה."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "אבטחת רשת אל_חוטית:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "חי_בור:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "מ_תאם רשת אלחוטית:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "רישות OLPC"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "ניצול:"
 
-#: ../src/main.c:75
-msgid "This program is a component of NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/)."
-msgstr "This program is a component of NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/)."
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
 
-#: ../src/main.c:76
-msgid "It is not intended for command-line interaction but instead runs in the GNOME desktop environment."
-msgstr "It is not intended for command-line interaction but instead runs in the GNOME desktop environment."
+#: ../src/main.c:45
+msgid ""
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
+msgstr ""
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "לא פעיל"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "לא רשום"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "רשת ביתית (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "רשת ביתית"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "חיפוש"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "הרישום נדחה"
 
-#: ../src/mb-menu-item.c:154
-#: ../src/mb-menu-item.c:160
+#: ../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:156
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (בנדידה)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "רשת נדידה (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "רשת נדידה"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "קוד PIN עבור כרטיס ה־SIM‏ '%s' שב־ '%s'"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "נדרש קוד PIN"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "נדרש קוד PIN עבור התקן הפס הרחב הנייד"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "חיבור הפס הרחב הנייד '%s' פעיל: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "נדידה"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "חיבור %s"
 
-#: ../src/utils/utils.c:376
-msgid "Store the password only for this _user"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
 
-#: ../src/utils/utils.c:378
-msgid "Store the password for _all users"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "אישורי DER או PEM ‏(‎*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:298
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:400
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "נא לבחור בקובץ PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "קובצי PAC‏ (‎*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "כל הקבצים"
 
@@ -3476,14 +3600,32 @@ msgstr "אימות _פנימי:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_מתן האפשרות לבדיקת PAC אוטומטית"
 
-#: ../src/wireless-security/eap-method-peap.c:281
-#: ../src/wireless-security/wireless-security.c:417
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:377
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:377
+#: ../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 "בחירת אישור של רשות אישורים..."
 
@@ -3511,29 +3653,63 @@ msgstr "לא _נדרש אישור של רשות אישורים"
 msgid "PEAP _version:"
 msgstr "_גרסת PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "_בקשת ססמה זו בכול פעם"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "אישור C_A:"
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "מפתחות פרטיים בלתי מוצפנים אינם בטוחים"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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"
+"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 ""
-"מסתבר כי המפתח הפרטי שנבחר אינו מוגן בססמה. מצב זה עלול לאפשר לתוקפים לנצל לרעה את פרטי הזיהוי שלך. נא לבחור מפתח פרטי המוגן בססמה.\n"
+"מסתבר כי המפתח הפרטי שנבחר אינו מוגן בססמה. מצב זה עלול לאפשר לתוקפים לנצל "
+"לרעה את פרטי הזיהוי שלך. נא לבחור מפתח פרטי המוגן בססמה.\n"
 "\n"
 "(ניתן להגן על המפתח הפרטי שלך בססמה באמצעות openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "בחירת התעודה האישית שלך..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "בחירת המפתח הפרטי שלך..."
 
@@ -3553,23 +3729,36 @@ msgstr "_מפתח פרטי:"
 msgid "_Private key password:"
 msgstr "ססמת מפתח _פרטי:"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "מהיר"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "‏TLS ממונהר"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "‏EAP מוגן (PEAP)"
 
@@ -3579,6 +3768,44 @@ msgstr "‏EAP מוגן (PEAP)"
 msgid "Au_thentication:"
 msgstr "_אימות:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (בררת מחדל)"
@@ -3603,6 +3830,312 @@ msgstr "הצ_גת מפתח"
 msgid "WEP inde_x:"
 msgstr "_אינדקס WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_סוג:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "הפעלת פס _רחב נייד מ_סוג WiMAX"
+
+#~ msgid "_Help"
+#~ msgstr "ע_זרה"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "התחברת כעת לרשת מאוגדת."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "חיבור הרשת המאוגד ‏'%s' בהכנה..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "חיבור הרשת המאוגד ‏'%s' מוגדר..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "נדרש אימות משתמש עבור חיבור הרשת המאוגד ‏'%s'..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "מתבקשת כתובת עבור ‏'%s'..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "החיבור המאוגד‏ '%s' פעיל"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "התחברת כעת אל הרשת המגושרת."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "חיבור הגשר ‏'%s' בהכנה..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "חיבור הגשר ‏'%s' מוגדר..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "נדרש אימות משתמש עבור חיבור הגשר ‏'%s'..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "חיבור הגשר‏ '%s' פעיל"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "חיבור פס רחב נייד (CDMA) חדש..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "התחברת כעת לרשת CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "רשת CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "חיבור פס רחב נייד (GSM) חדש..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "התחברת כעת לרשת ה־GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "רשת GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "אינפיניבנד אוטומטי"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "רשתות אינפיניבנד (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "רשת אינפיניבנד (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "רשתות אינפיניבנד"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "רשת אינפיניבנד"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "התחברת כעת לרשת אינפיניבנד."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "חיבור האינפיניבנד ‏'%s' בהכנה..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "חיבור האינפיניבנד ‏'%s' מוגדר..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "נדרש אימות משתמש עבור חיבור האינפיניבנד ‏'%s'..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "חיבור האינפיניבנד '%s' פעיל"
+
+#, fuzzy
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "התחברת כעת לרשת הקווית."
+
+#, fuzzy
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "חיבור הגשר ‏'%s' בהכנה..."
+
+#, fuzzy
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "חיבור הגשר ‏'%s' מוגדר..."
+
+#, fuzzy
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "נדרש אימות משתמש עבור חיבור ה־VPN ‏'%s'..."
+
+#, fuzzy
+#~ msgid "Team connection '%s' active"
+#~ msgstr "חיבור ה־VPN‏ '%s' פעיל"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "התחברת כעת לרשת הווירטואלית."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "חיבור הרשת הווירטואלית ‏'%s' בהכנה..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "חיבור הרשת הווירטואלית ‏'%s' מוגדר..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "נדרש אימות משתמש עבור חיבור הרשת הווירטואלית ‏'%s'..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "חיבור הרשת הווירטואלית '%s' פעיל"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "פס רחב נייד מסוג WiMAX‏ (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "פס רחב נייד מסוג WiMAX"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "רשת ה־WiMAX כבויה"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "תקשורת ה־WiMAX מנוטרלת באמצעות מתג חומרה"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "התחברת כעת לרשת ה־WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d דציבל"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "בלתי ידוע"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "בלתי ידוע"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Primary DNS:"
+#~ msgstr "כתובת DNS ראשית:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "כתובת DNS משנית:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "DNS שלישי:"
+
+#~ msgid "_Mode:"
+#~ msgstr "מ_צב:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "כתובת ה־_MAC של ההתקן:"
+
+#~ msgid "Any"
+#~ msgstr "כלשהו"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "העדפה ל־3G ‏(UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "העדפה ל־2G‏ (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "העדפה ל־4G‏ (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "יש להשתמש ב־4G בלבד (LTE)"
+
+#, fuzzy
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "יבוא תצורת חיבור VPN שנשמרה..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "תשתית"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "_Save..."
+#~ msgstr "_שמירה..."
+
+#~ msgid "Error saving connection"
+#~ msgstr "שגיאה בשמירת החיבור"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "המאפיין '%s' ‏/ '%s' לא תקין: %d"
+
+#~ msgid "_Edit..."
+#~ msgstr "_עריכה..."
+
+#~ msgid "_Delete..."
+#~ msgstr "מ_חיקה..."
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "אוטומטי (PPP)"
+
+#~ 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)."
+#~ msgstr "הגדרת ה־Bluetooth אינה אפשרית (ההתחברות ל־D-Bus נכשלה: (%s)‏ %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "הגדרת ה־Bluetooth אינה אפשרית (שגיאה במציאת מנהל הרשתות:‏ (%s)‏ %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "שימוש בטלפון הסלולרי שלך כהתקן רשת (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "גישה לאינטרנט באמצעות הטלפון הסלולרי שלך (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "שגיאה: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "אירע כשל ביצירת חיבור בהתקשרות: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "הטלפון שלך מוכן כעת לשימוש!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "האשף הסלולרי בוטל"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "סוג המכשיר אינו ידוע (לא GSM או CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "סוג המודם אינו ידוע."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "אירע כשל בחיבור לטלפון"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "החיבור לטלפון נותק באופן פתאומי."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "תם זמן ההמתנה לזיהוי פרטי הטלפון."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "תצורת הטלפון מזוהה כעת..."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "שגיאה בקבלת ההתחברות לאפיק"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "יש להפעיל את התקן ה־Bluetooth כבררת מחדל בטרם הגדרת חיבור לרשת בחיוג."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "אירע כשל ביצירת חיבור רשת במתחם המיידי: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "רשת %s"
+
 #~ msgid "No Certificate Authority certificate chosen"
 #~ msgstr "לא נבחר אישור של רשות אישורים"
 
@@ -3642,7 +4175,6 @@ msgstr "_אינדקס WEP:"
 #~ msgstr "רשת אלחוטית (%s)"
 
 #~ msgid "Wireless Network"
-
 #~ msgid_plural "Wireless Networks"
 #~ msgstr[0] "רשת אלחוטית"
 #~ msgstr[1] "רשתות אלחוטיות"
@@ -3693,9 +4225,6 @@ msgstr "_אינדקס WEP:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "לא ידוע כיצד לערוך חיבורים מסוג '%s'"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "לא ניתן למצוא התקן Bluetooth."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "הגדרת ה־Bluetooth אינה אפשרית (אירע כשל ביצירת מתווך D-Bus)."
 
@@ -3723,9 +4252,6 @@ msgstr "_אינדקס WEP:"
 #~ msgid "label"
 #~ msgstr "תווית"
 
-#~ msgid "Network Manager"
-#~ msgstr "מנהל הרשתות"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "ישנו כבר עותק פעיל של nm-applet.\n"
 
@@ -3869,12 +4395,12 @@ msgstr "_אינדקס WEP:"
 
 #~ msgid "Wired network"
 #~ msgstr "רשת קווית"
-#~ msgctxt "No wired security used"
 
+#~ msgctxt "No wired security used"
 #~ msgid "None"
 #~ msgstr "לא"
-#~ msgctxt "Unknown/unrecognized wired or wifi security"
 
+#~ msgctxt "Unknown/unrecognized wired or wifi security"
 #~ msgid "Unknown"
 #~ msgstr "לא ידוע"
 
diff --git a/po/hi.po b/po/hi.po
index bdc04818..1752a347 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -9,9 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2013-02-20 20:21+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -29,7 +28,7 @@ msgstr ""
 "\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "संजाल"
 
@@ -51,49 +50,33 @@ msgid "Disable connected notifications"
 msgstr "कनेक्शन सूचना निष्क्रिय करें"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
-#| msgid ""
-#| "Set this to TRUE to disable notifications when connecting to a network."
 msgid "Set this to true to disable notifications when connecting to a network."
-msgstr ""
-"इसे सही पर सेट करें सूचना निष्क्रिय करने के लिए जब संजाल से कनेक्ट कर रहा हो. "
+msgstr "इसे सही पर सेट करें सूचना निष्क्रिय करने के लिए जब संजाल से कनेक्ट कर रहा हो. "
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "डिसकनेक्टेज सूचना निष्क्रिय करें"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
-msgstr ""
-"सूचना निष्क्रिय करने के लिए इसे सही पर सेट करें जब संजाल से डिसकनेक्ट कर रहा "
-"हो. "
+msgstr "सूचना निष्क्रिय करने के लिए इसे सही पर सेट करें जब संजाल से डिसकनेक्ट कर रहा हो. "
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
-#| msgid "Disable connected notifications"
 msgid "Disable VPN notifications"
 msgstr " VPN सूचना निष्क्रिय करें"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:6
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
-msgstr ""
-"इसे सही पर सेट सूचनाओं जब जोड़ने या एक वीपीएन से डिस्कनेक्ट को निष्क्रिय."
+msgstr "इसे सही पर सेट सूचनाओं जब जोड़ने या एक वीपीएन से डिस्कनेक्ट को निष्क्रिय."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:7
 msgid "Suppress networks available notifications"
 msgstr "संडाल उपलब्ध अधिसूचना दबाएँ"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
-#| msgid ""
-#| "Set this to TRUE to disable notifications when wireless networks are "
-#| "available."
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "सही पर सेट करने के लिए सूचनाओं को अक्षम जब वाईफाई नेटवर्क उपलब्ध हैं."
@@ -105,84 +88,129 @@ msgstr "स्टैम्प"
 #: ../org.gnome.nm-applet.gschema.xml.in.h:10
 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 WiFi Create"
 msgstr "WiFi निर्माण निष्क्रिय करें"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
-#| msgid ""
-#| "Set to TRUE to disable creation of adhoc networks when using the applet."
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
-"तदर्थ नेटवर्क के निर्माण को निष्क्रिय करने के लिए जब एप्लेट का उपयोग सही पर "
-"सेट करें."
+"तदर्थ नेटवर्क के निर्माण को निष्क्रिय करने के लिए जब एप्लेट का उपयोग सही पर सेट करें."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
-#| msgid "Choose CA Certificate"
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "CA प्रमाणपत्र पर ध्यान न दें"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
-"इसे सही पर सेट  EAP प्रमाणीकरण में CA प्रमाणपत्र के बारे में चेतावनी को अक्षम "
-"करने के."
+"इसे सही पर सेट  EAP प्रमाणीकरण में CA प्रमाणपत्र के बारे में चेतावनी को अक्षम करने के."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
-"सही पर सेट करें EAP प्रमाणीकरण के चरण 2 में CA प्रमाणपत्र के बारे में चेतावनी "
-"को निष्क्रिय करने के लिए."
+"सही पर सेट करें EAP प्रमाणीकरण के चरण 2 में CA प्रमाणपत्र के बारे में चेतावनी को निष्क्रिय "
+"करने के लिए."
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "नेटवर्क मैनेजर"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "नेटवर्क मैनेजर"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
-#| msgid "Wired 802.1X authentication"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X सत्यापन"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "कनेक्ट (_o)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "संजाल नाम (_N):"
 
-#: ../src/applet.c:545
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "तदर्थ"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "कनेक्शन को जोड़ने के लिए / सक्रिय करने में विफल"
 
-#: ../src/applet.c:547 ../src/applet.c:591 ../src/applet.c:617
-#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "अज्ञात त्रुटि"
 
-#: ../src/applet.c:550 ../src/applet.c:620 ../src/applet-device-wifi.c:1379
-#: ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "कनेक्शन असफल"
 
-#: ../src/applet.c:589
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "डिवाइस डिस्कनेक्ट करने में विफल रहा"
 
-#: ../src/applet.c:594
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "डिस्कनेक्ट विफलता"
 
-#: ../src/applet.c:615
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "कनेक्शन सक्रिय किया जाना विफ"
 
-#: ../src/applet.c:986 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "इस संदेश को फिर मत दिखाएँ"
 
-#: ../src/applet.c:1075
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -192,7 +220,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि संजाल कनेक्शन में बाधा आई थी."
 
-#: ../src/applet.c:1078
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -201,7 +229,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि VPN सेवा अप्रत्याशित रूप से रूक गया."
 
-#: ../src/applet.c:1081
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -211,7 +239,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि VPN सेवा ने इसे अवैध विन्यास वापस दिया."
 
-#: ../src/applet.c:1084
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -220,7 +248,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि कनेक्शन प्रयास का समय समाप्त हो गया."
 
-#: ../src/applet.c:1087
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -229,7 +257,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि VPN सेवा समय पर शुरू नहीं हो पाई."
 
-#: ../src/applet.c:1090
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -238,7 +266,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि VPN सेवा आरंभ होने में विफल रही."
 
-#: ../src/applet.c:1093
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -247,7 +275,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि कोई वैध VPN गुप्त नहीं था."
 
-#: ../src/applet.c:1096
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -256,7 +284,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा क्योंकि अवैध VPN गुप्तता थी."
 
-#: ../src/applet.c:1103
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -265,7 +293,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' विफल रहा."
 
-#: ../src/applet.c:1121
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -275,7 +303,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' टूट गया क्योंकि संजाल कनेक्शन में बाधा आई."
 
-#: ../src/applet.c:1124
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -284,7 +312,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' टूट गया क्योंकि VPN सेवा रोक दी गई."
 
-#: ../src/applet.c:1130
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -293,7 +321,7 @@ msgstr ""
 "\n"
 "VPN कनेक्शन '%s' टूट गया."
 
-#: ../src/applet.c:1160
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -304,19 +332,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1162
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN कनेक्शन को सफलतापूर्वक स्थापित किया गया है.\n"
 
-#: ../src/applet.c:1164
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN लॉगिन संदेश"
 
-#: ../src/applet.c:1170 ../src/applet.c:1178 ../src/applet.c:1228
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN कनेक्शन असफल"
 
-#: ../src/applet.c:1235
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -328,7 +356,7 @@ msgstr ""
 "VPN कनेक्शन '%s' विफल रहा VPN सेवा आरंभ होने में विफल रही.\n"
 "%s"
 
-#: ../src/applet.c:1238
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -341,689 +369,545 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1553
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "युक्तियां तैयार नहीं (फर्मवेयर गुम)"
 
-#: ../src/applet.c:1555
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "युक्तियां तैयार नहीं"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1565 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "डिसकनेक्टेड"
 
-#: ../src/applet.c:1581
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "डिस्कनेक्ट"
 
-#: ../src/applet.c:1595
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "युक्तियां प्रबंधित नहीं"
 
-#: ../src/applet.c:1639
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "कोई संजाल युक्तियां उपलब्ध नहीं"
 
-#: ../src/applet.c:1727
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN कनेक्शन"
 
-#: ../src/applet.c:1784
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "VPN विन्यस्त करें (_C)..."
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "VPN डिस्कनेक्ट करें (_D)"
 
-#: ../src/applet.c:1882
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "नेटवर्कप्रबंधक कार्यशील नहीं है..."
 
-#: ../src/applet.c:1887 ../src/applet.c:2739
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "संजालन निष्क्रिय"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2108
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "संजालन सक्रिय करें (_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2117
-#| msgid "Enable _Wireless"
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "बेतार सक्रिय करें (_W) "
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2126
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "मोबाइल ब्रॉडबैंड सक्रिय करें (_M)"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2135
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMA_Xमोबाइल ब्रॉडबैंड सक्रिय करें (_X)"
-
 #. Toggle notifications item
-#: ../src/applet.c:2146
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "सूचना सक्रिय करें (_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2157
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "कनेक्शन जानकारी (_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2167
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "कनेक्शन्स संपादित करें..."
 
-#. Help item
-#: ../src/applet.c:2181
-msgid "_Help"
-msgstr "मदद (_H)"
-
-#. About item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "के बारे में (_A)"
 
-#: ../src/applet.c:2368
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "आप अब '%s' को कनेक्टेड हैं."
+
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "डिस्कनेक्टेड"
 
-#: ../src/applet.c:2369
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "संजाल संबंधन को डिसकनेक्ट किया गया है."
 
-#: ../src/applet.c:2602
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "संजाल संबंधन '%s' तैयार किया जा रहा है..."
 
-#: ../src/applet.c:2605
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "उपयोक्ता सत्यापन संजाल संबंधन '%s' के लिए जरूरी है..."
 
-#: ../src/applet.c:2608 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:615
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' के लिए संजाल पता आग्रह कर रहा है..."
 
-#: ../src/applet.c:2611
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "संजाल कनेक्शन '%s' सक्रिय है"
 
-#: ../src/applet.c:2694
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN कनेक्शन '%s' आरंभ कर रहा है..."
 
-#: ../src/applet.c:2697
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "उपयोक्ता सत्यापन VPN संबंधन '%s' के लिए जरूरी है..."
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "कोई VPN पता को '%s' के लिए आग्रह कर रहा है..."
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN कनेक्शन '%s' सक्रिय है"
 
-#: ../src/applet.c:2744
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "कोई संजाल संबंधन नहीं"
 
-#: ../src/applet.c:3445
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "नेटवर्कप्रबंधक एप्लेट"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:767
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr "गलत PUK कोड; कृपया अपने प्रदाता से संपर्क करें."
+
+#: ../src/applet-device-broadband.c:201
+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:252
+msgid "Sending unlock code..."
+msgstr "अनलॉक कोड भेज रहा है..."
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "मोबाइल ब्रॉडबैंड (%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
+msgid "Mobile Broadband"
+msgstr "मोबाइल ब्रॉडबैंड"
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "उपलब्ध"
 
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:811
-#: ../src/applet-device-gsm.c:399 ../src/applet-device-wimax.c:419
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "आप अब '%s' को कनेक्टेड हैं."
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr "नया मोबाइल ब्रॉडबैंड कनेक्शन..."
 
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:815
-#: ../src/applet-device-gsm.c:403 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "कनेक्शन स्थापित"
 
-#: ../src/applet-device-bt.c:200
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "आप अभी मोबाइव ब्रॉडबैंड संजाल से कनेक्टेड हैं."
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr "मोबाइल ब्रॉडबैंज संजाल."
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "अब आप घर संजाल पर पंजीकृत हैं."
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "अब आप एक रोमिंग संजाल पर पंजीकृत हैं."
+
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "आप अभी मोबाइव ब्रॉडबैंड संजाल से कनेक्टेड हैं."
 
-#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:606
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "मोबाइल ब्रॉडबैंड कनेक्शन '%s' तैयार कर रहा है..."
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:609
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "मोबाइल ब्रॉडबैंड कनेक्शन '%s' विन्यस्त कर रहा है..."
 
-#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:612
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "मोबाइल ब्रॉडबैंड कनेक्शन '%s' के लिए उपयोक्ता सत्यापन जरूरी...."
 
-#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:632
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "मोबाइल ब्रॉडबैंड कनेक्शन '%s' सक्रिय"
 
-#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:713
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:424
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "मोबाइल ब्रॉडबैंड (%s)"
-
-#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:715
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
-#: ../src/libnm-gtk/nm-ui-utils.c:333
-msgid "Mobile Broadband"
-msgstr "मोबाइल ब्रॉडबैंड"
-
-#. Default connection item
-#: ../src/applet-device-cdma.c:316
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "मोबाइल ब्रॉडबैंड (CDMA) कनेक्शन..."
-
-#: ../src/applet-device-cdma.c:350
-msgid "You are now connected to the CDMA network."
-msgstr "आप अभी CDMA संजाल से कनेक्टेड हैं."
-
-#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
-msgid "CDMA network."
-msgstr "CDMA संजाल."
-
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:953
-#: ../src/applet-device-gsm.c:677
-msgid "You are now registered on the home network."
-msgstr "अब आप घर संजाल पर पंजीकृत हैं."
-
-#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:959
-#: ../src/applet-device-gsm.c:683
-msgid "You are now registered on a roaming network."
-msgstr "अब आप एक रोमिंग संजाल पर पंजीकृत हैं."
-
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "स्वतः इथरनेट"
 
-#: ../src/applet-device-ethernet.c:202
+#: ../src/applet-device-ethernet.c:82
 #, c-format
-#| msgid "Wired Networks (%s)"
 msgid "Ethernet Networks (%s)"
 msgstr "इथरनेट संजाल (%s)"
 
-#: ../src/applet-device-ethernet.c:204
+#: ../src/applet-device-ethernet.c:84
 #, c-format
-#| msgid "Wired Network (%s)"
 msgid "Ethernet Network (%s)"
 msgstr "इथरनेट संजाल (%s)"
 
-#: ../src/applet-device-ethernet.c:207
-#| msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "इथरनेट संजाल"
 
-#: ../src/applet-device-ethernet.c:209
-#| msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "इथरनेट संजाल"
 
-#: ../src/applet-device-ethernet.c:271
-#| msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "आप अभी वायर युक्त संजाल से कनेक्टेड हैं."
 
-#: ../src/applet-device-ethernet.c:297
+#: ../src/applet-device-ethernet.c:161
 #, c-format
-#| msgid "Preparing wired network connection '%s'..."
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "वायर युक्त संजाल '%s' के लिए तैयार कर रहा है... "
 
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:164
 #, c-format
-#| msgid "Configuring wired network connection '%s'..."
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "वायर युक्त कनेक्शन '%s' विन्यस्त कर रहा है... "
 
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:167
 #, c-format
-#| msgid "User authentication required for wired network connection '%s'..."
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr " उपयोक्ता सत्यापन वायर युक्त कनेक्शन '%s' के लिए जरूरी है..."
 
-#: ../src/applet-device-ethernet.c:306
+#: ../src/applet-device-ethernet.c:170
 #, c-format
-#| msgid "Requesting a wired network address for '%s'..."
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' के लिए वायर युक्त संजाल पता आग्रह कर रहा है... "
 
-#: ../src/applet-device-ethernet.c:310
+#: ../src/applet-device-ethernet.c:174
 #, c-format
-#| msgid "Wired network connection '%s' active"
 msgid "Ethernet network connection '%s' active"
 msgstr "वायरयुक्त संजाल कनेक्शन '%s' सक्रिय "
 
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL सत्यापन"
 
-#: ../src/applet-device-broadband.c:165 ../src/applet-device-gsm.c:518
-msgid "Wrong PUK code; please contact your provider."
-msgstr "गलत PUK कोड; कृपया अपने प्रदाता से संपर्क करें."
-
-#: ../src/applet-device-broadband.c:207 ../src/applet-device-gsm.c:495
-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:258 ../src/applet-device-gsm.c:545
-msgid "Sending unlock code..."
-msgstr "अनलॉक कोड भेज रहा है..."
-
-#. Default connection item
-#: ../src/applet-device-broadband.c:780
-#| msgid "New Mobile Broadband Connection"
-msgid "New Mobile Broadband connection..."
-msgstr "नया मोबाइल ब्रॉडबैंड कनेक्शन..."
-
-#: ../src/applet-device-broadband.c:816
-#| msgid "You are now connected to the mobile broadband network."
-msgid "You are now connected to the Mobile Broadband network."
-msgstr "आप अभी मोबाइव ब्रॉडबैंड संजाल से कनेक्टेड हैं."
-
-#: ../src/applet-device-broadband.c:952 ../src/applet-device-broadband.c:958
-#| msgid "Mobile broadband network password"
-msgid "Mobile Broadband network."
-msgstr "मोबाइल ब्रॉडबैंज संजाल."
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "नया मोबाइल ब्रॉडबैंड (GSM) कनेक्शन..."
-
-#: ../src/applet-device-gsm.c:404
-msgid "You are now connected to the GSM network."
-msgstr "आप अभी जीएसएम संजाल से संबंधित हैं."
-
-#: ../src/applet-device-gsm.c:676 ../src/applet-device-gsm.c:682
-msgid "GSM network."
-msgstr "GSM संजाल"
-
-#: ../src/applet-device-wifi.c:98
-#| msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "छिपे बेतार संजाल प्रक्रिया को कनेक्ट करें (_C)... "
 
-#: ../src/applet-device-wifi.c:149
-#| msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "नया बेतार नेटवर्क बनाएँ (_N)... "
 
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(कोई नहीं)"
 
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:901
 #, c-format
-#| msgid "Wired Networks (%s)"
 msgid "Wi-Fi Networks (%s)"
 msgstr "वाई फाई  संजाल (%s)"
 
-#: ../src/applet-device-wifi.c:789
+#: ../src/applet-device-wifi.c:903
 #, c-format
-#| msgid "Wired Network (%s)"
 msgid "Wi-Fi Network (%s)"
 msgstr " वाई फाई  संजाल (%s)"
 
-#: ../src/applet-device-wifi.c:791
-#| msgid "Wired Network"
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] " वाई फाई  संजाल"
 msgstr[1] " वाई फाई  संजाल"
 
-#: ../src/applet-device-wifi.c:824
-#| msgid "WiMAX is disabled"
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr " वाई फाई अक्षम किया है"
 
-#: ../src/applet-device-wifi.c:825
-#| msgid "WiMAX is disabled by hardware switch"
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr " वाई फाई हार्डवेयर स्विच से अक्षम है"
 
-#: ../src/applet-device-wifi.c:886
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "अधिक संजाल"
 
-#: ../src/applet-device-wifi.c:1065
-#| msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr " वाई फाई  संजाल उपलब्ध"
 
-#: ../src/applet-device-wifi.c:1066
-#| msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr " वाई फाई संजाल से कनेक्ट करने के लिए संजाल मेनू का उपयोग करें"
 
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-wifi.c:1364
 #, c-format
-#| msgid "You are now connected to the wireless network '%s'."
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "आप अभी  वाई फाई संजाल '%s' में कनेक्टेड हैं."
 
-#: ../src/applet-device-wifi.c:1291
+#: ../src/applet-device-wifi.c:1399
 #, c-format
-#| msgid "Preparing network connection '%s'..."
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr " वाई फाई संजाल संबंधन '%s' तैयार किया जा रहा है..."
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1402
 #, c-format
-#| msgid "Configuring wired network connection '%s'..."
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr " वाई फाई  कनेक्शन '%s' विन्यस्त कर रहा है..."
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1405
 #, c-format
-#| msgid "User authentication required for wireless network '%s'..."
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "उपयोक्ता सत्यापन जरूरी है  वाई फाई संजाल '%s' के लिए..."
 
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1408
 #, c-format
-#| msgid "Requesting a network address for '%s'..."
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "'%s' के लिए वाई फाई संजाल पता आग्रह कर रहा है..."
 
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1419
 #, c-format
-#| msgid "Wireless network connection '%s' active: %s (%d%%)"
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr " वाई फाई संजाल संबंधन '%s' सक्रिय: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1423
 #, c-format
-#| msgid "Wired network connection '%s' active"
 msgid "Wi-Fi network connection '%s' active"
 msgstr " वाई फाई संजाल कनेक्शन '%s' सक्रिय"
 
-#: ../src/applet-device-wifi.c:1374
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "कनेक्शन को सक्रिय करने में विफल"
 
-#: ../src/applet-device-wifi.c:1393
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "नए कनेक्शन जोड़ने में विफल"
 
-#: ../src/applet-device-wimax.c:227
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX मोबाइल ब्रॉडबैंड (%s)"
-
-#: ../src/applet-device-wimax.c:229
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX मोबाइल ब्रॉडबैंड"
-
-#: ../src/applet-device-wimax.c:255
-msgid "WiMAX is disabled"
-msgstr "WiMAX अक्षम किया है"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX हार्डवेयर स्विच से अक्षम है"
-
-#: ../src/applet-device-wimax.c:424
-msgid "You are now connected to the WiMAX network."
-msgstr "आप अभी WiMAX संजाल से कनेक्टेड हैं."
-
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:627
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "मोबाइल ब्रॉडबैंड कनेक्शन '%s' सक्रिय: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:630
-msgid "roaming"
-msgstr "रोमिंग"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "कनेक्शन संबंधन दिखाने में त्रुटि:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "गतिशील WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "पते"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "कुछ नहीं"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s डिफ़ॉल्ट"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: ../src/applet-dialogs.c:361
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:363
-msgctxt "WiMAX CINR"
-msgid "unknown"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
 msgstr "अज्ञात"
 
-#: ../src/applet-dialogs.c:375
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP पताः"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "ब्रॉडकास्ट पता:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
 msgstr "अज्ञात"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "सबनेट मास्क:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "इथरनेट (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
-#: ../src/connection-editor/page-general.c:345
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "सामान्य"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "इंटरफेसः"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "हार्डवेयर पता:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ड्राइवर:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "गतिः"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "सुरक्षा:"
 
-#: ../src/applet-dialogs.c:512
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:525
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "IP पताः"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "अज्ञात"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "ब्रॉडकास्ट पता:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "सबनेट मास्क:"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "अज्ञात"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "डिफ़ॉल्ट रूट:"
 
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "प्राथमिक DNS:"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "द्वितीयक DNS:"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "त्रिगुट DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "नज़रअंदाज़ किया"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN क़िस्म:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN गेटवे:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPNप्रयोक्ता नाम:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN ध्वज:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "आधार कनेक्शन:"
 
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "अज्ञात"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "कोई वैध सक्रिय कनेक्शन नहीं पाया गया!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1031,137 +915,160 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "और कई अन्य समुदाय के योगदान और अनुवादकों"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr ""
-"आपके संजाल युक्तियां और कनेक्शन को प्रबंधित करने के लिए अधिसूचना क्षेत्र "
-"एप्लेट."
+msgstr "आपके संजाल युक्तियां और कनेक्शन को प्रबंधित करने के लिए अधिसूचना क्षेत्र एप्लेट."
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "नेटवर्क प्रबंधक वेबसाइट"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "अनुपस्थित संसाधन"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "मोबाइल ब्रॉडबैंज संजाल कूटशब्द"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "एक कूटशब्द '%s' में कनेक्ट होने के लिए जरूरी है."
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "पासवर्ड: "
 
-#: ../src/applet-dialogs.c:1310
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN अनलॉक जरूरी"
 
-#: ../src/applet-dialogs.c:1311
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN अनलॉक जरूरी"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1313
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
 "used."
 msgstr ""
-"मोबाइल ब्रॉडबैंड युक्ति '%s' के लिए SIM PIN कोड जरूरी है इससे पहले कि यह "
-"प्रयोग किया "
+"मोबाइल ब्रॉडबैंड युक्ति '%s' के लिए SIM PIN कोड जरूरी है इससे पहले कि यह प्रयोग किया "
 "जाए."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1315
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "पिन कोड:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1319
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "पिन कोड दिखायें"
 
-#: ../src/applet-dialogs.c:1321
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK अनलॉक जरूरी"
 
-#: ../src/applet-dialogs.c:1322
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK अनलॉक जरूरी"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1324
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
 "used."
 msgstr ""
-"मोबाइल ब्रॉडबैंड युक्ति '%s' के लिए कोई SIM PUK कोड चाहिए इससे पहले कि यह "
-"प्रयोग किया "
+"मोबाइल ब्रॉडबैंड युक्ति '%s' के लिए कोई SIM PUK कोड चाहिए इससे पहले कि यह प्रयोग किया "
 "जा सके."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "पीयूके कोड:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "नया पिन कोड:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "नया पिन कोड फिर दाखिल करें:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK कोड दिखायें"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
 msgstr ""
-"IP पता आपके कंप्यूटर को संजाल पर पहचानता है.  \"जोड़ें\" बटन को किसी IP पता "
-"जोड़ने के "
+"IP पता आपके कंप्यूटर को संजाल पर पहचानता है.  \"जोड़ें\" बटन को किसी IP पता जोड़ने के "
 "लिए क्लिक करें."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "मिटाएँ (_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "स्वतः प्राप्त रूट अनदेखा करें (_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "इस कनेक्शन का उपयोग करें इसके संजाल पर संसाधन के लिए (_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
-"यदि सक्रिय किया गया है, यह कनेक्शन को तयशुदा संजाल कनेक्शन के लिए कभी प्रयोग "
-"नहीं किया "
+"यदि सक्रिय किया गया है, यह कनेक्शन को तयशुदा संजाल कनेक्शन के लिए कभी प्रयोग नहीं किया "
 "जाएगा."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1169,16 +1076,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
-#| msgid "Choose a VPN Connection Type"
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+msgid "Create…"
+msgstr "बनाएँ..."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "कनेक्शन प्रकार चुनें"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
-#| 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."
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1187,13 +1093,8 @@ msgid ""
 msgstr ""
 "वीपीएन के प्रकार आप नए कनेक्शन के लिए उपयोग करना चाहते हैं का चयन करें. \n"
 "\n"
-"यदि VPN कनेक्शन के प्रकार आप बनाना चाहते हैं सूची में प्रकट नहीं होता है, तो "
-"आप सही वीपीएन प्लगइन "
-"अधिष्ठापित नहीं हो सकता है."
-
-#: ../src/connection-editor/ce-new-connection.ui.h:6
-msgid "Create…"
-msgstr "बनाएँ..."
+"यदि VPN कनेक्शन के प्रकार आप बनाना चाहते हैं सूची में प्रकट नहीं होता है, तो आप सही "
+"वीपीएन प्लगइन अधिष्ठापित नहीं हो सकता है."
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
 msgid "Round-robin"
@@ -1208,7 +1109,6 @@ msgid "XOR"
 msgstr "एक्सओआर"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:4
-#| msgid "Broadcast Address:"
 msgid "Broadcast"
 msgstr "ब्रॉडकास्ट"
 
@@ -1229,79 +1129,99 @@ msgid "MII (recommended)"
 msgstr "MII (अनुशंसित)"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:9
-#| msgid "EAP"
 msgid "ARP"
 msgstr "ARP"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:10
-#| msgid "Base Connection:"
 msgid "Bonded _connections:"
 msgstr "बंधित कनेक्शन: (_c)"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-#| msgid "M_ode:"
-msgid "_Mode:"
-msgstr "विधि (_M):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "विधि (_o):"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
-msgid "_Edit"
-msgstr "संपादन (_E)"
-
-#. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "_Delete"
-msgstr "मिटाएँ (_D)"
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "संपादन (_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "आवृत्ति मॉनिटरिंग: (_f)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "मि.से."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#| msgid "Interface:"
+#: ../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:"
 msgstr "इंटरफेस नाम: (_I)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "कड़ी निगरानी: (_L)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP लक्ष्य: (_t)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "देरी लिंक: (_u)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "देरी डाउन लिंक: (_d)"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "प्राथमिक DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "बाइट्स"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "पथ  लागत (_c):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
-#| msgid "S_ecurity:"
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "प्राथमिकता: (_P)"
 
@@ -1310,44 +1230,289 @@ msgid "_Hairpin mode:"
 msgstr "Hairpin मोड: (_H)"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:1
-#| msgid "Base Connection:"
 msgid "Bridged _connections:"
 msgstr "आधार कनेक्शन: (_c)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "अग्रेषित देरी: (_F)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "हैलो समय: (_H)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "संजालन सक्रिय करें (_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "सक्रिय करें एसटीपी (स्पैनिंग ट्री प्रोटोकॉल) (_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "अधिकतम उम्र: (_M)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "उम्र बढ़ने समय: (_A)"
 
-#: ../src/connection-editor/ce-page.c:72
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "स्वचालित"
 
-#: ../src/connection-editor/ce-page.c:356
+#: ../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
+msgid "default"
+msgstr "डिफ़ॉल्ट"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "पता"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "पता"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "कोई युक्तियां"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "कनेक्शन गुप्तता को अद्यतन करने में विफल किसी अज्ञात त्रुटि के कारण."
 
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "802.1X सुरक्षा का इस कनेक्शन के लिए उपयोग करें"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#, fuzzy
+msgid "Enable"
+msgstr "बेतार सक्रिय करें (_W) "
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#, fuzzy
+msgid "Priority"
+msgstr "प्राथमिकता: (_P)"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#, fuzzy
+msgid "Priority Groups"
+msgstr "प्राथमिकता: (_P)"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Priority:"
+msgstr "प्राथमिकता: (_P)"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Priority Bandwidth:"
+msgstr "प्राथमिकता: (_P)"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:10
+#: ../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
@@ -1360,15 +1525,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 msgid "Sho_w password"
 msgstr "कूटशब्द दिखाएँ (_w)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../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
@@ -1380,7 +1547,8 @@ msgstr "कूटशब्द (_P):"
 #: ../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-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "स्वचालित"
@@ -1435,49 +1603,81 @@ msgstr "Aut_onegotiate"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "युक्ति MAC पता: (_D)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "सेवा (_S):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "क्लोन किया MAC पता:  (_l)"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 ""
-"यहाँ दाखिल किया MAC पता को इस कनेक्शन के संजाल युक्ति के लिए बतौर हार्डवेयर "
-"पता के रूप "
-"प्रयोग किया जाएगा जिसपर यह सक्रिय है.  इस विशेषता को बतौर MAC क्लोनिंग या "
-"स्पूफिंग "
+"यहाँ दाखिल किया MAC पता को इस कनेक्शन के संजाल युक्ति के लिए बतौर हार्डवेयर पता के रूप "
+"प्रयोग किया जाएगा जिसपर यह सक्रिय है.  इस विशेषता को बतौर MAC क्लोनिंग या स्पूफिंग "
 "जाना जाता है.  उदाहरण के लिए: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "बाइट्स"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "डिफ़ॉल्ट"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "नज़रअंदाज़ करें"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "ब्रॉडकास्ट"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "निजी कुंजी कूटशब्द (_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
 msgstr "स्वचालित रूप से VPN से कनेक्ट जब इस संबंध का उपयोग (_V)"
 
 #: ../src/connection-editor/ce-page-general.ui.h:2
-#| msgid "You are now connected to the wired network."
 msgid "All _users may connect to this network"
 msgstr "सभी उपयोगकर्ताओं को इस नेटवर्क से जुड़ सकते हैं (_u)"
 
@@ -1500,7 +1700,6 @@ msgstr "आंकड़ारेख"
 
 #. IP-over-InfiniBand "connected mode"
 #: ../src/connection-editor/ce-page-infiniband.ui.h:8
-#| msgid "C_onnect"
 msgid "Connected"
 msgstr "जुड़ा हुआ"
 
@@ -1511,8 +1710,8 @@ msgstr "स्वत: मैनुअल डीएनएस सेटिंग�
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "हस्तचालित"
 
@@ -1523,167 +1722,154 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "दूसरे कंप्यूटर में साझेदारी"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "विधि (_M):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "पते"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 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:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 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.h:13
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "डोमेन खोजें : (_S)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "डीएनएस सर्वर (_D):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"जब IPv6-सक्षम संजाल से कनेक्ट किया जाता है, कनेक्शन को पूरा होने के लिए "
-"अनुमति देता है यदि "
+"जब IPv6-सक्षम संजाल से कनेक्ट किया जाता है, कनेक्शन को पूरा होने के लिए अनुमति देता है यदि "
 "IPv6 विन्यास विफल रहता है लेकिन IPv6 विन्यास आमने आता है."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "मार्गों ... (_R)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "निष्क्रिय"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 पता. विविध डोमेन नाम सर्वर पताओं को "
+"अलग करने के लिए विराम चिह्न का प्रयोग करें."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "इस कनेक्शन के पूरा होने के लिए IPv_6 पता चाहिए"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
-"जब IPv4-सक्षम संजाल से कनेक्ट जाता है, कनेक्शन को पूरा होने के लिए अनुमति "
-"देता है यदि IPv6 "
+"जब IPv4-सक्षम संजाल से कनेक्ट जाता है, कनेक्शन को पूरा होने के लिए अनुमति देता है यदि IPv6 "
 "विन्यास विफल रहता है लेकिन IPv4 विन्यास आमने आता है."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "कोई"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "वरीयता 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "वरीयता 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-#| msgid "Prefer 3G (UMTS/HSPA)"
-msgid "Prefer 4G (LTE)"
-msgstr "वरीयता 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr " सिर्फ इस्तेमाल के लिए4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "मूल"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "संख्या (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "विस्तृत"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "संजाल ID (_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "प्रकार (_T):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "बदलें..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "पिन: (_I)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "रोमिंग स्वीकारें यदि घर संजाल उपलब्ध नहीं है (_r)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "कूटशब्द दिखाएँ (_w)"
 
@@ -1735,31 +1921,71 @@ msgstr "इको"
 msgid "Send PPP _echo packets"
 msgstr "PPP इको पैकेट भेजें (_e)"
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+msgid "_Import team configuration from a file..."
+msgstr "एक सहेजा वीपीएन विन्यास आयात करें ..."
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "बंधित कनेक्शन: (_c)"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "एक सहेजा वीपीएन विन्यास आयात करें ..."
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
-#| msgid "Interface:"
 msgid "_Parent interface:"
 msgstr "पैरेंट इंटरफ़ेस: (_P)"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN अंतरफलक नाम: (_n)"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#| msgid "C_loned MAC address:"
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "क्लोन MAC पता (_C): "
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN आईडी: (_i)"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "युक्ति नाम + संख्या"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + संख्या"
 
@@ -1776,717 +2002,882 @@ msgid "B/G (2.4 GHz)"
 msgstr "बी/जी (2.4 गीगा)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "बुनियादी ढाँचा"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "तदर्थ"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "प्रेषण शक्ति(_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "दरः (_R)"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "चैनल (_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ban_d:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "विधि (_o):"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "स्वीकृत सत्यापन विधि"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "विस्तारयोग्य प्रमाणीकरण प्रोटोकाल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "पासवर्ड प्रमाणीकरण प्रोटोकाल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "चैलेंज हैंडशेक प्रमाणीकरण प्रोटोकाल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft चैलेंज हैंडशेक प्रमाणीकरण प्रोटोकाल"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft चैलेंज हैंडशेक प्रमाणीकरण प्रोटोकाल संस्करण 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
 msgstr ""
-"अधिकतर स्थितियों में, प्रदाता PPP सर्वर सभी सत्यापन विधियों का समर्थन करेगा.  "
-"यदि "
+"अधिकतर स्थितियों में, प्रदाता PPP सर्वर सभी सत्यापन विधियों का समर्थन करेगा.  यदि "
 "कनेक्शन विफल रहता है, कुछ विधियों के लिए समर्थन निष्क्रिय करने की कोशिश करें."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip4.c:928
-#: ../src/connection-editor/page-ip6.c:894
-msgid "Address"
-msgstr "पता"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/page-ip4.c:945
-msgid "Netmask"
-msgstr "नेटमास्क"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-#: ../src/connection-editor/page-ip4.c:962
-#: ../src/connection-editor/page-ip6.c:928
-msgid "Gateway"
-msgstr "गेटवे"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:813
-#: ../src/connection-editor/ip6-routes-dialog.c:755
-msgid "Metric"
-msgstr "मेट्रिक"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip6.c:911
-msgid "Prefix"
-msgstr "उपसर्ग"
-
-#: ../src/connection-editor/new-connection.c:101
-#: ../src/connection-editor/page-ethernet.c:251
-#: ../src/libnm-gtk/nm-ui-utils.c:323
-#| msgid "Auto Ethernet"
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "इथरनेट"
 
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:471 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "वाई फाई"
 
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:134
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "ब्लूटूथ"
 
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:131
-#: ../src/connection-editor/page-infiniband.c:168
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:559
+#: ../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
 msgid "Bond"
 msgstr "बंधन"
 
-#: ../src/connection-editor/new-connection.c:143
-#: ../src/connection-editor/page-bridge.c:211
-#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+#: ../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
+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
 msgid "Bridge"
 msgstr "पुल"
 
-#: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:563
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:252
-#| msgid "Hardware Address:"
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "हार्डवेयर"
 
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "आभासी"
 
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
-#| msgid "Export VPN connection..."
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "एक सहेजा वीपीएन विन्यास आयात करें ..."
 
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "कनेक्शन संपादक संवाद आरंभ नहीं किया जा सका किसी अज्ञात त्रुटि के कारण."
 
-#: ../src/connection-editor/new-connection.c:380
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "नया कनेक्शन नहीं बना सका"
 
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "कनेक्शन मिटाना असफल"
 
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "क्या आप निश्चित हैं कि आप इस कनेक्शन %s को मिटाना चाहते हैं?"
 
-#: ../src/connection-editor/nm-connection-editor.c:118
+#: ../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
+msgid "Address"
+msgstr "पता"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "नेटमास्क"
+
+#: ../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
+msgid "Gateway"
+msgstr "गेटवे"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "मेट्रिक"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "उपसर्ग"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "संपादन %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "बेनाम संबंधन संपादित कर रहा है"
 
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "कनेक्शन नाम (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "संपादक आरंभीकरण में त्रुटि"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "कनेक्शन जोड़ना असफल"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
-msgstr ""
-"यह कनेक्शन संपादक कुछ जरूरी संसाधन को नहीं ढूँढ़ सका (.ui  फाइल नहीं मिल सका)."
+msgstr "यह कनेक्शन संपादक कुछ जरूरी संसाधन को नहीं ढूँढ़ सका (.ui  फाइल नहीं मिल सका)."
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "सहेजें (_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "इस कनेक्शन से किए गए किसी परिवर्तनों को सहेजें"
 
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "_Save..."
-msgstr "सहेजें (_S)..."
-
-#: ../src/connection-editor/nm-connection-editor.c:411
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
-msgstr ""
-"इस मशीन के सभी उपयोक्ता के लिए इस कनेक्शन को सहेजने के लिए सत्यापित करें."
+msgstr "इस मशीन के सभी उपयोक्ता के लिए इस कनेक्शन को सहेजने के लिए सत्यापित करें."
 
-#: ../src/connection-editor/nm-connection-editor.c:427
-#| msgid "Could not create new connection"
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "कनेक्शन नहीं बना सका "
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "कनेक्शन संपादित नहीं कर सका"
 
-#: ../src/connection-editor/nm-connection-editor.c:429
-#| msgid "Error creating connection editor dialog."
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "अज्ञात कनेक्शन संपादक संवाद बनाने में त्रुटि."
 
-#: ../src/connection-editor/nm-connection-editor.c:536
-msgid "Error saving connection"
-msgstr "कनेक्शन सहेजने में त्रुटि"
-
-#: ../src/connection-editor/nm-connection-editor.c:537
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "गुण '%s' / '%s' अवैध: %d"
-
-#: ../src/connection-editor/nm-connection-editor.c:631
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "संपादक आरंभीकरण में त्रुटि"
 
-#: ../src/connection-editor/nm-connection-editor.c:952
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "कनेक्शन जोड़ना असफल"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: ../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
 msgid "Connection _name:"
 msgstr "कनेक्शन नाम (_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#| msgid "E_xport"
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "निर्यात करें (_E)... "
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "कभी नहीं"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "अभी"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d मिनट पहले"
 msgstr[1] "%d मिनट पहले"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d घंटा पहले"
 msgstr[1] "%d घंटे पहले"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d दिन पहले"
 msgstr[1] "%d दिनों पहले"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d महीना पहले"
 msgstr[1] "%d महीने पहले"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d वर्ष पहले"
 msgstr[1] "%d वर्षों पहले"
 
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "नाम"
 
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "अंतिम प्रयुक्त"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "चयनित संबंधन संपादित करें"
 
-#: ../src/connection-editor/nm-connection-list.c:687
-msgid "_Edit..."
-msgstr "संपादन (_E)..."
-
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "चयनित संबंधन संपादित करने के लिए सत्यापित करें"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "चयनित संबंधन मिटाएँ"
 
-#: ../src/connection-editor/nm-connection-list.c:704
-msgid "_Delete..."
-msgstr "मिटाएँ (_D)..."
-
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "चयनित संबंधन मिटाने के लिए सत्यापित करें"
 
-#: ../src/connection-editor/nm-connection-list.c:942
-msgid "Error creating connection"
-msgstr "कनेक्शन बनाने में त्रुटि."
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:943
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "पता नहीं कैसे '%s' कनेक्शन बनायेगा"
 
-#: ../src/connection-editor/nm-connection-list.c:998
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "कनेक्शन बनाने में त्रुटि."
+
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "त्रुटि संपादन कनेक्शन"
 
-#: ../src/connection-editor/nm-connection-list.c:999
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID '%s' के साथ एक कनेक्शन नहीं मिल रहा"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x सुरक्षा"
 
-#: ../src/connection-editor/page-8021x-security.c:123
-#| msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr " 802.1x  सुरक्षा उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-8021x-security.c:141
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "802.1X सुरक्षा का इस कनेक्शन के लिए उपयोग करें"
 
-#: ../src/connection-editor/page-bond.c:422
-#| msgid "Could not load wired user interface."
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "ईथरनेट उपयोगकर्ता इंटरफ़ेस लोड नहीं किया जा सका."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "ब्लूटूथ युक्ति नहीं ढूँढ़ सका"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "बॉण्ड कनेक्शन %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "ब्लूटूथ"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "इथरनेट संजाल"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr " वाई फाई  संजाल"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "बंधन उपयोगकर्ता इंटरफ़ेस लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-bond.c:561
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "प्राथमिक DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
-#| msgid "Wired connection %d"
 msgid "Bond connection %d"
 msgstr "बॉण्ड कनेक्शन %d"
 
-#: ../src/connection-editor/page-bridge.c:214
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "पुल उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-bridge.c:309
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
-#| msgid "Wired connection %d"
 msgid "Bridge connection %d"
 msgstr "पुल संबंधन %d"
 
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "पुल पोर्ट"
 
-#: ../src/connection-editor/page-bridge-port.c:117
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "पुल पोर्ट उपयोगकर्ता इंटरफ़ेस लोड नहीं किया जा सका."
 
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "DSL उपयोक्ता अंतरफलक नहीं लोड कर सका."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL उपयोक्ता अंतरफलक नहीं लोड कर सका."
 
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL कनेक्शन %d"
 
-#: ../src/connection-editor/page-ethernet.c:90
-#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:113
-#: ../src/connection-editor/page-wimax.c:70
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 पता के द्वारा निर्दिष्ट निर्दिष्ट "
-"कनेक्शन को लॉक कर "
+"यह विकल्प संजाल युक्ति में स्थायी MAC पता के द्वारा निर्दिष्ट निर्दिष्ट कनेक्शन को लॉक कर "
 "देता है.  उदाहरण के लिए: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:253
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "ईथरनेट उपयोगकर्ता इंटरफ़ेस लोड नहीं किया जा सका."
 
-#: ../src/connection-editor/page-ethernet.c:396
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "इथरनेट"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "क्लोन किया MAC पता:  (_l)"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
-#| msgid "Wired connection %d"
 msgid "Ethernet connection %d"
 msgstr "तारयुक्त संबंधन %d "
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:59
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "डिफ़ॉल्ट"
 
-#: ../src/connection-editor/page-general.c:60
+#: ../src/connection-editor/page-general.c:52
 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:61
-#| msgid "NetworkManager is not running..."
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD कार्यशील नहीं है..."
 
-#: ../src/connection-editor/page-general.c:348
-#| msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "सामान्य उपयोगकर्ता इंटरफ़ेस लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-infiniband.c:171
-#| msgid "Could not load WiFi user interface."
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-infiniband.c:263
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
-#| msgid "Wired connection %d"
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand संबंधन %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "स्वचालित (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "स्वचालित (VPN) पता केवल"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "स्वचालित (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "स्वचालित (PPP) पता केवल"
+msgid "Automatic, addresses only"
+msgstr "स्वचालित, पता केवल"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "स्वचालित (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "स्वचालित (PPPoE) पता केवल"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "स्वचालित (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "स्वचालित (DHCP) पता केवल"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "लिंक स्थानीय सिर्फ"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "निष्क्रिय"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
-#| msgid "DNS ser_vers:"
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "अतिरिक्त डीएनएस सर्वर (_v):"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
-#| msgid "S_earch domains:"
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "अतिरिक्त डोमेन खोजें : (_e)"
 
-#: ../src/connection-editor/page-ip4.c:860
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "IPv4 रूट को %s के संपादन कर रहा है"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 सेटिंग"
 
-#: ../src/connection-editor/page-ip4.c:1013
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "स्वचालित, पता केवल"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "नज़रअंदाज़ करें"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "स्वचालित, केवल DHCP"
 
-#: ../src/connection-editor/page-ip6.c:826
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "IPv6 रूट को %s के लिए संपादन कर रहा है"
 
-#: ../src/connection-editor/page-ip6.c:975
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 सेटिंग"
 
-#: ../src/connection-editor/page-ip6.c:977
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 उपयोक्ता अंतरफलक नहीं लोड कर सका."
 
-#: ../src/connection-editor/page-master.c:290
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
 #, c-format
 msgid "%s slave %d"
 msgstr "%s स्लेव %d"
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "मोबाइल ब्रॉडबैंड उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "असमर्थित मोबाइल ब्रॉडबैंड कनेक्शन प्रकार."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:658
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "मोबाइल ब्रॉडबैंड प्रदाता प्रकार चुनें"
 
-#: ../src/connection-editor/page-mobile.c:693
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr ""
-"तकनीक चुनें जो आपका मोबाइल ब्रॉडबैंड प्रदाता उपयोग करता है.  यदि आप अनिश्चित "
-"हैं अपने "
+"तकनीक चुनें जो आपका मोबाइल ब्रॉडबैंड प्रदाता उपयोग करता है.  यदि आप अनिश्चित हैं अपने "
 "प्रदाता को चुनें."
 
-#: ../src/connection-editor/page-mobile.c:698
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "मेरा प्रदाता GSM-आधारित तकनीक चुनता है (यानी. GPRS, EDGE, UMTS, HSDPA) (_G)"
 
-#: ../src/connection-editor/page-mobile.c:705
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "मेरा प्रदाता CDMA-आधारित तकनीक चुनता है (यानी. 1xRTT, EVDO) (_D)"
 
-#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:266
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "जीएसएम"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "पीएपी"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "सीएचएपी"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "कुछ नहीं"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:284
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP जमावट"
 
-#: ../src/connection-editor/page-ppp.c:286
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP उपयोक्ता अंतरफलक को लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-vlan.c:482
-#| msgid "Could not load IPv4 user interface."
+#: ../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 "आयात के लिए फाइल चुनें"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr " vlan उपयोक्ता अंतरफलक लोड नहीं कर सका."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "DSL कनेक्शन %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+#, fuzzy
+msgid "Team Port"
+msgstr "पुल पोर्ट"
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "कोई संजाल संबंधन नहीं"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr " vlan उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-vlan.c:678
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
-#| msgid "VPN connection %d"
 msgid "VLAN connection %d"
 msgstr "VLAN संबंधन %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN उपयोक्ता अंतरफलक को लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "VPN प्लगिन सेवा को '%s' के लि ढूँढ़ नहीं सका."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN संबंधन %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2496,121 +2887,113 @@ msgstr ""
 "\n"
 "त्रुटि: कोई VPN सेवा प्रकार नहीं."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "VPN कनेक्शन प्रकार चुनें"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 कनेक्शन "
+"के प्रकार आप बनाना चाहते हैं सूची में प्रकट नहीं होता है, तो आप सही वीपीएन प्लगइन "
 "अधिष्ठापित नहीं हो सकता है."
 
-#: ../src/connection-editor/page-wifi.c:98
-#| msgid ""
-#| "This option locks this connection to the wireless access point (AP) "
-#| "specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+#: ../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 निर्दिष्ट कनेक्शन को यहाँ "
-"दाखिल किया जाता "
+"यह विकल्प  Wi-Fi एक्सेस प्वाइंट (AP) में BSSID निर्दिष्ट कनेक्शन को यहाँ दाखिल किया जाता "
 "है.  उदाहरण के लिए: 00:11:22:33:44:55 "
 
-#: ../src/connection-editor/page-wifi.c:190
-#: ../src/connection-editor/page-wifi.c:194
-#: ../src/connection-editor/page-wifi.c:215
-#, c-format
-msgid "default"
-msgstr "डिफ़ॉल्ट"
+#: ../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)\""
+msgstr ""
+"यह विकल्प संजाल युक्ति में स्थायी MAC पता के द्वारा निर्दिष्ट निर्दिष्ट कनेक्शन को लॉक कर "
+"देता है.  उदाहरण के लिए: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:219
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:473
-#| msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "वाई - फाई उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-wifi.c:650
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "कोई युक्तियां"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
-#| msgid "Wired connection %d"
 msgid "Wi-Fi connection %d"
 msgstr "वाई - फाई संबंधन %d"
 
-#: ../src/connection-editor/page-wifi-security.c:265
-#| msgctxt "Wifi/wired security"
-#| msgid "None"
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "कुछ नहीं"
-
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit पासफ्रेज"
 
-#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "गतिशील WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 निजी"
 
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 एंटरप्राइज"
 
-#: ../src/connection-editor/page-wifi-security.c:396
-#| msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
-msgstr ""
-"वाई - फाई सुरक्षा उपयोक्ता अंतरफलक नहीं लोड कर सका; गुम वाई - फाई सेटिंग."
+msgstr "वाई - फाई सुरक्षा उपयोक्ता अंतरफलक नहीं लोड कर सका; गुम वाई - फाई सेटिंग."
 
-#: ../src/connection-editor/page-wifi-security.c:407
-#| msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "वाई फाई सुरक्षा"
 
-#: ../src/connection-editor/page-wifi-security.c:409
-#| msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "वाई - फाई सुरक्षा उपयोक्ता अंतरफलक लोड नहीं कर सका."
 
-#: ../src/connection-editor/page-wimax.c:137
-#| msgid "Could not load WiFi user interface."
-msgid "Could not load WiMAX user interface."
-msgstr "WiMAX उपयोक्ता अंतरफलक लोड नहीं कर सका."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:233
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-#| msgid "Wired connection %d"
-msgid "WiMAX connection %d"
-msgstr "WiMAX संबंधन %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN कनेक्शन आय़ात नहीं कर सका"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2618,35 +3001,35 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"फाइल '%s' पढ़ा नहीं जा सका अथवा कोई परिचित VPN कनेक्शन सूचना को समाहित नहीं "
-"कर "
+"फाइल '%s' पढ़ा नहीं जा सका अथवा कोई परिचित VPN कनेक्शन सूचना को समाहित नहीं कर "
 "सका\n"
 "\n"
 "त्रुटि: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "आयात के लिए फाइल चुनें"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "अज्ञात त्रुटि"
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" नामक फाइल पहले से मौजूद है."
 
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "बदलें (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:332
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN कनेक्शन निर्यात नहीं कर सका"
 
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2657,148 +3040,58 @@ msgstr ""
 "\n"
 "त्रुटि: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN संबंधन निर्यात करें..."
 
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../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 ""
-"नेटवर्कप्रबंधक एप्लेट कुछ जरूरी संसाधनों ( .ui फाइल नहीं मिलता था) को नहीं "
-"ढूँढ़ सका."
-
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"ब्लूटूथ विन्यास संभव नहीं (डी बस से कनेक्ट करने में विफल रहा है: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-#| msgid ""
-#| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "ब्लूटूथ विन्यास संभव नहीं (नेटवर्क प्रबंधक पाने में त्रुटि): (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:445
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "अपने मोबाइल फोन को बतौर संजाल युक्ति उपयोग करें (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:454
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "इंटरनेट की पहुंच अपने मोबाइल फोन से करें (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:336
-#, c-format
-msgid "Error: %s"
-msgstr "त्रुटि: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:443
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "DUN कनेक्शन बनाने में विफल: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:445
-#: ../src/gnome-bluetooth/nma-bt-device.c:985
-msgid "Your phone is now ready to use!"
-msgstr "आपका फोन अब उपयोग के लिए तैयार!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:468
-msgid "Mobile wizard was canceled"
-msgstr "मोबाइल विजार्ड रद्द किया गया"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:477
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "अज्ञात फोन युक्त प्रकार (न GSM या न ही CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:513
-msgid "unknown modem type."
-msgstr "अज्ञात मॉडेम प्रकार."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:733
-#: ../src/gnome-bluetooth/nma-bt-device.c:739
-msgid "failed to connect to the phone."
-msgstr "फोन को कनेक्ट करने में विफल."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:770
-msgid "unexpectedly disconnected from the phone."
-msgstr "अप्रत्याशित रूप से फोन से डिसकनेक्टेड."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:780
-msgid "timed out detecting phone details."
-msgstr "फोन विवरण पता करने का समय समाप्त."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:816
-msgid "Detecting phone configuration..."
-msgstr "फोन विन्यास पता कर रहा है..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:869
-#| msgid "NetworkManager is not running..."
-msgid "ModemManager is not running"
-msgstr "मोडेमप्रबंधक कार्यशील नहीं है..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:946
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"तयशुदा ब्लूटूथ एडाप्टर को जरूर सक्रिय किया जाना चाहिए डायल अप नेटवर्किंग "
-"कनेक्शन सेटअप "
-"करने के पहले."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:983
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "PAN कनेक्शन बनाने में विफल: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:1004
-#, c-format
-msgid "%s Network"
-msgstr "%s संजाल"
-
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "स्वचालित रूप से यह युक्ति अनलॉक"
+msgstr "नेटवर्कप्रबंधक एप्लेट कुछ जरूरी संसाधनों ( .ui फाइल नहीं मिलता था) को नहीं ढूँढ़ सका."
 
 #: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "अनलॉक करें (_U)"
 
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "स्वचालित रूप से यह युक्ति अनलॉक"
+
 #: ../src/info.ui.h:1
 msgid "Connection Information"
 msgstr "कनेक्शन जानकारी"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "सक्रिय संजाल कनेक्शन"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:208
+#: ../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/libnm-gtk/nm-mobile-wizard.c:215
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "आपका उपकरण:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:226
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "आपका प्रदाता:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:237
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "आपकी प्लान:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: ../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 "
@@ -2812,422 +3105,474 @@ msgstr ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:274
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "मोबाइल ब्रॉडबैंड सेटिंग की पुष्टि करें"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:338
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "गैर सूचीबद्ध"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:493
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "अपना प्लान चुनें (_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:517
+#: ../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/libnm-gtk/nm-mobile-wizard.c:541
+#: ../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 के "
+"यदि आप अपनी योजना के बारे में अनिश्चित हैं तो कृपया अपने प्रदाता से अपनी प्लान के APN के "
 "बारे में पूछें."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:548
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "अपना बिलिंग प्लान चुनें"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:597
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "मेरा प्लान सूचीबद्ध नहीं है..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "प्रदाता"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: ../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):"
+msgstr "मैं अपने प्रदाता नहीं ढूँढ़ सकता हूँ और मैं इसे दस्ती रूप से दाखिल करना चाहता हूँ (_m):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:803
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "प्रदाता:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:827
+#: ../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/libnm-gtk/nm-mobile-wizard.c:833
+#: ../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/libnm-gtk/nm-mobile-wizard.c:844
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "अपना प्रदाता चुनें"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "देश या क्षेत्र सूची:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "देश या क्षेत्र"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "मेरा देश सूचीबद्ध नहीं है"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1227
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "संस्थापित जीएसएम युक्तियां"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "संस्थापित CDMA युक्ति"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../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 ""
-"यह सहायक आपको मोबाइल ब्रॉडबैंड कनेक्शन को किसी सेल्यूलर (3G) संजाल से आसानी "
-"से सेटअप "
+"यह सहायक आपको मोबाइल ब्रॉडबैंड कनेक्शन को किसी सेल्यूलर (3G) संजाल से आसानी से सेटअप "
 "करता है."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "आपको निम्नलिखित सूचना की जरूरत होगी:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "आपके ब्रॉडबैंड प्रदाता का नाम"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "आपका ब्रॉडबैंड बिलिंग प्लान नाम"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../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 (एक्सेस प्वाइंट नाम)"
+msgstr "(कुछ स्थितियों में) आपका ब्रॉडबैंड बिलिंग प्लान APN (एक्सेस प्वाइंट नाम)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../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 "इस मोबाइल ब्रॉडबैंड युक्ति के लिए कोई कनेक्शन बनाएँ (_t):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "कोई युक्तियां"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "मोबाइल ब्रॉडबैंड कनेक्शन सेटअप करें"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "नया मोबाइल ब्रॉडबैंड कनेक्शन"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
-msgid "Wired"
-msgstr "तारयुक्त"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "ब्लूटूथ"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC जाल"
+#: ../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/libnm-gtk/nm-ui-utils.c:343
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:405
-msgid "PCI"
-msgstr "पीसीआई"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "कूटशब्द (_P):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
-msgid "USB"
-msgstr "यूएसबी"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "कूटशब्द (_P):"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%$2s (%$1s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "कूटशब्द दिखाएँ (_w)"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "नया..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "कुछ नहीं"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "बनाएँ (_r)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
-#| msgid ""
-#| "Passwords or encryption keys are required to access the wireless network "
-#| "'%s'."
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "कूटशब्द या गोपन कुंजी वाई फाई  संजाल '%s' की पहुँच के लिए जरूरी है."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
-#| msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "वाई फाई नेटवर्क प्रमाणीकरण आवश्यक"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
-#| msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "वाई फाईसंजाल द्वारा प्रमाणीकरण जरूरी"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
-#| msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "नया वाई फाई नेटवर्क बनाएँ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
-#| msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "नया वाई फाई संजाल"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
-#| msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "अपने बनाए जाने वाले वाई - फाई संजाल के लिए नाम दर्ज करें."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
-#| msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "छुपे वाई फाई  संजाल से कनेक्ट करें"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
-#| msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "छुपा वाई फाई  संजाल"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
-#| msgid ""
-#| "Enter the name and security details of the hidden wireless network you "
-#| "wish to connect to."
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
-"छुपे वाई फाई  संजाल के सुरक्षा विवरण और नाम को दर्ज करें जिसमें आप कनेक्ट "
-"करना चाहते हैं."
+"छुपे वाई फाई  संजाल के सुरक्षा विवरण और नाम को दर्ज करें जिसमें आप कनेक्ट करना चाहते हैं."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
-#| msgid "Wireless _security:"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "वाई फाई सुरक्षा (_s):"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "कनेक्शन (_n):"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-#| msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "वाई फाई एडाप्टर (_a):"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC जाल"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "पीसीआई"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "यूएसबी"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "प्रयोग:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"यह प्रोग्राम NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/) का घटक "
-"है."
+"यह प्रोग्राम NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/) "
+"का घटक है."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr ""
-"यह कमांड लाइन अंतःक्रिया के लिए वांछित नहीं है बजाय GNOME डेस्कटॉप वातावरण "
-"में चलता है."
+"यह कमांड लाइन अंतःक्रिया के लिए वांछित नहीं है बजाय GNOME डेस्कटॉप वातावरण में चलता है."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
-#| msgid "HSPA"
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "सक्रिय नहीं"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "पंजीकृत नहीं"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "घर संजाल (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "घर संजाल"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "खोज रहा है"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "पंजीयन मना"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (रोमिंग)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "रोमिंग संजाल (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "रोमिंग संजाल"
 
-#: ../src/mobile-helpers.c:297
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "सिम कार्ड '%s' के लिए '%s' पर पिन कोड"
 
-#: ../src/mobile-helpers.c:471
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "पिन कोड जरूरी"
 
-#: ../src/mobile-helpers.c:479
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "पिन कोड मोबाइल ब्रॉडबैंड युक्ति के लिए जरूरी है"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "मोबाइल ब्रॉडबैंड कनेक्शन '%s' सक्रिय: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "रोमिंग"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
-#| msgid "Base Connection:"
 msgid "%s connection"
 msgstr "%s कनेक्शन:"
 
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "कोई प्रमाणपत्र प्राधिकार प्रमाणपत्र चुना गया"
-
-#: ../src/wireless-security/eap-method.c:276
-#| msgid ""
-#| "Not using a Certificate Authority (CA) certificate can result in "
-#| "connections to insecure, rogue wireless networks.  Would you like to "
-#| "choose a Certificate Authority certificate?"
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"सर्टिफिकेट ऑथरिटी (CA) प्रमाणपत्र का उपयोग नहीं करना असुरक्षित, खराब बेतार "
-"संजारल का "
-"परिणाम दे सकता है.  क्या आपसर्टिफिकेट ऑथरिटी प्रमाणपत्र का उपयोग करना "
-"चाहेंगे? "
 
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "सीए प्रमाणपत्र चुनें"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:648
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER या PEM प्रमाणपत्र (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "PAC फ़ाइल चुनें ..."
 
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC फ़ाइल (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "सभी फ़ाइलें"
 
@@ -3254,8 +3599,8 @@ msgid "PAC _file:"
 msgstr "PAC फाइल: (_F)"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "आंतरिक सत्यापन: (_I)"
 
@@ -3263,14 +3608,32 @@ msgstr "आंतरिक सत्यापन: (_I)"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "स्वत: PAC pro_visioning की अनुमति दें"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "एमडी5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "सर्टिफिकेट ऑथरिटी प्रमाणपत्र चुनें."
 
@@ -3288,19 +3651,56 @@ msgstr "संस्करण 1"
 msgid "C_A certificate:"
 msgstr "सीए प्रमाणपत्र (_A):"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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
+msgid "No CA certificate is _required"
+msgstr "किसी सीए प्रमाणपत्र की जरूरत नहीं है (_r)"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "PEAP संस्करण: (_v)"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "इस कूटशब्द के लिए हर समय पूछें (_k)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "सीए प्रमाणपत्र (_A):"
 
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "विगोपित निजी कुंजी असुरक्षित हैं"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../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 "
@@ -3308,17 +3708,16 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"चुना गया निजी कुंजी कूटशब्द के द्वारा संरक्षित नहीं दिखता है.  यह आपके "
-"सुरक्षा साख को खराब "
+"चुना गया निजी कुंजी कूटशब्द के द्वारा संरक्षित नहीं दिखता है.  यह आपके सुरक्षा साख को खराब "
 "कर सकता है.  कृपया कोई कूटशब्द संरक्षित निजी कुंजी चुनें.\n"
 "\n"
 "(आप अपने निजी कुंजी से openssl के साथ अपना कूटशब्द संरक्षित कर सकते हैं)"
 
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "अपना व्यक्तिगत प्रमाणपत्र चुनें..."
 
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "अपनी निजी कुंजी चुनें..."
 
@@ -3330,27 +3729,44 @@ msgstr "पहचान (_d):"
 msgid "_User certificate:"
 msgstr "उपयोक्ता प्रमाणपत्र (_U):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "निजी कुंजी (_k):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "निजी कुंजी कूटशब्द (_P):"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "टीएलएस"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "तीव्र"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "टनेल किया टीएलएस"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "संरक्षित EAP (PEAP)"
 
@@ -3360,29 +3776,55 @@ msgstr "संरक्षित EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "सत्यापन: (_t)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "खुला तंत्र"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "साझा कुंजी"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:4
-msgid "2"
-msgstr "2"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "3"
+msgid "Open System"
+msgstr "खुला तंत्र"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "4"
+msgid "Shared Key"
+msgstr "साझा कुंजी"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -3396,6 +3838,235 @@ msgstr "कुंजी दिखाएँ (_w)"
 msgid "WEP inde_x:"
 msgstr "WEP सूची (_x):"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "प्रकार (_T):"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "WiMA_Xमोबाइल ब्रॉडबैंड सक्रिय करें (_X)"
+
+#~ msgid "_Help"
+#~ msgstr "मदद (_H)"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "मोबाइल ब्रॉडबैंड (CDMA) कनेक्शन..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "आप अभी CDMA संजाल से कनेक्टेड हैं."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA संजाल."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "नया मोबाइल ब्रॉडबैंड (GSM) कनेक्शन..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "आप अभी जीएसएम संजाल से संबंधित हैं."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM संजाल"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX मोबाइल ब्रॉडबैंड (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX मोबाइल ब्रॉडबैंड"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX अक्षम किया है"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX हार्डवेयर स्विच से अक्षम है"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "आप अभी WiMAX संजाल से कनेक्टेड हैं."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "अज्ञात"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "अज्ञात"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "द्वितीयक DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "त्रिगुट DNS:"
+
+#~| msgid "M_ode:"
+#~ msgid "_Mode:"
+#~ msgstr "विधि (_M):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "युक्ति MAC पता: (_D)"
+
+#~ msgid "Any"
+#~ msgstr "कोई"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "वरीयता 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "वरीयता 2G (GPRS/EDGE)"
+
+#~| msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "वरीयता 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr " सिर्फ इस्तेमाल के लिए4G (LTE)"
+
+#~ msgid "Infrastructure"
+#~ msgstr "बुनियादी ढाँचा"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "_Save..."
+#~ msgstr "सहेजें (_S)..."
+
+#~ msgid "Error saving connection"
+#~ msgstr "कनेक्शन सहेजने में त्रुटि"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "गुण '%s' / '%s' अवैध: %d"
+
+#~ msgid "_Edit..."
+#~ msgstr "संपादन (_E)..."
+
+#~ msgid "_Delete..."
+#~ msgstr "मिटाएँ (_D)..."
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "स्वचालित (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "स्वचालित (PPP) पता केवल"
+
+#~| msgid "Could not load WiFi 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 ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr "ब्लूटूथ विन्यास संभव नहीं (डी बस से कनेक्ट करने में विफल रहा है: (%s) %s)."
+
+#~| msgid ""
+#~| "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "ब्लूटूथ विन्यास संभव नहीं (नेटवर्क प्रबंधक पाने में त्रुटि): (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "अपने मोबाइल फोन को बतौर संजाल युक्ति उपयोग करें (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "इंटरनेट की पहुंच अपने मोबाइल फोन से करें (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "त्रुटि: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "DUN कनेक्शन बनाने में विफल: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "आपका फोन अब उपयोग के लिए तैयार!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "मोबाइल विजार्ड रद्द किया गया"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "अज्ञात फोन युक्त प्रकार (न GSM या न ही CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "अज्ञात मॉडेम प्रकार."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "फोन को कनेक्ट करने में विफल."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "अप्रत्याशित रूप से फोन से डिसकनेक्टेड."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "फोन विवरण पता करने का समय समाप्त."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "फोन विन्यास पता कर रहा है..."
+
+#~| msgid "NetworkManager is not running..."
+#~ msgid "ModemManager is not running"
+#~ msgstr "मोडेमप्रबंधक कार्यशील नहीं है..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "तयशुदा ब्लूटूथ एडाप्टर को जरूर सक्रिय किया जाना चाहिए डायल अप नेटवर्किंग कनेक्शन सेटअप "
+#~ "करने के पहले."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "PAN कनेक्शन बनाने में विफल: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s संजाल"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "कोई प्रमाणपत्र प्राधिकार प्रमाणपत्र चुना गया"
+
+#~| msgid ""
+#~| "Not using a Certificate Authority (CA) certificate can result in "
+#~| "connections to insecure, rogue wireless networks.  Would you like to "
+#~| "choose a Certificate Authority certificate?"
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "सर्टिफिकेट ऑथरिटी (CA) प्रमाणपत्र का उपयोग नहीं करना असुरक्षित, खराब बेतार संजारल "
+#~ "का परिणाम दे सकता है.  क्या आपसर्टिफिकेट ऑथरिटी प्रमाणपत्र का उपयोग करना चाहेंगे? "
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "सीए प्रमाणपत्र चुनें"
+
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "बेतार संजाल (%s)"
 
@@ -3461,15 +4132,9 @@ msgstr "WEP सूची (_x):"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "पता नहीं कैसे '%s' कनेक्शन संपादित नहीं कर सका"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "ब्लूटूथ युक्ति नहीं ढूँढ़ सका"
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "ब्लूटूथ विन्यास संभव नहीं (D-Bus प्रॉक्सी बनाने में विफल)."
 
-#~ msgid "Network Manager"
-#~ msgstr "नेटवर्क मैनेजर"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "nm-applet का एक रूप पहले से चल रहा है.\n"
 
diff --git a/po/hr.po b/po/hr.po
index 3ddfd37d..673add91 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,214 +7,3791 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-04 17:28+0100\n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2005-02-04 01:08+0100\n"
 "Last-Translator: Tomislav Vujec <tvujec@redhat.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: info-daemon/networks.glade:11
-msgid "Modify Wireless Networks"
-msgstr "Postavke bežičnih mreža"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#, fuzzy
+msgid "Network"
+msgstr "Žičana mreža"
 
-#: info-daemon/networks.glade:92
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">Bežične mreže:</span>"
+#: ../nm-applet.desktop.in.h:2
+#, fuzzy
+msgid "Manage your network connections"
+msgstr "Nema spoja na mrežu"
 
-#: info-daemon/passphrase.glade:9
-msgid "Wireless Network Key Required"
-msgstr "Potreban je ključ bežične mreže"
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#, fuzzy
+msgid "Network Connections"
+msgstr "Nema spoja na mrežu"
 
-#: info-daemon/passphrase.glade:52
-msgid "_Login to Network"
-msgstr "_Prijava na mrežu"
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+msgid "Disable connected notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+msgid "Disable disconnected notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+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
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+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 WiFi Create"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+msgid "Ignore CA certificate"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "NetworkManager nije pokrenut"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "NetworkManager nije pokrenut"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
 
-#: info-daemon/passphrase.glade:100
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_Spoji se"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr ""
+
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr ""
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+msgid "Failed to add/activate connection"
+msgstr ""
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr ""
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+msgid "Connection failure"
+msgstr ""
+
+#: ../src/applet.c:399
+msgid "Device disconnect failed"
+msgstr ""
+
+#: ../src/applet.c:404
+msgid "Disconnect failure"
+msgstr ""
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "Spoji se sa enkripcijom"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr ""
+
+#: ../src/applet.c:844
+#, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
 "\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Potrebna je lozinka za bežičnu mrežu</"
-"span>\n"
+
+#: ../src/applet.c:847
+#, c-format
+msgid ""
 "\n"
-"Za pristup mreži '%s', potrebna je lozinka ili ključ."
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
 
-#: info-daemon/passphrase.glade:129 panel-applet/essid.glade:246
-msgid "Key Type:"
-msgstr "Tip ključa:"
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
 
-#: info-daemon/passphrase.glade:150 panel-applet/essid.glade:315
+#: ../src/applet.c:853
+#, c-format
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
 msgstr ""
-"128-bitna lozinka (WEP)\n"
-"Slovčani ključ (WEP)\n"
-"Heksadecimalni ključ (WEP)"
 
-#: info-daemon/passphrase.glade:181
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:139
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:149
-#: panel-applet/essid.glade:270
-msgid "Passphrase:"
-msgstr "Lozinka:"
+#: ../src/applet.c:856
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+
+#: ../src/applet.c:859
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
 
-#: info-daemon/passphrase.glade:209 panel-applet/essid.glade:203
-#: panel-applet/essid.glade:300
-msgid "*"
-msgstr "*"
+#: ../src/applet.c:862
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+
+#: ../src/applet.c:865
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:142
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:152
-msgid "Ascii Key:"
-msgstr "Slovčani ključ"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:145
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:155
-msgid "Hex Key:"
-msgstr "Heksadecimalni ključ"
+#: ../src/applet.c:888
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr ""
+
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr ""
+
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr ""
+
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#, fuzzy
+msgid "disconnected"
+msgstr "_Spoji se"
+
+#: ../src/applet.c:1308
+#, fuzzy
+msgid "Disconnect"
+msgstr "_Spoji se"
+
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr ""
+
+#: ../src/applet.c:1395
+#, fuzzy
+msgid "No network devices available"
+msgstr "Nema mrežnih uređaja"
+
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr ""
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../src/applet.c:1508
+#, fuzzy
+msgid "_Disconnect VPN"
+msgstr "_Spoji se"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager nije pokrenut..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr ""
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+#, fuzzy
+msgid "Enable _Networking"
+msgstr "Bežična _mreža:"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+msgid "Enable _Wi-Fi"
+msgstr ""
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr ""
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr ""
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr ""
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr ""
+
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr ""
+
+#: ../src/applet.c:2222
+#, fuzzy
+msgid "Disconnected"
+msgstr "_Spoji se"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#: ../src/applet.c:2474
+#, fuzzy, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Spoj na žičanu mrežu"
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, fuzzy, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Spajanje na bežičnu mrežu '%s'..."
+
+#: ../src/applet.c:2483
+#, fuzzy, c-format
+msgid "Network connection '%s' active"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoVPN.c:157
+#: ../src/applet.c:2566
 #, c-format
-msgid "You must log in to access the private network %s"
-msgstr "Prijava je potrebna za pristup na mrežu %s"
+msgid "VPN connection '%s' active"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:313
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Nema spoja na mrežu"
 
-#: panel-applet/NMWirelessApplet.c:318
-msgid "Wired network connection"
+#: ../src/applet.c:3204
+#, fuzzy
+msgid "NetworkManager Applet"
+msgstr "NetworkManager nije pokrenut"
+
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr ""
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr ""
+
+#: ../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
+msgid "Mobile Broadband"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr ""
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+#, fuzzy
+msgid "Connection Established"
+msgstr "Spoji se sa enkripcijom"
+
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:30
+msgid "Auto Ethernet"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
+msgstr "Žičana mreža (%s)"
+
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
+msgstr "Žičana mreža (%s)"
+
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
+msgstr "Žičana mreža"
+
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
+msgstr "Žičana mreža"
+
+#: ../src/applet-device-ethernet.c:133
+msgid "You are now connected to the ethernet network."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "Spoj na žičanu mrežu"
 
-#: panel-applet/NMWirelessApplet.c:323
-msgid "Connecting to a wired network..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
+msgstr "Spoj na bežičnu mrežu '%s' (%d%%)"
+
+#: ../src/applet-device-ethernet.c:167
+#, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:170
+#, c-format
+msgid "Requesting an ethernet network address for '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
+msgstr "Spoj na bežičnu mrežu '%s' (%d%%)"
+
+#: ../src/applet-device-ethernet.c:346
+msgid "DSL authentication"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Spajanje na žičanu mrežu..."
 
-#: panel-applet/NMWirelessApplet.c:332
-msgid "Connected to an Ad-Hoc wireless network"
-msgstr "Spoj na Ad-Hoc bežičnu mrežu"
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
+msgstr "Stvori novu bečičnu mrežu..."
+
+#: ../src/applet-device-wifi.c:431
+msgid "(none)"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Žičana mreža (%s)"
+
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Žičana mreža (%s)"
+
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Žičana mreža"
+msgstr[1] "Žičana mreža"
+
+#: ../src/applet-device-wifi.c:934
+msgid "Wi-Fi is disabled"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:996
+#, fuzzy
+msgid "More networks"
+msgstr "Žičana mreža"
+
+#: ../src/applet-device-wifi.c:1180
+msgid "Wi-Fi Networks Available"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1181
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1364
+#, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Spoj na žičanu mrežu"
+
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Spoj na žičanu mrežu"
 
-#: panel-applet/NMWirelessApplet.c:346
+#: ../src/applet-device-wifi.c:1405
 #, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1408
+#, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Spoj na bežičnu mrežu '%s' (%d%%)"
 
-#: panel-applet/NMWirelessApplet.c:351
-msgid "Wireless network connection"
-msgstr "Spoj na bežičnu mrežu"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Spoj na žičanu mrežu"
+
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "Spoj na žičanu mrežu"
+
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "Spoj na žičanu mrežu"
+
+#: ../src/applet-dialogs.c:41
+msgid "Error displaying connection information:"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:356
+#: ../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
+msgid "LEAP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:74
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
+msgid "WPA/WPA2"
+msgstr ""
+
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+msgid "More addresses"
+msgstr ""
+
+#: ../src/applet-dialogs.c:226
+msgid "WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+msgctxt "Wi-Fi/Ethernet security"
+msgid "None"
+msgstr ""
+
+#: ../src/applet-dialogs.c:260
 #, c-format
-msgid "Connecting to wireless network '%s'..."
-msgstr "Spajanje na bežičnu mrežu '%s'..."
+msgid "%s (default)"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:362
-msgid "NetworkManager is not running"
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
+#, c-format
+msgid "%u Mb/s"
+msgstr ""
+
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+msgctxt "Speed"
+msgid "Unknown"
+msgstr ""
+
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr ""
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:492
+#, c-format
+msgid "Ethernet (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:495
+#, c-format
+msgid "802.11 WiFi (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:502
+#, c-format
+msgid "GSM (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:504
+#, c-format
+msgid "CDMA (%s)"
+msgstr ""
+
+#. --- General ---
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
+msgid "General"
+msgstr ""
+
+#: ../src/applet-dialogs.c:516
+msgid "Interface:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:536
+msgid "Hardware Address:"
+msgstr ""
+
+#. Driver
+#: ../src/applet-dialogs.c:550
+msgid "Driver:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:585
+msgid "Speed:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:600
+msgid "Security:"
+msgstr ""
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+msgid "IPv4"
+msgstr ""
+
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr ""
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+msgid "IPv6"
+msgstr ""
+
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+msgid "Ignored"
+msgstr ""
+
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "Tip ključa:"
+
+#: ../src/applet-dialogs.c:822
+msgid "VPN Gateway:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:828
+msgid "VPN Username:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+msgid "Base Connection:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr ""
+
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:957
+msgid "No valid active connections found!"
+msgstr ""
+
+#: ../src/applet-dialogs.c:985
+msgid ""
+"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2005-2008 Novell, Inc.\n"
+"and many other community contributors and translators"
+msgstr ""
+
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr ""
+
+#: ../src/applet-dialogs.c:990
+#, fuzzy
+msgid "NetworkManager Website"
 msgstr "NetworkManager nije pokrenut"
 
-#: panel-applet/NMWirelessApplet.c:367
-msgid "Scanning for wireless networks..."
-msgstr "Potraga za bežičnim mrežama..."
+#: ../src/applet-dialogs.c:1005
+msgid "Missing resources"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:690
-msgid "Other Wireless Networks..."
-msgstr "Ostale bežične mreže..."
+#: ../src/applet-dialogs.c:1030
+msgid "Mobile broadband network password"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:711
-msgid "Create new Wireless Network..."
-msgstr "Stvori novu bečičnu mrežu..."
+#: ../src/applet-dialogs.c:1039
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:821
-msgid "No network devices have been found"
-msgstr "Nema mrežnih uređaja"
+#: ../src/applet-dialogs.c:1054
+#, fuzzy
+msgid "Password:"
+msgstr "Lozinka:"
 
-#: panel-applet/NMWirelessApplet.c:939
-msgid "NetworkManager is not running..."
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr ""
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr ""
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr ""
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr ""
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
+
+#: ../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
+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: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
+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: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
+msgid "_Delete"
+msgstr ""
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr ""
+
+#: ../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…"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+msgid "Choose a Connection Type"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+msgid ""
+"Select the type of connection you wish to create.\n"
+"\n"
+"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."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+msgid "_Interface name:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+msgid "_Primary:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+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.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Spoj na žičanu mrežu"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "Enable I_GMP snooping"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr ""
+
+#: ../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
+msgid "default"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+msgid "MAC address"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+msgid "HW address"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+msgid "device"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr ""
+
+#: ../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.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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-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
+msgid "Automatic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr ""
+
+#: ../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
+msgid "_Device:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+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 ""
+"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-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+msgid "De_fault"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+msgid "_Broadcast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+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.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+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.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "_Spoji se"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+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:186
+#: ../src/connection-editor/page-ip6.c:204
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Addresses"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr ""
+
+#: ../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
+msgid "S_earch domains:"
+msgstr ""
+
+#: ../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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+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:17
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+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
+msgid "Basic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "Nu_mber:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Advanced"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "_APN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "N_etwork ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Sho_w passwords"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#, fuzzy
+msgid "Authentication"
+msgstr "Orjentacija"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
+msgid "Allowed methods:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+msgid "Compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
+msgid "_Require 128-bit encryption"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+msgid "Use _stateful MPPE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Allow _BSD data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
+msgid "Allow _Deflate data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Use TCP _header compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid "Send PPP _echo packets"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+msgid "_Teamed connections:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+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.h:3
+msgid "Cloned MAC _address:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
+msgid "Device name + number"
+msgstr ""
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
+
+#: ../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
+msgid "Allowed Authentication Methods"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:196
+msgid "Hardware"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+msgid "Import a saved VPN configuration..."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:332
+#, fuzzy
+msgid "Could not create new connection"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr ""
+
+#: ../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
+msgid "Address"
+msgstr ""
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr ""
+
+#: ../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
+msgid "Gateway"
+msgstr ""
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr ""
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Spoj na bežičnu mrežu"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+msgid "Editor initializing..."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+msgid "Connection cannot be modified"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+#, fuzzy
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr ""
+"NetworkManager ne može naći potrebne datoteke (glade datoteka nije "
+"pronađena)."
+
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "_Save"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not edit connection"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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
+msgid "Connection _name:"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr ""
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:160
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:178
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:182
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:684
+#, fuzzy
+msgid "Edit the selected connection"
+msgstr "Spoj na žičanu mrežu"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:933
+#, fuzzy
+msgid "Error creating connection"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:111
+msgid "Could not load 802.1x Security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr ""
+
+#: ../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
+msgid "Could not load Bluetooth user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "_Prijava na mrežu"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Bežična mreža"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bond.c:566
+msgid "primary"
+msgstr ""
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/page-bridge.c:213
+msgid "Could not load bridge user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "Spoj na žičanu mrežu"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+msgid "Could not load bridge port user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+msgid "Could not load DCB user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:129
+msgid "Could not load DSL user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:214
+#, c-format
+msgid "DSL connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:74
+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:328
+msgid "Could not load ethernet user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:457
+msgid "Ethernet device"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+msgid "cloned MAC"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, fuzzy, c-format
+msgid "Ethernet connection %d"
+msgstr "Spoj na žičanu mrežu"
+
+#. 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
+msgid "Default"
+msgstr ""
+
+#: ../src/connection-editor/page-general.c:52
+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 nije pokrenut..."
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:228
-msgid "Create new wireless network"
-msgstr "Stvori novu bečičnu mrežu"
+#: ../src/connection-editor/page-general.c:350
+msgid "Could not load General user interface."
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:229
+#: ../src/connection-editor/page-infiniband.c:57
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
-"create."
-msgstr "Unesi ESSID i sigurnosne postavke bežične mreže koju treba stvoriti."
+"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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
+msgid "Automatic (VPN)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
+msgid "Automatic (VPN) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
+msgid "Automatic (PPPoE)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
+msgid "Automatic (PPPoE) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:135
+msgid "Automatic (DHCP)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:136
+msgid "Automatic (DHCP) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
+msgid "Link-Local Only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+msgid "Additional DNS ser_vers:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+msgid "Additional s_earch domains:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:965
+#, c-format
+msgid "Editing IPv4 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1160
+msgid "Could not load IPv4 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
+msgid "Ignore"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:172
+msgid "Automatic, DHCP only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:964
+#, c-format
+msgid "Editing IPv6 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1157
+msgid "Could not load IPv6 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
+msgid "Could not load mobile broadband user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:327
+msgid "Unsupported mobile broadband connection type."
+msgstr ""
+
+#. Fall back to just asking for GSM vs. CDMA
+#: ../src/connection-editor/page-mobile.c:529
+msgid "Select Mobile Broadband Provider Type"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:561
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:568
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+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:258
+msgid "PAP"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
+msgid "CHAP"
+msgstr ""
+
+#: ../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
+msgid "MSCHAPv2"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
+msgid "MSCHAP"
+msgstr ""
+
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:136
+msgid "none"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:196
+#, c-format
+msgid "Editing PPP authentication methods for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:281
+msgid "Could not load PPP user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+msgid "Could not load team user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "Nema spoja na mrežu"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/page-vlan.c:596
+msgid "Could not load vlan user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/page-vpn.c:103
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:118
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
+#, fuzzy, c-format
+msgid "VPN connection %d"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/page-vpn.c:229
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:255
+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
+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
+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
+#, c-format
+msgid "%u (%u MHz)"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:450
+msgid "Could not load Wi-Fi user interface."
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:234
-msgid "Custom wireless network"
-msgstr "Posebna bežična mreža"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:235
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../src/connection-editor/page-wifi.c:577
+msgid "Wi-Fi device"
 msgstr ""
-"Unesi ESSID i sigurnosne postavke bežične mreže na koju se treba spojiti."
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:316
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:325
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Spoj na žičanu mrežu"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Lozinka:"
+
+#: ../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)"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+msgid "WPA & WPA2 Enterprise"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:413
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:424
+msgid "Wi-Fi Security"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:426
+msgid "Could not load Wi-Fi security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:512
+#, c-format
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:138
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "Nema spoja na mrežu"
+
+#: ../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 ""
+
+#: ../src/connection-editor/vpn-helpers.c:141
+msgid "unknown error"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:215
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:217
+msgid "_Replace"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:219
+#, c-format
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:255
+#, fuzzy
+msgid "Cannot export VPN connection"
+msgstr "Nema spoja na mrežu"
+
+#: ../src/connection-editor/vpn-helpers.c:257
+#, c-format
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:292
+msgid "Export VPN connection..."
+msgstr ""
+
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
+#, fuzzy
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr ""
 "NetworkManager ne može naći potrebne datoteke (glade datoteka nije "
 "pronađena)."
 
-#: panel-applet/essid.glade:53
-msgid "C_onnect"
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr ""
+
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr ""
+
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr ""
+
+#: ../src/info.ui.h:3
+#, fuzzy
+msgid "Active Network Connections"
+msgstr "Spoj na žičanu mrež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
+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-wizard.c:325
+#: ../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 ""
+
+#: ../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
+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
+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 ""
+
+#: ../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
+msgid "Installed GSM device"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../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
+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:"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../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
+msgid "Your broadband billing plan name"
+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 ""
+
+#: ../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 ""
+
+#: ../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
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr ""
+
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+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.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+msgid "_Ternary 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-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Spoj na žičanu mrežu"
+
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
+msgid "New..."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+msgid "C_reate"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Potreban je ključ bežične mreže"
+
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "Stvori novu bečičnu mrežu..."
+
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Žičana mreža"
+
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "Unesi ESSID i sigurnosne postavke bežične mreže koju treba stvoriti."
+
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Spajanje na žičanu mrežu..."
+
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr "Unesi ESSID i sigurnosne postavke bežične mreže koju treba stvoriti."
+
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+msgid "Wi-Fi _security:"
+msgstr ""
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#, fuzzy
+msgid "C_onnection:"
 msgstr "_Spoji se"
 
-#: panel-applet/essid.glade:132
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
 msgstr "Bežični _uređaj:"
 
-#: panel-applet/essid.glade:172
-msgid "Wireless _Network:"
-msgstr "Bežična _mreža:"
+#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+msgid "Wired"
+msgstr ""
 
-#: panel-applet/essid.glade:337
-msgid "Connect with encryption enabled"
-msgstr "Spoji se sa enkripcijom"
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
 
-#: panel-applet/menu-info.c:109
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
 #, c-format
-msgid "Wired Network (%s)"
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr ""
+
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+
+#: ../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
+msgid "EVDO"
+msgstr ""
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:68
+msgid "HSPA+"
+msgstr ""
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr ""
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr ""
+
+#: ../src/mb-menu-item.c:141
+#, fuzzy, c-format
+msgid "Home network (%s)"
 msgstr "Žičana mreža (%s)"
 
-#: panel-applet/menu-info.c:111
-msgid "Wired Network"
+#: ../src/mb-menu-item.c:143
+#, fuzzy, c-format
+msgid "Home network"
 msgstr "Žičana mreža"
 
-#: panel-applet/menu-info.c:177
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr ""
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr ""
+
+#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
 #, c-format
-msgid "Wireless Network (%s)"
-msgid_plural "Wireless Networks (%s)"
-msgstr[0] "Bežična mreža (%s)"
-msgstr[1] "Bežične mreže (%s)"
+msgid "%s (%s roaming)"
+msgstr ""
 
-#: panel-applet/menu-info.c:179
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Bežična mreža"
-msgstr[1] "Bežične mreže"
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#, c-format
+msgid "%s (roaming)"
+msgstr ""
 
-#: panel-applet/menu-info.c:316
-msgid " (invalid Unicode)"
-msgstr " (greška u unicodu)"
+#: ../src/mb-menu-item.c:170
+#, fuzzy, c-format
+msgid "Roaming network (%s)"
+msgstr "Žičana mreža (%s)"
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
-msgstr "Orjentacija"
+#: ../src/mb-menu-item.c:172
+#, fuzzy, c-format
+msgid "Roaming network"
+msgstr "_Prijava na mrežu"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr ""
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr ""
+
+#: ../src/mobile-helpers.c:619
+#, fuzzy, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Spoj na bežičnu mrežu '%s' (%d%%)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Nema spoja na mrežu"
+
+#: ../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/wireless-security/eap-method.c:452
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method.c:455
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+msgid "Anonymous"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+msgid "Authenticated"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+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
+msgid "_Inner authentication:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+msgid "MD5"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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
+msgid "No CA certificate is _required"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+msgid "PEAP _version:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
+msgid "Unencrypted private keys are insecure"
+msgstr ""
+
+#: ../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)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:475
+msgid "Choose your personal certificate..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:487
+msgid "Choose your private key..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "Private _key:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_Private key password:"
+msgstr ""
+
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
+msgid "TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
+msgid "Tunneled TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:493
+msgid "Protected EAP (PEAP)"
+msgstr ""
+
+#: ../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
+msgid "Au_thentication:"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
+msgid "Open System"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+#, fuzzy
+msgid "_Key:"
+msgstr "Heksadecimalni ključ"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x:"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#, fuzzy
+msgid "_Type:"
+msgstr "Tip ključa:"
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "Postavke bežičnih mreža"
+
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">Bežične mreže:</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+#~ "Network</span>\n"
+#~ "\n"
+#~ "A passphrase or encryption key is required to access the wireless network "
+#~ "'%s'."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Potrebna je lozinka za bežičnu "
+#~ "mrežu</span>\n"
+#~ "\n"
+#~ "Za pristup mreži '%s', potrebna je lozinka ili ključ."
+
+#~ msgid ""
+#~ "128-bit Passphrase (WEP)\n"
+#~ "Ascii Key (WEP)\n"
+#~ "Hex Key (WEP)"
+#~ msgstr ""
+#~ "128-bitna lozinka (WEP)\n"
+#~ "Slovčani ključ (WEP)\n"
+#~ "Heksadecimalni ključ (WEP)"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "Ascii Key:"
+#~ msgstr "Slovčani ključ"
+
+#~ msgid "You must log in to access the private network %s"
+#~ msgstr "Prijava je potrebna za pristup na mrežu %s"
+
+#~ msgid "Connected to an Ad-Hoc wireless network"
+#~ msgstr "Spoj na Ad-Hoc bežičnu mrežu"
+
+#~ msgid "Scanning for wireless networks..."
+#~ msgstr "Potraga za bežičnim mrežama..."
+
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "Ostale bežične mreže..."
+
+#~ msgid "Create new wireless network"
+#~ msgstr "Stvori novu bečičnu mrežu"
+
+#~ msgid "Custom wireless network"
+#~ msgstr "Posebna bežična mreža"
+
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr ""
+#~ "Unesi ESSID i sigurnosne postavke bežične mreže na koju se treba spojiti."
+
+#~ msgid "Wireless Network (%s)"
+#~ msgid_plural "Wireless Networks (%s)"
+#~ msgstr[0] "Bežična mreža (%s)"
+#~ msgstr[1] "Bežične mreže (%s)"
+
+#~ msgid " (invalid Unicode)"
+#~ msgstr " (greška u unicodu)"
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
-msgstr "Orjentacija ladice."
+#~ msgid "The orientation of the tray."
+#~ msgstr "Orjentacija ladice."
diff --git a/po/hu.po b/po/hu.po
index a0793fb0..09579d26 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,12 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-03-05 02:00+0000\n"
-"PO-Revision-Date: 2016-03-05 10:54+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Hungarian <openscope at gmail dot com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
+"PO-Revision-Date: 2016-03-30 09:58+0200\n"
+"Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n"
+"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +21,7 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3118
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Hálózat"
 
@@ -177,45 +176,45 @@ msgstr "Kapcs_olódás"
 msgid "_Network name:"
 msgstr "_Hálózatnév:"
 
-#: ../src/ap-menu-item.c:84
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "eseti"
 
-#: ../src/ap-menu-item.c:89
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "biztonságos."
 
-#: ../src/applet.c:338
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "A kapcsolat hozzáadása vagy aktiválása meghiúsult"
 
-#: ../src/applet.c:340 ../src/applet.c:394 ../src/applet.c:429
-#: ../src/applet-device-wifi.c:1316 ../src/applet-device-wifi.c:1339
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: ../src/applet.c:343 ../src/applet.c:432 ../src/applet-device-wifi.c:1319
-#: ../src/applet-device-wifi.c:1342
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "A kapcsolat meghiúsult"
 
-#: ../src/applet.c:392
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Az eszköz leválasztása meghiúsult"
 
-#: ../src/applet.c:397
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Kapcsolatbontási hiba"
 
-#: ../src/applet.c:427
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "A kapcsolat aktiválása meghiúsult"
 
-#: ../src/applet.c:751 ../src/applet-device-wifi.c:1034
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Ne mutassa ezt az üzenetet újra"
 
-#: ../src/applet.c:838
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -225,7 +224,7 @@ msgstr ""
 "\n"
 "A(z) „%s” VPN kapcsolat meghiúsult, mivel a hálózati kapcsolat megszakadt."
 
-#: ../src/applet.c:841
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -235,7 +234,7 @@ msgstr ""
 "A(z) „%s” VPN kapcsolat meghiúsult, mivel a VPN szolgáltatás váratlanul "
 "leállt."
 
-#: ../src/applet.c:844
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -246,7 +245,7 @@ msgstr ""
 "A(z) „%s” VPN kapcsolat meghiúsult, mivel a VPN szolgáltatás érvénytelen "
 "konfigurációt adott vissza."
 
-#: ../src/applet.c:847
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -256,7 +255,7 @@ msgstr ""
 "A(z) „%s” VPN kapcsolat meghiúsult, mivel a kapcsolódási kísérlet túllépte "
 "az időkorlátot."
 
-#: ../src/applet.c:850
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -266,7 +265,7 @@ msgstr ""
 "A(z) „%s” VPN kapcsolat meghiúsult, mivel a VPN szolgáltatás nem indult el "
 "időben."
 
-#: ../src/applet.c:853
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -275,7 +274,7 @@ msgstr ""
 "\n"
 "A(z) „%s” VPN kapcsolat meghiúsult, mivel a VPN szolgáltatás nem indult el."
 
-#: ../src/applet.c:856
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -285,7 +284,7 @@ msgstr ""
 "A(z) „%s” VPN kapcsolat meghiúsult, mivel nem találhatók érvényes titkos VPN "
 "információk."
 
-#: ../src/applet.c:859
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -295,7 +294,7 @@ msgstr ""
 "A(z) „%s” VPN kapcsolat meghiúsult az érvénytelen titkos VPN információk "
 "miatt."
 
-#: ../src/applet.c:866
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -304,7 +303,7 @@ msgstr ""
 "\n"
 "A(z) „%s” VPN kapcsolat meghiúsult."
 
-#: ../src/applet.c:882
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -314,7 +313,7 @@ msgstr ""
 "\n"
 "A(z) „%s” VPN kapcsolat bontva, mivel a hálózati kapcsolat megszakadt."
 
-#: ../src/applet.c:885
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -323,7 +322,7 @@ msgstr ""
 "\n"
 "A(z) „%s” VPN kapcsolat bontva, mivel a VPN szolgáltatás leállt."
 
-#: ../src/applet.c:891
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -332,7 +331,7 @@ msgstr ""
 "\n"
 "A(z) „%s” VPN kapcsolat bontva."
 
-#: ../src/applet.c:921
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -343,19 +342,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:923
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "A VPN kapcsolat sikeresen létrehozva.\n"
 
-#: ../src/applet.c:925
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN bejelentkezési üzenet"
 
-#: ../src/applet.c:931 ../src/applet.c:939 ../src/applet.c:980
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "A VPN kapcsolat meghiúsult"
 
-#: ../src/applet.c:987
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -369,7 +368,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:990
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -403,19 +402,19 @@ msgstr "Bontás"
 msgid "device not managed"
 msgstr "az eszköz nem kezelt"
 
-#: ../src/applet.c:1392
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Nem érhetők el hálózati eszközök"
 
-#: ../src/applet.c:1446
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN kapcsolatok"
 
-#: ../src/applet.c:1500
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "V_PN beállítása…"
 
-#: ../src/applet.c:1505
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "VP_N bontása"
 
@@ -423,110 +422,104 @@ msgstr "VP_N bontása"
 msgid "NetworkManager is not running..."
 msgstr "A Hálózatkezelő nem fut…"
 
-#: ../src/applet.c:1620 ../src/applet.c:2620
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Hálózat kikapcsolva"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1829
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "_Hálózat bekapcsolása"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1838
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "_Wi-Fi bekapcsolása"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1847
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobil széles sáv bekapcsolása"
 
 #. Toggle notifications item
-#: ../src/applet.c:1859
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Ért_esítések bekapcsolása"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1871
+#: ../src/applet.c:1872
 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:1881
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Kap_csolatok szerkesztése…"
 
-#. Help item
-#: ../src/applet.c:1896
-msgid "_Help"
-msgstr "_Súgó"
-
-#. About item
-#: ../src/applet.c:1905
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../src/applet.c:2189
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Kapcsolódott ehhez: „%s”."
 
-#: ../src/applet.c:2232
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Kapcsolat bontva"
 
-#: ../src/applet.c:2233
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "A hálózati kapcsolat bontva."
 
-#: ../src/applet.c:2488
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "A hálózati kapcsolat („%s”) előkészítése…"
 
-#: ../src/applet.c:2491
+#: ../src/applet.c:2477
 #, 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:2494 ../src/applet-device-bt.c:122
-#: ../src/mobile-helpers.c:600
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, 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:2497
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "A hálózati kapcsolat („%s”) aktív"
 
-#: ../src/applet.c:2571
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "A VPN kapcsolat („%s”) indítása…"
 
-#: ../src/applet.c:2574
+#: ../src/applet.c:2560
 #, 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:2577
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "VPN cím kérése ehhez: „%s”…"
 
-#: ../src/applet.c:2580
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "A VPN kapcsolat („%s”) aktív"
 
-#: ../src/applet.c:2624
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Nincs hálózati kapcsolat"
 
-#: ../src/applet.c:3223
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Hálózatkezelő kisalkalmazás"
 
@@ -543,46 +536,46 @@ 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:731 ../src/applet-dialogs.c:506
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobil széles sáv (%s)"
 
-#: ../src/applet-device-broadband.c:733
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobil széles sáv"
 
-#: ../src/applet-device-broadband.c:785 ../src/applet-device-bt.c:75
-#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:821
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Elérhető"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Új mobil széles sávú kapcsolat…"
 
-#: ../src/applet-device-broadband.c:812 ../src/applet-device-bt.c:87
-#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1240
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Kapcsolat létrehozva"
 
-#: ../src/applet-device-broadband.c:813
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Kapcsolódott a mobil széles sávú hálózathoz."
 
-#: ../src/applet-device-broadband.c:953 ../src/applet-device-broadband.c:959
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobil széles sávú hálózat."
 
-#: ../src/applet-device-broadband.c:954
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Mostantól regisztrálva van az otthoni hálózaton."
 
-#: ../src/applet-device-broadband.c:960
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Mostantól regisztrálva van a barangoló hálózaton."
 
@@ -590,23 +583,23 @@ msgstr "Mostantól regisztrálva van a barangoló hálózaton."
 msgid "You are now connected to the mobile broadband network."
 msgstr "Kapcsolódott a mobil széles sávú hálózathoz."
 
-#: ../src/applet-device-bt.c:113 ../src/mobile-helpers.c:591
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "„%s” mobil széles sávú kapcsolat előkészítése…"
 
-#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:594
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "„%s” mobil széles sávú kapcsolat beállítása…"
 
-#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:597
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
 "Felhasználói hitelesítés szükséges a mobil széles sávú kapcsolathoz („%s”)…"
 
-#: ../src/applet-device-bt.c:126 ../src/mobile-helpers.c:616
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "„%s” mobil széles sávú kapcsolat aktív"
@@ -637,125 +630,125 @@ msgstr "Vezetékes hálózat"
 msgid "You are now connected to the ethernet network."
 msgstr "Kapcsolódott a vezetékes hálózathoz."
 
-#: ../src/applet-device-ethernet.c:158
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Vezetékes hálózati kapcsolat („%s”) előkészítése…"
 
-#: ../src/applet-device-ethernet.c:161
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Vezetékes hálózati kapcsolat („%s”) előkészítése…"
 
-#: ../src/applet-device-ethernet.c:164
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr ""
 "A felhasználó hitelesítése szükséges a vezetékes hálózati kapcsolathoz („%s”)"
 "…"
 
-#: ../src/applet-device-ethernet.c:167
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Vezetékes hálózati cím kérése ehhez: „%s”…"
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "A vezetékes hálózati kapcsolat („%s”) aktív…"
 
-#: ../src/applet-device-ethernet.c:343
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL hitelesítés"
 
-#: ../src/applet-device-wifi.c:82
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Kapcsolódás _rejtett Wi-Fi hálózathoz…"
 
-#: ../src/applet-device-wifi.c:133
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Új _Wi-Fi hálózat létrehozása…"
 
-#: ../src/applet-device-wifi.c:283
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(nincs)"
 
-#: ../src/applet-device-wifi.c:753
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi hálózatok (%s)"
 
-#: ../src/applet-device-wifi.c:755
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi hálózat (%s)"
 
-#: ../src/applet-device-wifi.c:757
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi hálózat"
 msgstr[1] "Wi-Fi hálózatok"
 
-#: ../src/applet-device-wifi.c:786
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "A Wi-Fi kikapcsolva"
 
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "A Wi-Fi hardveres kapcsolóval kikapcsolva"
 
-#: ../src/applet-device-wifi.c:848
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "További hálózatok"
 
-#: ../src/applet-device-wifi.c:1030
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi hálózatok érhetők el"
 
-#: ../src/applet-device-wifi.c:1031
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "A hálózat menüvel kapcsolódhat a Wi-Fi hálózathoz"
 
-#: ../src/applet-device-wifi.c:1239
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Kapcsolódott a(z) „%s” Wi-Fi hálózathoz."
 
-#: ../src/applet-device-wifi.c:1271
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "A Wi-Fi hálózati kapcsolat („%s”) előkészítése…"
 
-#: ../src/applet-device-wifi.c:1274
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Wi-Fi hálózati kapcsolat („%s”) előkészítése…"
 
-#: ../src/applet-device-wifi.c:1277
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "A felhasználó hitelesítése szükséges a Wi-Fi hálózathoz („%s”)…"
 
-#: ../src/applet-device-wifi.c:1280
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Wi-Fi hálózati cím kérése a következőhöz: „%s”…"
 
-#: ../src/applet-device-wifi.c:1291
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "A Wi-Fi hálózati kapcsolat („%s”) aktív: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1295
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "A Wi-Fi hálózati kapcsolat („%s”) aktív…"
 
-#: ../src/applet-device-wifi.c:1314
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Nem sikerült aktiválni a kapcsolatot"
 
-#: ../src/applet-device-wifi.c:1337
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Az új kapcsolat hozzáadása meghiúsult"
 
@@ -853,7 +846,7 @@ msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:799
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
 #: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Általános"
@@ -880,53 +873,53 @@ msgid "Security:"
 msgstr "Biztonság:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:840
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:632 ../src/applet-dialogs.c:678
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Alapértelmezett útvonal:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:652 ../src/applet-dialogs.c:862
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:661 ../src/applet-dialogs.c:871
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Mellőzve"
 
-#: ../src/applet-dialogs.c:804
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN típusa:"
 
-#: ../src/applet-dialogs.c:811
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN átjáró:"
 
-#: ../src/applet-dialogs.c:817
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN felhasználónév:"
 
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN fejléc:"
 
-#: ../src/applet-dialogs.c:829
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Alapkapcsolat:"
 
-#: ../src/applet-dialogs.c:831 ../src/libnm-gtk/nm-ui-utils.c:343
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Ismeretlen"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:946
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Nem találhatók érvényes aktív kapcsolatok!"
 
-#: ../src/applet-dialogs.c:974
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -936,44 +929,44 @@ 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:977
+#: ../src/applet-dialogs.c:988
 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:979
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "A Hálózatkezelő webhelye"
 
-#: ../src/applet-dialogs.c:994
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Hiányzó erőforrások"
 
-#: ../src/applet-dialogs.c:1019
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Mobil széles sávú hálózat jelszava"
 
-#: ../src/applet-dialogs.c:1028
+#: ../src/applet-dialogs.c:1039
 #, 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:1043
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../src/applet-dialogs.c:1325
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "A SIM PIN feloldása szükséges"
 
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1337
 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:1328
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -982,25 +975,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:1330
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN kód:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "PIN-kód megjelenítése"
 
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "A SIM PUK feloldása szükséges"
 
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1348
 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:1339
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1009,22 +1002,22 @@ 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:1341
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK kód:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Új PIN-kód:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1357
 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:1351
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK-kódok megjelenítése"
 
@@ -1648,34 +1641,38 @@ msgid "De_fault"
 msgstr "Ala_pértelmezett"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr "_Mellőzés"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Fiz"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "_Bűvös"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "Ébredés _LAN-on jelszava:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1955,12 +1952,10 @@ msgid "_Parent interface:"
 msgstr "S_zülő csatoló:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-#| msgid "VLAN interface _name:"
 msgid "VLAN inter_face name:"
 msgstr "_VLAN csatolónév:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#| msgid "_Cloned MAC address:"
 msgid "Cloned MAC _address:"
 msgstr "_Klónozott MAC-cím:"
 
@@ -2113,13 +2108,13 @@ msgstr ""
 "néhány módszer támogatását."
 
 #: ../src/connection-editor/connection-helpers.c:97
-#: ../src/connection-editor/page-ethernet.c:315
+#: ../src/connection-editor/page-ethernet.c:326
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #: ../src/connection-editor/connection-helpers.c:98
-#: ../src/connection-editor/page-wifi.c:447 ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
@@ -2424,7 +2419,6 @@ msgstr "Nem tölthető be a Bluetooth felhasználói felülete."
 
 #: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
-#| msgid "could not find the Bluetooth device."
 msgid "invalid Bluetooth device (%s)"
 msgstr "érvénytelen Bluetooth eszköz (%s)"
 
@@ -2509,25 +2503,25 @@ msgstr ""
 "megadott hálózati eszközhöz rögzíti a kapcsolatot. Például: „em1”, "
 "„3C:97:0E:42:1A:19”, „em1 (3C:97:0E:42:1A:19)”."
 
-#: ../src/connection-editor/page-ethernet.c:317
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Nem tölthető be a vezetékes hálózat felhasználói felülete."
 
-#: ../src/connection-editor/page-ethernet.c:444
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Ethernet eszköz"
 
-#: ../src/connection-editor/page-ethernet.c:448
+#: ../src/connection-editor/page-ethernet.c:461
 #: ../src/connection-editor/page-vlan.c:741
-#: ../src/connection-editor/page-wifi.c:580
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "klónozott MAC"
 
-#: ../src/connection-editor/page-ethernet.c:452
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Ébredés LAN-on jelszava"
 
-#: ../src/connection-editor/page-ethernet.c:487
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "%d. vezetékes kapcsolat"
@@ -2758,13 +2752,13 @@ 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:578 ../src/mb-menu-item.c:52
-#: ../src/mobile-helpers.c:278
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:56
-#: ../src/mobile-helpers.c:276
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
@@ -2931,19 +2925,19 @@ msgstr ""
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:449
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Nem tölthető be a Wi-Fi felhasználói felülete."
 
-#: ../src/connection-editor/page-wifi.c:570
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:576
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Wi-Fi eszköz"
 
-#: ../src/connection-editor/page-wifi.c:618
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "%d. Wi-Fi kapcsolat"
@@ -3436,107 +3430,107 @@ msgstr ""
 "Nem a parancssori interakcióra tervezték, hanem a GNOME asztali környezeten "
 "belüli futásra."
 
-#: ../src/mb-menu-item.c:54
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:58
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:123
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nincs bekapcsolva"
 
-#: ../src/mb-menu-item.c:129
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nincs regisztrálva"
 
-#: ../src/mb-menu-item.c:147
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Otthoni hálózat (%s)"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Otthoni hálózat"
 
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "keresés"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "regisztráció megtagadva"
 
-#: ../src/mb-menu-item.c:165 ../src/mb-menu-item.c:171
+#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s barangoló)"
 
-#: ../src/mb-menu-item.c:167 ../src/mb-menu-item.c:173
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (barangoló)"
 
-#: ../src/mb-menu-item.c:176
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Barangoló hálózat (%s)"
 
-#: ../src/mb-menu-item.c:178
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Barangoló hálózat"
 
-#: ../src/mobile-helpers.c:326
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "A(z) „%s” SIM-kártya PIN-kódja ezen: „%s”"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN kód szükséges"
 
-#: ../src/mobile-helpers.c:467
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN kód szükséges a mobil széles sávú eszközhöz"
 
-#: ../src/mobile-helpers.c:611
+#: ../src/mobile-helpers.c:619
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "„%s” mobil széles sávú kapcsolat aktív: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:614
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "barangoló"
 
@@ -3871,6 +3865,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Típus:"
 
+#~ msgid "_Help"
+#~ msgstr "_Súgó"
+
 #~ msgid "bdaddr"
 #~ msgstr "bdaddr"
 
diff --git a/po/id.po b/po/id.po
index dd11aac4..42411496 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-10-17 20:17+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-10-21 01:50+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome@i15n.org>\n"
@@ -22,7 +21,7 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Generator: Poedit 1.6.9\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Jaringan"
 
@@ -130,46 +129,90 @@ msgstr ""
 "Tata ini ke true untuk menonaktifkan peringatan tentang sertifikat CA dalam "
 "otentikasi EAP fasa 2."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Aplet NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Aplet NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Otentikasi 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "S_ambung"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Nama jaringan:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Gagal menambah/mengaktifkan koneksi"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Galat tak dikenal"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Kegagalan koneksi"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Pemutusan perangkat gagal"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Pemutusan gagal"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Aktivasi koneksi gagal"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Jangan tunjukkan pesan ini lagi"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -179,7 +222,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal karena sambungan jaringan terputus."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -188,7 +231,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal karena layanan VPN berhenti tak disangka-sangka."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -199,7 +242,7 @@ msgstr ""
 "Sambungan VPN '%s' gagal karena layanan VPN mengembalikan konfigurasi yang "
 "tidak benar."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -208,7 +251,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal karena batas waktu percobaan sambungan sudah habis."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -217,7 +260,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal karena layanan VPN tidak mulai pada waktunya."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -226,7 +269,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal karena layanan VPN gagal dijalankan."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -235,7 +278,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal karena tidak ada kode rahasia VPN yang valid."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -244,7 +287,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal karena kode rahasia VPN yang tak valid."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -253,7 +296,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' gagal."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -263,7 +306,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' terputus karena sambungan jaringan terputus."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -272,7 +315,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' terputus karena layanan VPN berhenti."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -281,7 +324,7 @@ msgstr ""
 "\n"
 "Sambungan VPN '%s' terputus."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -292,19 +335,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Koneksi VPN telah sukses dijalin.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Pesan Login VPN"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Sambungan VPN Gagal"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -317,7 +360,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -330,798 +373,544 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "perangkat tak siap (tak ada firmware)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "perangkat tak siap"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "terputus"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Putuskan"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "perangkat tidak dikelola"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Tak ada perangkat jaringan yang tersedia"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Sambungan _VPN"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "Mena_ta VPN..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Memutus VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager tidak sedang jalan..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Fungsi jaringan dimatikan"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Fungsika_n Jaringan"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Fungsikan Ni_rkabel"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Fungsikan _Data Seluler"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Fungsikan Data Seluler WiMA_X"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Fungsikan N_otifikasi"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Informasi Sambungan"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Sunting Sambungan..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "Ba_ntuan"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "Tent_ang"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Anda sekarang tersambung ke '%s'."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Terputus"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Sambungan jaringan terputus."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Menyiapkan sambungan jaringan '%s'..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Otentikasi pengguna diperlukan untuk sambungan jaringan '%s'..."
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Meminta alamat jaringan untuk '%s'..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Sambungan jaringan '%s' aktif"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Memulai sambungan VPN '%s'..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Otentikasi pengguna diperlukan untuk sambungan VPN '%s'..."
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Meminta alamat VPN untuk '%s'..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Sambungan VPN '%s' aktif"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Tak ada sambungan jaringan"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Aplet NetworkManager"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Tersedia"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Sambungan Terjalin"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Anda sekarang tersambung ke jaringan bond."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Menyiapkan sambungan bond '%s'..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Mengatur sambungan bond '%s'..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Otentikasi pengguna diperlukan untuk sambungan bond '%s'..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Meminta alamat untuk '%s'..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Sambungan bond '%s' aktif"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Anda sekarang tersambung ke jaringan bridge."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Menyiapkan sambungan bridge '%s'..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Mengatur sambungan bridge '%s'…"
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Otentikasi pengguna diperlukan untuk sambungan bridge '%s'..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Sambungan bridge '%s' aktif"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK salah; silakan kontak operator Anda."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Mengirim kode pembuka..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Data Seluler (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-mobile.c:349
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Data Seluler"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Tersedia"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Sambungan Data Seluler baru..."
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Sambungan Terjalin"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Anda kini tersambung ke jaringan Data Seluler."
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Jaringan Data Seluler."
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Anda kini terdaftar ke jaringan rumah."
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Anda kini terdaftar ke jaringan roaming."
 
-#: ../src/applet-device-bt.c:103
+#: ../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:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Menyiapkan sambungan data seluler '%s'..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Mengatur sambungan data seluler '%s'..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Otentikasi pengguna dibutuhkan untuk sambungan data seluler '%s'..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Sambungan data seluler '%s' aktif"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Sambungan Data Seluler (CDMA) baru ..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Anda sekarang tersambung ke jaringan CDMA."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "Jaringan CDMA."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet Otomatis"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Jaringan Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Jaringan Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Jaringan Ethernet"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Jaringan Ethernet"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../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:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Menyiapkan sambungan jaringan ethernet '%s'…"
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Mengatur sambungan jaringan ethernet '%s'…"
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Otentikasi pengguna diperlukan untuk sambungan jaringan ethernet '%s'…"
 
-#: ../src/applet-device-ethernet.c:180
+#: ../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:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Sambungan jaringan ethernet '%s' aktif"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Otentikasi DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Sambungan Data Seluler (GSM) baru..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Anda sekarang tersambung ke jaringan GSM."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "Jaringan GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "InfiniBand Otomatis"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "Jaringan InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Jaringan InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "Jaringan InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "Jaringan InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Anda sekarang tersambung ke jaringan InfiniBand."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Menyiapkan sambungan InfiniBand '%s'..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Mengatur sambungan InfiniBand '%s'…"
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Otentikasi pengguna diperlukan untuk sambungan InfiniBand '%s'..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "Koneksi InfiniBand '%s' aktif"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Anda sekarang tersambung ke jaringan tim."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Menyiapkan koneksi tim '%s'..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Mengatur koneksi tim '%s'..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Otentikasi pengguna diperlukan untuk sambungan tim '%s'..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Koneksi tim '%s' aktif"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Anda sekarang tersambung ke VLAN."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Menyiapkan sambungan VLAN '%s'..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Mengatur sambungan VLAN '%s'..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Otentikasi pengguna diperlukan untuk sambungan VLAN '%s'..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "Sambungan VLAN '%s' aktif"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Sambung ke Jaringan Wi-Fi Tersembunyi…"
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Buat Jaringa_n Wi-Fi Baru…"
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(tidak ada)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Jaringan Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Jaringan Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Jaringan Wi-Fi"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi dinonaktifkan"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi dinonaktifkan oleh saklar perangkat keras"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Jaringan lain"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Jaringan Wi-Fi Tersedia"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 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:1242
+#: ../src/applet-device-wifi.c:1364
 #, 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:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Menyiapkan sambungan jaringan Wi-Fi '%s'…"
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Mengatur sambungan jaringan Wi-Fi '%s'…"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, 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:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Meminta alamat jaringan Wi-Fi untuk '%s'…"
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Sambungan jaringan Wi-Fi '%s' aktif: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Sambungan jaringan Wi-Fi '%s' aktif"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Gagal mengaktifkan koneksi"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Gagal menambahkan sambungan baru"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Data Seluler WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "Data Seluler WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX dinonaktifkan"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX dinonaktifkan oleh saklar perangkat keras"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Anda sekarang tersambung ke jaringan WiMAX."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Sambungan data seluler '%s' aktif: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "roaming"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Galat menampilkan informasi sambungan:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:318
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP Dinamis"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Alamat"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:270
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nihil"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (bawaan)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Tak dikenal"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "tak dikenal"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "tak dikenal"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "Alamat IP:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Tak dikenal"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Alamat IP:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Alamat Broadcast:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Mask Subnet:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Tak dikenal"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Rute Utama:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Mask Subnet:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "WiFi 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:321
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Umum"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Antarmuka:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Alamat Perangkat Keras:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Kecepatan:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Keamanan:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Rute Utama:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Diabaikan"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Tipe VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Gateway VPN:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Nama Pengguna VPN:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Banner VPN:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Sambungan Dasar:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Tak dikenal"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Tak ditemukan sambungan aktif yang valid!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1129,44 +918,44 @@ msgstr ""
 "Hak cipta © 2005-2008 Novell, Inc.\n"
 "maupun komunitas para kontributor dan penerjemah"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplet wilayah pemberitahuan untuk mengelola perangkat dan sambungan jaringan "
 "Anda."
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Situs Web NetworkManager"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Sumber daya hilang"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Sandi jaringan data seluler"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Diperlukan sandi untuk tersambung pada '%s'."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Sandi:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Perlu PIN SIM"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "Perlu PIN SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1175,25 +964,25 @@ msgstr ""
 "Perangkat broadband mobile '%s' memerlukan kode PIN sebelum dapat dipakai."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Kode PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Tampilkan kode PIN"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Perlu PUK SIM"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "Perlu PUK SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1202,27 +991,34 @@ msgstr ""
 "Perangkat broadband mobile '%s' memerlukan kode PUK sebelum dapat dipakai."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Kode PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Kode PIN baru:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Masukkan lagi kode PIN baru:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Tampilkan kode PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1232,18 +1028,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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Hapus"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Abaika_n route yang diperoleh secara otomatis"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "G_unakan sambungan ini hanya untuk sumber daya pada jaringannya"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1251,9 +1070,8 @@ msgstr ""
 "Bila diaktifkan, sambungan ini tidak akan pernah bisa digunakan sebagai "
 "sambungan jaringan baku."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1261,15 +1079,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Buat…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1322,48 +1140,41 @@ msgid "Bonded _connections:"
 msgstr "_Sambungan bond:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "M_ode:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "_Sunting"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "_Hapus"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Sunting"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "_Frekuensi pemantauan:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "Nama _antarmuka:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "Pemantauan _Link:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "_Target ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1371,19 +1182,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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "T_undaan link menyala:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Tun_daan link mati:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Primer:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1391,12 +1202,30 @@ 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: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:"
+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
+msgid "bytes"
+msgstr "bita"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 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:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Prioritas:"
 
@@ -1408,44 +1237,89 @@ msgstr "Mode _hairpin:"
 msgid "Bridged _connections:"
 msgstr "Sambungan _bridge:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "Tundaan _forward:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "Waktu _hello:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Fungsika_n Jaringan"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Fungsikan _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "Usia _maks:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "Waktu penu_aan:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "otomatis"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "baku"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Alamat"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Alamat"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Sebarang perangkat"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Gagal memperbarui rahasia sambungan karena galat yang tak dikenal."
 
@@ -1544,77 +1418,77 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Kendali Alir Prioritas"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 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:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Prioritas:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Kelas Trafik:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Lebar Pita Ketat:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Lebar Pita Prioritas:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Lebar Pita Grup:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "ID Grup:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 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:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1623,24 +1497,24 @@ 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 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:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 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:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1653,7 +1527,7 @@ msgstr "_Layanan:"
 
 #: ../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:4
+#: ../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
@@ -1661,8 +1535,9 @@ msgid "Sho_w password"
 msgstr "Tampilkan _sandi"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1674,8 +1549,8 @@ msgstr "_Sandi:"
 #: ../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:138
-#: ../src/connection-editor/page-ip6.c:146
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Otomatis"
@@ -1730,18 +1605,18 @@ msgstr "Neg_osiasi sendiri"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "Alamat _MAC perangkat:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Layanan:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "Alamat MAC _klon:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1751,19 +1626,54 @@ msgstr ""
 "keras bagi perangkat jaringan bagi sambungan yang diaktifkan. Fitur ini "
 "dikenal sebagai klon atau spoof MAC. Contoh: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "bita"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Baku"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Abaikan"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Broadcast"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Sandi kunci _pribadi:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1802,8 +1712,8 @@ msgstr "Otomatis dengan pengaturan DNS manual"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:195
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Atur sendiri"
 
@@ -1814,8 +1724,8 @@ 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:215
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Berbagi dengan komputer lain"
 
@@ -1829,7 +1739,7 @@ msgstr "_Metode:"
 msgid "Addresses"
 msgstr "Alamat"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1839,8 +1749,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:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1848,25 +1758,25 @@ 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.h:13
 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/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:317
+#: ../src/connection-editor/page-ip6.c:306
 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:14
+#: ../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:308
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Server _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1874,11 +1784,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.h:17
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Memerlukan pengalamatan IPv_4 agar sambungan ini lengkap"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1886,13 +1796,13 @@ msgstr ""
 "Ketika menyambung ke jaringan yang mampu-IPv6, memungkinkan sambungan "
 "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:19
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Route…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Dimatikan"
 
@@ -1904,7 +1814,7 @@ msgstr "Difungsikan (lebih suka alamat publik)"
 msgid "Enabled (prefer temporary address)"
 msgstr "Difungsikan (lebih suka alamat sementara)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 "
@@ -1914,15 +1824,15 @@ 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:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "Ekstensi _privasi IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Memerlukan pengalamatan IPv_6 agar sambungan ini lengkap"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1931,71 +1841,38 @@ msgstr ""
 "komplit bila konfigurasi IPv6 gagal tetapi konfigurasi IPv4 sukses."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Sebarang"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Lebih suka 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Lebih suka 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Lebih suka 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Hanya pakai 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Dasar"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "No_mor:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Tingkat Lanjut"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "ID Jari_ngan:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Tipe:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Ganti..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "_Tampilkan sandi"
 
@@ -2061,32 +1938,55 @@ msgid "_Teamed connections:"
 msgstr "Koneksi _tim:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "I_mpor konfigurasi tim dari suatu berkas..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Impor konfigurasi tim dari suatu berkas..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "Antarmuka i_nduk:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Nama antar muka VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "Alamat MAC _klon:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "_Id VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Nama perangkat + nomor"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + nomor"
 
@@ -2103,94 +2003,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastruktur"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "_Daya transmisi:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Laju:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "K_anal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ban_d:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "M_ode:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Metoda Otentikasi yang Diijinkan"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2199,78 +2103,78 @@ msgstr ""
 "otentikasi. Bila sambungan gagal, cobalah mematikan dukungan untuk beberapa "
 "metoda."
 
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-ethernet.c:240
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-wifi.c:464 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/page-wimax.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:126
-#: ../src/connection-editor/page-dsl.c:135
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Tim"
 
-#: ../src/connection-editor/connection-helpers.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/connection-helpers.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:169
-#: ../src/connection-editor/connection-helpers.c:309
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Perangkat Keras"
 
-#: ../src/connection-editor/connection-helpers.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtual"
 
-#: ../src/connection-editor/connection-helpers.c:347
-#: ../src/connection-editor/connection-helpers.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Impor suatu konfigurasi VPN yang disimpan…"
 
-#: ../src/connection-editor/connection-helpers.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2278,58 +2182,79 @@ msgstr ""
 "Dialog penyunting sambungan tidak dapat diinisialisasi karena galat yang tak "
 "dikenal."
 
-#: ../src/connection-editor/connection-helpers.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Tak bisa membuat sambungan baru"
 
-#: ../src/connection-editor/connection-helpers.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Penghapusan sambungan gagal"
 
-#: ../src/connection-editor/connection-helpers.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Anda yakin ingin menghapus sambungan %s?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:920
+#: ../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
 msgid "Address"
 msgstr "Alamat"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Netmask"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:954
+#: ../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
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrik"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:937
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Awalan"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Menyunting %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Sunting sambungan tak bernama"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Nama sambungan:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Galat menginisialisasi penyunting"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Penambahan koneksi gagal"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2337,169 +2262,207 @@ msgstr ""
 "Penyunting sambungan tak dapat menemukan beberapa sumber daya yang "
 "diperlukan (berkas .ui tak ditemukan)."
 
-#: ../src/connection-editor/nm-connection-editor.c:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Simpan perubahan yang dibuat atas sambungan ini."
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Lalukan otentikasi untuk menyimpan sambungan ini bagi semua pengguna dari "
 "mesin ini."
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Tak bisa membuat sambungan"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Tak bisa menyunting sambungan"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Galat tak dikenal saat membuat dialog penyunting sambungan."
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Galat menginisialisasi penyunting"
 
-#: ../src/connection-editor/nm-connection-editor.c:898
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Penambahan koneksi gagal"
 
-#: ../src/connection-editor/nm-connection-editor.c:938
-msgid "Error saving connection"
-msgstr "Galat saat menyimpan sambungan"
-
-#: ../src/connection-editor/nm-connection-editor.c:939
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Properti '%s' / '%s' tak valid: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "_Nama sambungan:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Ekspor..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "tak pernah"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "kini"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d menit lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d jam lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d hari lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d bulan lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d tahun lalu"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nama"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Terakhir Dipakai"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Sunting sambungan terpilih"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Lakukan otentikasi untuk menyunting sambungan yang dipilih"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Hapus sambungan yang dipilih"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Lakukan otentikasi untuk menghapus sambungan yang dipilih"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Tak ada plugin VPN yang terpasang."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Tidak tahu bagaimana membuat sambungan '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Galat saat membuat sambungan"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Galat saat menyunting sambungan"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Tidak menemukan koneksi dengan UUID '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:119
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Keamanan 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:111
 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:135
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Gunakan keamanan 802.1_X untuk sambungan ini"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Tak dapat memuat antar muka pengguna DCB."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Koneksi Bond %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Jaringan Ethernet"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Jaringan Wi-Fi"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Tak bisa memuat antar muka pengguna bond."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Primer:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Koneksi Bond %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Tak bisa memuat antar muka pengguna bridge."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Koneksi bridge %d"
@@ -2507,58 +2470,74 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Port Bridge"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Tak bisa memuat antar muka pengguna bridge."
 
-#: ../src/connection-editor/page-dcb.c:605
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:607
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Tak dapat memuat antar muka pengguna DCB."
 
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Tak dapat memuat antar muka pengguna DSL."
 
-#: ../src/connection-editor/page-dsl.c:229
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Sambungan DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:79
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:94
-#: ../src/connection-editor/page-wimax.c:59
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "Opsi ini mengunci sambungan ini ke perangkat jaringan yang dinyatakan oleh "
 "alamat MAC yang dimasukkan disini. Contoh: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:242
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Tak bisa memuat antar muka pengguna ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:385
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "Alamat MAC _klon:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Baku"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2568,116 +2547,168 @@ msgstr ""
 "memilihnya menyebabkan penggunaan set zona baku dalam firewall. Hanya dapat "
 "dipakai bila firewalld aktif."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD tidak sedang jalan."
 
-#: ../src/connection-editor/page-general.c:324
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Tak bisa memuat antar muka pengguna Umum."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Tak bisa memuat antar muka pengguna InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Koneksi InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Otomatis (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Otomatis (VPN) hanya alamat"
 
-#: ../src/connection-editor/page-ip4.c:139
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Otomatis, hanya alamat"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:143
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Otomatis (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:142
-#: ../src/connection-editor/page-ip6.c:144
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Otomatis (PPPoE) hanya alamat"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Otomatis (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:145
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Otomatis (DHCP) hanya alamat"
 
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Hanya Link-Lokal"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:306
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Server _DNS tambahan:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:315
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Ranah p_encarian tambahan:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Menyunting rute IPv4 untuk %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Tatanan IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Tak bisa memuat antar muka pengguna IPv4."
 
-#: ../src/connection-editor/page-ip6.c:159
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Abaikan"
 
-#: ../src/connection-editor/page-ip6.c:183
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Otomatis, hanya DHCP"
 
-#: ../src/connection-editor/page-ip6.c:852
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Menyunting rute IPv6 untuk %s"
 
-#: ../src/connection-editor/page-ip6.c:1003
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Tatanan IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1005
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Tak bisa memuat antar muka pengguna IPv6."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Slave duplikat"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, 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:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2686,25 +2717,25 @@ msgstr ""
 "Slave '%s' dan '%s' berlaku bagi port virtual yang berbeda ('%s' dan '%s') "
 "dan perangkat fisik yang sama."
 
-#: ../src/connection-editor/page-master.c:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:351
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Tak bisa memuat antar muka pengguna data seluler."
 
-#: ../src/connection-editor/page-mobile.c:368
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Jenis sambungan data seluler tidak didukung."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:614
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Pilih Tipe Operator Data Seluler"
 
-#: ../src/connection-editor/page-mobile.c:641
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2712,85 +2743,85 @@ msgstr ""
 "Pilih teknologi yang digunakan oleh operator seluler Anda. Bila Anda tak "
 "yakin, tanyakan ke operator Anda."
 
-#: ../src/connection-editor/page-mobile.c:646
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:653
+#: ../src/connection-editor/page-mobile.c:568
 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:663 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:666 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:135
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:142
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "tak ada"
 
-#: ../src/connection-editor/page-ppp.c:202
+#: ../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:285
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Pengaturan PPP"
 
-#: ../src/connection-editor/page-ppp.c:287
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Tak bisa memuat antar muka pengguna PPP."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Pilih berkas untuk diimpor"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Galat: berkas tak memuat konfigurasi JSON yang valid"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Tak dapat memuat antar muka pengguna tim."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Koneksi tim %d"
@@ -2798,47 +2829,56 @@ 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:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Port Tim"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (via \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Tak ada sambungan jaringan"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Tak bisa memuat antar muka pengguna VLAN."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Sambungan VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Tak bisa memuat antar muka pengguna VPN."
 
-#: ../src/connection-editor/page-vpn.c:128
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Tak bisa menemukan layanan plugin VPN bagi '%s'."
 
-#: ../src/connection-editor/page-vpn.c:215
-#: ../src/connection-editor/page-vpn.c:312
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Sambungan VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:241
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2848,11 +2888,11 @@ msgstr ""
 "\n"
 "Galat: tak ada tipe layanan VPN."
 
-#: ../src/connection-editor/page-vpn.c:266
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Pilih Jenis Sambungan VPN"
 
-#: ../src/connection-editor/page-vpn.c:267
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2862,7 +2902,7 @@ msgstr ""
 "sambungan VPN yang ingin Anda buat tidak muncul pada daftar, mungkin Anda "
 "belum memasang plugin VPN yang tepat."
 
-#: ../src/connection-editor/page-wifi.c:84
+#: ../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"
@@ -2870,72 +2910,92 @@ msgstr ""
 "Opsi ini mengunci sambungan 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:200
+#: ../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)\""
+msgstr ""
+"Opsi ini mengunci sambungan ini ke perangkat jaringan yang dinyatakan oleh "
+"alamat MAC yang dimasukkan disini. Contoh: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:466
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Tak bisa memuat antar muka pengguna Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:637
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Sebarang perangkat"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Koneksi Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:295
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:305
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:331
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "WEP Dinamik (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:345
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:359
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:400
+#: ../src/connection-editor/page-wifi-security.c:413
 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:411
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Kemananan Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:413
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Tak bisa memuat antar muka pengguna keamanan Wi-Fi."
 
-#: ../src/connection-editor/page-wimax.c:126
-msgid "Could not load WiMAX user interface."
-msgstr "Tak bisa memuat antar muka pengguna WiMAX."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:222
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Koneksi WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Tak dapat mengimpor sambungan VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2948,27 +3008,32 @@ msgstr ""
 "\n"
 "Galat: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Galat tak dikenal"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Berkas bernama \"%s\" sudah ada."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Timpa"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 "Apakah Anda ingin menggantikan %s dengan sambungan VPN yang sedang Anda "
 "simpan?"
 
-#: ../src/connection-editor/vpn-helpers.c:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Tidak dapat mengekspor sambungan VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2979,11 +3044,11 @@ msgstr ""
 "\n"
 "Galat: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Ekspor sambungan VPN..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -2991,100 +3056,11 @@ msgstr ""
 "Aplet NetworkManager tidak dapat menemukan beberapa sumberdaya yang "
 "diperlukan (berkas .ui tidak ditemukan)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Konfigurasi Bluetooth tak mungkin (gagal menyambung ke D-Bus: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Konfigurasi Bluetooth tak mungkin (kesalahan saat mencari NetworkManager: "
-"(%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Gunakan telepon seluler Anda sebagai perangkat jaringan (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Akses Internet menggunakan telepon seluler Anda (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Galat: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Gagal membuat koneksi DUN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "Telepon Anda kini siap dipakai!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Wisaya telepon seluler dibatalkan"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Tipe perangkat telepon tak dikenal (bukan GSM atau CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "tipe modem tak dikenal."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "gagal menyambung ke telepon."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "galat saat mengambil koneksi bus"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "tak terduga terputus dari telepon."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "kehabisan waktu mendeteksi rincian telepon."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "Mendeteksi konfigurasi telepon..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Adaptor Bluetooth bawaan mesti diaktifkan sebelum menata suatu koneksi Dial-"
-"Up-Networking."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Gagal membuat koneksi PAN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "Jaringan %s"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "B_uka kunci"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Otomatis membuka kunci perangkat ini"
 
@@ -3092,31 +3068,36 @@ msgstr "Otomatis membuka kunci perangkat ini"
 msgid "Connection Information"
 msgstr "Informasi Sambungan"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Sambungan Jaringan Aktif"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 data seluler Anda ditata dengan tatanan berikut:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Perangkat Anda:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Operator Anda:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Jenis Langganan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3130,23 +3111,28 @@ msgstr ""
 "data seluler Anda, pilih \"Sambungan Jaringan\" dari menu Sistem >> "
 "Preferensi."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Konfirmasikan Tatanan Data Seluler"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Tak terdaftar"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "Pilih jeni_s langganan Anda:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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) yang dipilih:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3159,67 +3145,83 @@ msgstr ""
 "Bila Anda tak yakin tentang tipe langganan Anda silahkan tanya ke operator "
 "tentang APN Anda."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Pilih Jenis Langganan Anda"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Tipe langgananku tak terdaftar..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Pi_lih operator Anda dari daftar:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Operator"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Tak menemukan operatorku dan ingin memasukkannya secara _manual:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Operator:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 "Operator saya memakai teknologi GSM (GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Pilih Operator Anda"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../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:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Negara atau wilayah"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Negaraku tak terdaftar"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Pilih Negara atau Wilayah Operator Anda"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Perangkat GSM terpasang"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Perangkat CDMA terpasang"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3227,125 +3229,144 @@ msgstr ""
 "Asisten ini membantu Anda menyiapkan dengan mudah sambungan data seluler ke "
 "jaringan 3G."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../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 informasi berikut:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Nama operator seluler Anda"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Nama tipe langganan seluler Anda"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(dalam beberapa kasus) APN (Access Point Name) tipe langganan data seluler "
 "Anda"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Buat sambungan bagi perangka_t data seluler ini:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Sebarang perangkat"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Siapkan Sambungan Data Seluler"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Sambungan Data Seluler Baru"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Kabel"
+#: ../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 "Simpan sandi hanya bagi pengg_una ini"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Simpan sandi bagi semu_a pengguna"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "Mesh OLPC"
+#: ../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_kan sandi ini setiap saat"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#, fuzzy
+msgid "The password is not required"
+msgstr "Diperlukan sandi untuk tersambung pada '%s'."
 
-#: ../src/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "Sandi _Sekunder:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "Sandi _Sekunder:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%2$s %1$s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+msgid "Sh_ow passwords"
+msgstr "_Tampilkan sandi"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Putuskan"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Baru..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Tak ada"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Buat"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, 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/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Otentikasi Jaringan Wi-Fi Diperlukan"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Otentikasi dibutuhkan oleh jaringan Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Buat Jaringan Wi-Fi Baru"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Jaringan Wi-Fi baru"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Sambungkan ke Jaringan Wi-Fi Tersembunyi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Jaringan Wi-Fi tersembunyi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3353,31 +3374,55 @@ msgstr ""
 "Masukkan nama dan rincian keamanan dari jaringan Wi-Fi tersembunyi yang "
 "ingin Anda sambungkan."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "Sandi _Sekunder:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "_Tampilkan sandi"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Kemananan _Wi-Fi:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Sambunga_n:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptor Wi-Fi:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "Mesh OLPC"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%2$s %1$s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Penggunaan:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3385,7 +3430,7 @@ msgstr ""
 "Program ini adalah komponen dari NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3393,138 +3438,151 @@ msgstr ""
 "Ini tidak ditujukan bagi interaksi baris perintah, sebagai gantinya, "
 "jalankan ini di lingkungan desktop GNOME."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "tak diaktifkan"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "tak terdaftar"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Jaringan rumah (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Jaringan rumah"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "sedang mencari"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrasi ditolak"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Jaringan roaming (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Jaringan roaming"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "Kode PIN bagi kartu SIM '%s' pada '%s'"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Perlu kode PIN"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Kode PIN dibutuhkan untuk perangkat data seluler"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Sambungan data seluler '%s' aktif: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "roaming"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Koneksi %s"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Simpan sandi hanya bagi pengg_una ini"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "Simpan sandi bagi semu_a pengguna"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Sertifikat DER atau PEM  (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Pilih suatu berkas PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Berkas PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Semua berkas"
 
@@ -3560,15 +3618,32 @@ msgstr "Otent_ikasi dalam:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Otomatis ijinkan pro_visi PAC"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Pilih sebuah sertifikat Certificate Authority..."
 
@@ -3596,15 +3671,46 @@ msgstr "Tak pe_rlu ada sertifikat CA"
 msgid "PEAP _version:"
 msgstr "Versi _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Tanya_kan sandi ini setiap saat"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Sertifikat C_A:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Kunci privat tak tersandi tidak aman"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3618,11 +3724,11 @@ msgstr ""
 "\n"
 "(Anda dapat melindungi kunci pribadi Anda dengan openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Pilih sertifikat pribadi Anda..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Pilih kunci privat Anda..."
 
@@ -3642,23 +3748,36 @@ msgstr "_Kunci privat:"
 msgid "_Private key password:"
 msgstr "Sandi kunci _pribadi:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
@@ -3668,6 +3787,44 @@ msgstr "Protected EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "O_tentikasi:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (Bawaan)"
@@ -3691,3 +3848,283 @@ msgstr "Tampilkan _kunci"
 #: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "Inde_ks WEP:"
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Tipe:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Fungsikan Data Seluler WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "Ba_ntuan"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Anda sekarang tersambung ke jaringan bond."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Menyiapkan sambungan bond '%s'..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Mengatur sambungan bond '%s'..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Otentikasi pengguna diperlukan untuk sambungan bond '%s'..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Meminta alamat untuk '%s'..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Sambungan bond '%s' aktif"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Anda sekarang tersambung ke jaringan bridge."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Menyiapkan sambungan bridge '%s'..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Mengatur sambungan bridge '%s'…"
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Otentikasi pengguna diperlukan untuk sambungan bridge '%s'..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Sambungan bridge '%s' aktif"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Sambungan Data Seluler (CDMA) baru ..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Anda sekarang tersambung ke jaringan CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "Jaringan CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Sambungan Data Seluler (GSM) baru..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Anda sekarang tersambung ke jaringan GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "Jaringan GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "InfiniBand Otomatis"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Jaringan InfiniBand (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Jaringan InfiniBand (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Jaringan InfiniBand"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "Jaringan InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Anda sekarang tersambung ke jaringan InfiniBand."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Menyiapkan sambungan InfiniBand '%s'..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Mengatur sambungan InfiniBand '%s'…"
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "Otentikasi pengguna diperlukan untuk sambungan InfiniBand '%s'..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "Koneksi InfiniBand '%s' aktif"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Anda sekarang tersambung ke jaringan tim."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Menyiapkan koneksi tim '%s'..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Mengatur koneksi tim '%s'..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Otentikasi pengguna diperlukan untuk sambungan tim '%s'..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Koneksi tim '%s' aktif"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Anda sekarang tersambung ke VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Menyiapkan sambungan VLAN '%s'..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Mengatur sambungan VLAN '%s'..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Otentikasi pengguna diperlukan untuk sambungan VLAN '%s'..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "Sambungan VLAN '%s' aktif"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Data Seluler WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Data Seluler WiMAX"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX dinonaktifkan"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX dinonaktifkan oleh saklar perangkat keras"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Anda sekarang tersambung ke jaringan WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "tak dikenal"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "tak dikenal"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Mode:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Alamat _MAC perangkat:"
+
+#~ msgid "Any"
+#~ msgstr "Sebarang"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Lebih suka 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Lebih suka 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Lebih suka 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Hanya pakai 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "I_mpor konfigurasi tim dari suatu berkas..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastruktur"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Galat saat menyimpan sambungan"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Properti '%s' / '%s' tak valid: %d"
+
+#~ msgid "Could not load WiMAX user interface."
+#~ msgstr "Tak bisa memuat antar muka pengguna WiMAX."
+
+#~ msgid "WiMAX connection %d"
+#~ msgstr "Koneksi WiMAX %d"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Konfigurasi Bluetooth tak mungkin (gagal menyambung ke D-Bus: (%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Konfigurasi Bluetooth tak mungkin (kesalahan saat mencari NetworkManager: "
+#~ "(%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Gunakan telepon seluler Anda sebagai perangkat jaringan (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Akses Internet menggunakan telepon seluler Anda (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Galat: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Gagal membuat koneksi DUN: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Telepon Anda kini siap dipakai!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Wisaya telepon seluler dibatalkan"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Tipe perangkat telepon tak dikenal (bukan GSM atau CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "tipe modem tak dikenal."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "gagal menyambung ke telepon."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "galat saat mengambil koneksi bus"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "tak terduga terputus dari telepon."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "kehabisan waktu mendeteksi rincian telepon."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Mendeteksi konfigurasi telepon..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Adaptor Bluetooth bawaan mesti diaktifkan sebelum menata suatu koneksi "
+#~ "Dial-Up-Networking."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Gagal membuat koneksi PAN: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Jaringan %s"
diff --git a/po/is.po b/po/is.po
index a6c9b61b..f4259e04 100644
--- a/po/is.po
+++ b/po/is.po
@@ -5,9 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2015-12-07 01:49+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2016-01-08 18:03+0000\n"
 "Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
 "Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
@@ -18,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3256
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Netkerfi"
 
@@ -151,7 +150,7 @@ msgstr ""
 "Forritið nm-connection-editor virkar með NetworkManager við að búa til ný "
 "tengisnið og breyta þeim sem þegar eru fyrir hendi í NetworkManager."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X auðkenning"
 
@@ -166,7 +165,6 @@ msgid "_Cancel"
 msgstr "_Hætta við"
 
 #: ../src/8021x.ui.h:3
-#| msgid "Connected"
 msgid "C_onnect"
 msgstr "_Tengjast"
 
@@ -174,46 +172,45 @@ msgstr "_Tengjast"
 msgid "_Network name:"
 msgstr "Heiti _netkerfis:"
 
-#: ../src/ap-menu-item.c:87
-#| msgid "Ad-hoc"
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "beintengt (ad-hoc)"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "öruggt."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Mistókst að bæta við/virkja tengingu"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Óþekkt villa"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Tenging brást"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Tókst ekki að tengjast við tæki"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Aftenging  mistókst"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Virkjun tengingar mistókst"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Ekki sýna þessi skilaboð aftur"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -223,7 +220,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem nettengingin var trufluð."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -232,7 +229,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem VPN þjónustan stöðvaði óvænt."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -242,7 +239,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem VPN-þjónustan skilaði röngum stillingum."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -251,7 +248,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem tilraun til tengingar rann út á tíma."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -260,7 +257,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem VPN-þjónustan fór ekki í gang á réttum tíma."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -269,7 +266,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást þar sem VPN-þjónustan fór ekki í gang."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -279,7 +276,7 @@ msgstr ""
 "VPN-tengingin '%s' brást þar sem ekki fengust nein gild VPN-leyndarauðkenni "
 "(secrets)."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -289,7 +286,7 @@ msgstr ""
 "VPN-tengingin '%s' brást þar sem VPN-leyndarauðkenni (secrets) reyndust "
 "ógild."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -298,7 +295,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' brást."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -308,7 +305,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' aftengdist þar sem nettengingin var trufluð."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -317,7 +314,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' aftengdist þar sem VPN þjónustan stöðvaði."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -326,7 +323,7 @@ msgstr ""
 "\n"
 "VPN-tengingin '%s' er aftengd."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -337,19 +334,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-tengingu hefur verið komið á.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Innskráningarskilaboð VPN-nets"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN-nettenging brást"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -362,7 +359,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -375,553 +372,542 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "tæki ekki tilbúið (grunnhugbúnað/firmware vantar)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "tæki ekki tilbúið"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "aftengdist"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Aftengja"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "tæki er í ekki stýringu (managed)"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Engin net tiltæk"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN-nettengingar"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Breyta VPN-netinu..."
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Aftengjast VPN-netinu"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager er ekki í gangi..."
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Netvinnsla óvirk"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Leyfa _nettengingu"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Virkja _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Virkja ferða_breiðband"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Virkja tilk_ynningar"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Upplýsingar um tengingu"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Breyta tengingum..."
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "_Hjálp"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Um hugbúnaðinn"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Þú ert núna tengdur við ‚%s‘."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Ótengt"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Nettengingin hefur verið aftengd."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Undirbý að tengjast ‚%s‘..."
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Notandinn þarf að samþykja tengingu við ‚%s‘..."
 
-#: ../src/applet.c:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Sæki um netkerfisvistfang fyrir '%s'..."
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Nettengingin ‚%s‘ er virk"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Byrja VPN-nettenginguna ‚%s‘..."
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Notandinn þarf að samþykja VPN-nettenginguna ‚%s‘..."
 
-#: ../src/applet.c:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Bið um VPN-netvistfang fyrir ‚%s‘..."
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-nettengingingin ‚%s‘ er virk"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Engin nettenging"
 
-#: ../src/applet.c:3382
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager forrit"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 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:206
+#: ../src/applet-device-broadband.c:201
 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:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Sendi aflæsikóða..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Ferðabreiðband (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Ferðabreiðband"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Tiltækt"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Ný ferðabreiðbandstenging..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Tengingu hefur verið komið á"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Þú hefur tengst við ferðabreiðbandsnet."
 
-#: ../src/applet-device-broadband.c:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Ferðabreiðbandsnet."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Þú ert núna tengdur við heimanetið."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Þú ert núna tengdur við reikinet."
 
-#: ../src/applet-device-bt.c:93
+#: ../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:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Undirbý ferðabreiðbandstenginguna '%s'..."
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Stilli ferðabreiðbandstenginguna '%s'..."
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Ferðabreiðbandstenging '%s' virk"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Sjálfvirkt Ethernet"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet netkerfi (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet netkerfi (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet netkerfi"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet netkerfi"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../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:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Undirbý ethernet nettenginu '%s'..."
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Stilli ethernet ethernet nettengingu '%s'..."
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Notanda auðkenning er krafist fyrir ethernet nettenginguna '%s'..."
 
-#: ../src/applet-device-ethernet.c:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Sæki um ethernet netvistfang fyrir '%s'..."
 
-#: ../src/applet-device-ethernet.c:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Ethernet nettenginging '%s' er virk"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL auðkenning"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Tengjast við falið Wi-Fi netkerfi..."
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Búa til _nýtt Wi-Fi netkerfi..."
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ekkert)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi netkerfi (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi netkerfi (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi netkerfi"
 msgstr[1] "Wi-Fi Netkerfi"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi er óvirkt"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi er gert óvirkt með vélbúnaðarrofa"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Fleiri net"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi netkerfi tiltæk"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 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:1237
+#: ../src/applet-device-wifi.c:1364
 #, 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:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Undirbý Wi-Fi nettenginguna '%s'"
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Stilli Wi-Fi nettenginguna '%s'..."
 
-#: ../src/applet-device-wifi.c:1275
+#: ../src/applet-device-wifi.c:1405
 #, 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:1278
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Sæki um Wi-Fi net vistfang fyrir '%s'..."
 
-#: ../src/applet-device-wifi.c:1289
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wi-Fi nettengingin '%s' virk: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi nettengingin '%s' virk"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Mistókst að virkja tengingu"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Mistókst að bæta við tengingu"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Villa kom upp við að birta upplýsingar um tenginguna:"
 
-#: ../src/applet-dialogs.c:75 ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Breytilegt (dynamic) WEP"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
-#| msgid "MAC address"
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Fleiri vistföng"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ekkert"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (sjálfgefið)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/sek"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Óþekkt"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Óþekkt"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "IP vistfang:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Útvörpunarvistfang:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Óþekkt"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Undirnetssía:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Almennt"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Tengi:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Vistfang vélbúnaðar:"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Drif:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Hraði:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Öryggi:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Sjálfgefin tengileið (route):"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Hunsað"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Tegund VPN:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN-netgátt (gateway):"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN-notandanafn:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN tilkynningaborði (banner):"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Grunntenging:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Óþekkt"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Fann engar virkar tengingar!"
 
-#: ../src/applet-dialogs.c:977
-#| msgid ""
-#| "Copyright © 2004-2011 Red Hat, Inc.\n"
-#| "Copyright © 2005-2008 Novell, Inc.\n"
-#| "and many other community contributors and translators"
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -931,42 +917,42 @@ msgstr ""
 "Höfundarréttur © 2005-2008 Novell, Inc.\n"
 "og margir aðrir í frjálsa hugbúnaðarsamfélaginu"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 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:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Heimasíða NetworkManager"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Vantar tilföng"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Lykilorð fyrir þráðlaust breiðbandsnet"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, 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:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Krafist er PIN-númers til að aflæsa SIM-korti"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 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:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -976,25 +962,25 @@ msgstr ""
 "verður að nota það."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN-númer:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Sýna PIN-númer"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Krafist er PUK-kóða til að aflæsa SIM-korti"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 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:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1004,22 +990,22 @@ msgstr ""
 "að nota það."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK-kóði:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Nýtt PIN-númer:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 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:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Sýna PIN/PUK-númer"
 
@@ -1060,7 +1046,7 @@ msgstr "_Bæta við"
 #: ../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:697
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Eyða"
 
@@ -1157,7 +1143,7 @@ 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:5
-#: ../src/connection-editor/nm-connection-list.c:681
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Breyta"
 
@@ -1257,7 +1243,6 @@ msgid "s"
 msgstr "sek"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:10
-#| msgid "Enable _Networking"
 msgid "Enable I_GMP snooping"
 msgstr "Virkja I_GMP hlustun"
 
@@ -1273,57 +1258,57 @@ msgstr "Há_marksaldur:"
 msgid "_Aging time:"
 msgstr "Öldrun_artími:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "sjálfvirkt"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "sjálfgefið"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "óskilgreind villa"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "MAC vistfang"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "HW vistfang"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "ógilt %s fyrir %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:482
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "ógilt %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "ógilt viðmóts-nafn fyrir %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "ógilt viðmóts-nafn (%s)"
 
-#: ../src/connection-editor/ce-page.c:483
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "tæki"
 
-#: ../src/connection-editor/ce-page.c:589
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Mistókst að uppfæra leyndarauðkenni tengingar vegna óþekktrar villu."
 
@@ -1533,8 +1518,8 @@ msgstr "_Sýna lykilorð"
 
 #: ../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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1546,8 +1531,8 @@ msgstr "_Lykilorð:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Sjálfvirkt"
@@ -1624,41 +1609,43 @@ msgid "Wake on LAN:"
 msgstr "Vakning af staðarneti (Wake on LAN):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:20
-#| msgid "Default"
 msgid "De_fault"
 msgstr "Sjál_fgefið"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Hunsa"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
-#| msgid "Broadcast"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "Útvör_pun"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
-#| msgid "_Private key password:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "_Lykilorð fyrir vakningu af staðarneti:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1702,8 +1689,8 @@ msgstr "Sjálfkrafa með handvirkum DNS stillingum"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Handvirkt"
 
@@ -1714,8 +1701,8 @@ 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:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Samnýtt með öðrum tölvum"
 
@@ -1749,15 +1736,15 @@ msgstr "Auðkenni _DHCP biðlara:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "L_eitarlén:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "DNS nafna_miðlarar:"
 
@@ -1783,7 +1770,7 @@ msgid "_Routes…"
 msgstr "_Beiningar…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Óvirkt"
 
@@ -1922,11 +1909,13 @@ msgid "_Parent interface:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "Heiti VLA_N viðmóts:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Klónað MAC vistfang:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
@@ -1949,13 +1938,17 @@ msgstr "_GVRP"
 msgid "_Loose binding"
 msgstr "_Lausleg binding"
 
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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:12
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
 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:14
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + tala"
 
@@ -2015,7 +2008,7 @@ msgstr "Tíðn_isvið:"
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../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ð"
 
@@ -2069,153 +2062,153 @@ msgid ""
 "methods.  If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:110
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Bundið (bond)"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Hópað (team)"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Brúun (bridge)"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:591 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN-net"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Vélbúnaður"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Sýndar"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Flytja inn vistaða VPN uppsetningu..."
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Gat ekki búið til nýja tengingu"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Það tókst ekki að eyða tengingunni"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Vistfang"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Nethula (mask)"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Gátt"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Leiðargæði (metric)"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Forskeyti"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Breyti %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Breyti nafnlausri tengingu"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Heiti tengingar vantar"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Frumstilling ritils..."
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "Ekki er hægt að breyta tengingu"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Ógild stilling %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2223,36 +2216,36 @@ msgstr ""
 "Tengingaritillinn gat ekki fundið nauðsynleg tilföng (.ui-skráin fannst "
 "ekki)."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "Vi_sta"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Vista allar breytingar á þessari tengingu."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Gat ekki búið til tengingu"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Gat ekki breytt tengingunni"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Villa við að búa til glugga tengingaritils."
 
-#: ../src/connection-editor/nm-connection-editor.c:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Villa í frumstillingu ritils"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Það tókst ekki að bæta við"
 
@@ -2268,156 +2261,161 @@ msgstr "Heiti _tengingar:"
 msgid "_Export..."
 msgstr "_Flytja út..."
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "aldrei"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "núna"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nafn"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Síðast notað"
 
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Breyta valinni tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Auðkenndu þig til að breyta valinni tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Eyða valdri tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Auðkenndu þig til að eyða valinni tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:924
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Engar VPN-viðbætur eru uppsettar."
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:928
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Villa við að búa til tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Villa við að breyta tengingu"
 
-#: ../src/connection-editor/nm-connection-list.c:951
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Finn ekki tengingu með UUID '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Öruggt 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 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:128
+#: ../src/connection-editor/page-8021x-security.c:125
 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:112
+#: ../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
 msgid "Could not load Bluetooth user interface."
 msgstr "Gat ekki hlaðið inn Bluetooth notandaviðmóti."
 
-#: ../src/connection-editor/page-bluetooth.c:150
-msgid "bdaddr"
-msgstr "bdaddr"
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "ógilt viðmóts-nafn (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:228
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth-tenging %d"
 
-#: ../src/connection-editor/page-bluetooth.c:272
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Gerð af Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:290
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Vinsamlegast veldu gerð Bluetooth tengisniðs."
 
-#: ../src/connection-editor/page-bluetooth.c:295
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "Einkanet (_Personal Area Network)"
 
-#: ../src/connection-editor/page-bluetooth.c:300
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "Innhringinet (_Dial-Up)"
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 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:566
 msgid "primary"
 msgstr "aðal"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Binda tenginguna %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Gat ekki hlaðið inn notandaviðmóti brúunar."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Brúa tenginguna %d"
@@ -2425,32 +2423,32 @@ 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:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Gátt brúunar"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 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:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Gat ekki hlaðið inn DBC notandaviðmóti."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Gat ekki hlaðið inn DSL notandaviðmóti."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL tenging %d"
 
-#: ../src/connection-editor/page-ethernet.c:77
+#: ../src/connection-editor/page-ethernet.c:74
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"em1\", "
@@ -2460,52 +2458,52 @@ 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:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Get ekki glaðið upp ethernet notanda viðmóti."
 
-#: ../src/connection-editor/page-ethernet.c:447
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Ethernet nettæki"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:736
-#: ../src/connection-editor/page-wifi.c:583
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "klónað MAC"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Lykilorð fyrir vakningu af staðarneti"
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:55
-#: ../src/libnma/nma-mobile-providers.c:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Sjálfgefið"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD er ekki keyrandi."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Gat ekki hlaðið inn almennu notandaviðmóti."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2517,152 +2515,152 @@ 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:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Gat ekki hlaðið inn InfiniBand notandaviðmóti."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 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-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Sjálfvirkt (VPN-net)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Aðeins sjálfvirk (VPN) vistföng"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Sjálfvirkt, aðeins vistföng"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Sjálfvirkt (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Aðeins sjálfvirk (PPPoE) vistföng"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Sjálfvirkt (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Aðeins sjálfvirk (DHCP) vistföng"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Einungis staðvær tengi (link-local)"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Auka DNS nafna_miðlarar:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Aukal_eg leitarlén:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Breyti IPv4 beiningum fyrir %s"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 stillingar"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Gat ekki hlaðið inn IPv4 notandaviðmóti."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "IPv4 vistfangið \"%s\" er ógilt"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "Netmaski \"%s\" IPv4 vistfangs er ógildur"
 
-#: ../src/connection-editor/page-ip4.c:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "IPv4 netgátt  \"%s\" er ógild"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "IPv4 DNS nafnaþjónn \"%s\" er ógildur"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Hunsa"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Sjálfvirkt, aðeins DHCP"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Breyti IPv6 beiningum fyrir %s"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 stillingar"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Gat ekki hlaðið inn IPv6 notandaviðmóti."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "IPv6 vistfangið \"%s\" er ógilt"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "IPv6 forskeytið \"%s\" er ógilt"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "IPv6 netgátt  \"%s\" er ógild"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "IPv6 DNS nafnaþjónn \"%s\" er ógildur"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Afrita þræla"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, 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:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2671,25 +2669,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:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s þræll %d"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 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:330
+#: ../src/connection-editor/page-mobile.c:327
 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:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Veldu gerð þjónustuveitu ferðabreiðbands"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2697,84 +2695,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:564
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 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:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ekkert"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../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:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP stillingar"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Gat ekki hlaðið inn PPP notandaviðmóti."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Veldu skrá til að flytja inn"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Villa: skrá inniheldur ekki gilda JSON uppsetningu"
 
-#: ../src/connection-editor/page-team.c:272
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Gat ekki hlaðið inn notandaviðmóti hópunar."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Hópa tenginguna %d"
@@ -2782,75 +2780,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:154
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Gátt hópunar"
 
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:153
 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:416
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (um \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:428
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
-#| msgid "No network connection"
 msgid "New connection..."
 msgstr "Ný tenging..."
 
-#: ../src/connection-editor/page-vlan.c:593
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Gat ekki hlaðið inn vlan notandaviðmóti."
 
-#: ../src/connection-editor/page-vlan.c:729
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:792
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN nettenging %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Gat ekki hlaðið inn VPN notandaviðmóti."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Fann ekki þjónustu fyrir VPN-viðbætur fyrir '%s'."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-nettenging %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
 "Error: no VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Veldu tegund VPN-tengingar"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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:80
+#: ../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"
@@ -2858,7 +2855,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:91
+#: ../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\", "
@@ -2868,82 +2865,82 @@ 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:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 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:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:579
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Wi-Fi tæki"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi tenging %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "Breytilegt (dynamic) WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA og WPA2 einka"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../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:416
+#: ../src/connection-editor/page-wifi-security.c:413
 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:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Öruggt Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 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:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "vantar SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 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:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Get ekki tekið á móti VPN-nettengingu"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2956,30 +2953,29 @@ msgstr ""
 "\n"
 "Villa: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
-#| msgid "Unknown error"
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "óþekkt villa"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Skrá með nafni „%s“ er þegar til."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Skipta út"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Get ekki flutt út VPN-nettengingu"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2990,11 +2986,11 @@ msgstr ""
 "\n"
 "Villa: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Flytja út VPN-nettengingu..."
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3018,32 +3014,32 @@ msgstr "Upplýsingar um tengingu"
 msgid "Active Network Connections"
 msgstr "Virkar nettengingar"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 "Ferðabreiðbandstengingin þín er stillt með eftirfarandi breytum:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.c:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Tækið þitt:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.c:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Þjónustuveitan þín:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Áskriftin þín:"
 
-#: ../src/libnma/nma-mobile-wizard.c:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3057,28 +3053,28 @@ msgstr ""
 "breyta stillingum ferðabreiðbandsins, veldu \"Nettengingar\" úr valmyndinni "
 "Kerfi >> Kjörstillingar."
 
-#: ../src/libnma/nma-mobile-wizard.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Staðfestu stillingar ferðabreiðbands"
 
-#: ../src/libnma/nma-mobile-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Óskráð"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Veldu áskriftina þína:"
 
-#: ../src/libnma/nma-mobile-wizard.c:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../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.c:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3092,85 +3088,85 @@ 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.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Veldu áskriftina þína"
 
-#: ../src/libnma/nma-mobile-wizard.c:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../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:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../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.c:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Þjónustuveita"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 ""
 "Ég finn ekki þjónustuaðilann _minn og vil því slá inn upplýsingar um hann "
 "handvirkt:"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Þjónustuveita:"
 
-#: ../src/libnma/nma-mobile-wizard.c:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 "Þjónustuveitan mín notar GSM-tækni (GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../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.c:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Veldu þjónustuveituna"
 
-#: ../src/libnma/nma-mobile-wizard.c:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../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.c:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Land eða svæði"
 
-#: ../src/libnma/nma-mobile-wizard.c:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../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:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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.c:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Uppsett GSM tæki"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Uppsett CDMA tæki"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3178,84 +3174,84 @@ msgstr ""
 "Þessi leiðarvísir hjálpar þér að setja upp ferðabreiðbandstengingu fyrir "
 "farsímakerfi (3G)."
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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.c:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../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.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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.c:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(í sumum tilfellum) APN aðgangspunktur áskriftarinnar þinnar (Access Point "
 "Name)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Búa til _tengingu fyrir þetta ferðabreiðbandstæki:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Eitthvað tæki"
 
-#: ../src/libnma/nma-mobile-wizard.c:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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.c:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Ný ferðabreiðbandstenging"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../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:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../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:55 ../src/libnm-gtk/nm-ui-utils.c:620
+#: ../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:56 ../src/libnm-gtk/nm-ui-utils.c:621
+#: ../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.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Auka-lykilorð"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "Þriðja _lykilorð:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
 msgid "Sh_ow passwords"
 msgstr "Sýna lykil_orð"
 
-#: ../src/libnma/nma-wifi-dialog.c:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Smelltu til að tengjast"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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"
@@ -3263,20 +3259,20 @@ 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:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nýtt..."
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ekkert"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Búa til"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3284,35 +3280,35 @@ msgstr ""
 "Lykilorða eða dulritunarlykla er krafist til að tengjast Wi-Fi netkerfinu "
 "'%s'."
 
-#: ../src/libnma/nma-wifi-dialog.c:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi netkerfisauðkenningar krafist"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Auðkenningar er krafist af Wi-Fi netkerfi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Búa til nýtt Wi-Fi netkerfi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nýtt Wi-Fi netkerfi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Tengjast við falið Wi-Fi netkerfi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Falið Wi-Fi netkerfi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3332,23 +3328,23 @@ msgstr "Ten_ging:"
 msgid "Wi-Fi _adapter:"
 msgstr "W_i-Fi_netkort:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../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:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3358,17 +3354,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3376,7 +3372,7 @@ msgstr ""
 "Þetta forrit er hluti af NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3384,153 +3380,153 @@ msgstr ""
 "Það er ekki hannað til notkunar á skipanalínu heldur keyrir samtvinnað í "
 "GNOME skjáborðsumhverfinu."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "óvirkt"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "óskráð"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Heimanet (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Heimanet"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "leita"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "skráningu hafnað"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Reikinet (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Reikinet"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN-númer fyrir SIM-kortið '%s' á '%s'"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Krafist er PIN-númers"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 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:610
+#: ../src/mobile-helpers.c:619
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Ferðabreiðbandstenging '%s' virk: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "reiki"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s tenging"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr "óskilgreind villa í öruggu 802.1x (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "óskilgreind villa við sannvottun á eap-method skrá"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:452
 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:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER eða PEM skilríki (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "vantar EAP-FAST PAC skrá"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Veldu PAC-skrá..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC skrár (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Allar skrár"
 
@@ -3566,32 +3562,32 @@ msgstr "_Innra auðkenni:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Leyfa sjálfvirka PAC _veitingu (provisioning)"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr "vantar EAP-LEAP notandanafn"
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "vantar EAP-LEAP lykilorð"
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "ógilt EAP-PEAP CA skilríki: %s"
 
-#: ../src/wireless-security/eap-method-peap.c:69
+#: ../src/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "ógilt EAP-PEAP CA skilríki: ekkert skilríki tiltekið"
 
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Veldu skilríki frá vottunarstöð (CA)..."
 
@@ -3619,46 +3615,46 @@ msgstr "CA skilríkis e_r ekki krafist"
 msgid "PEAP _version:"
 msgstr "PEAP út_gáfa:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "vantar EAP notandanafn"
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "vantar EAP lykilorð"
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "vantar EAP-TLS auðkenni"
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "ógilt EAP-TLS CA skilríki: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "ógilt EAP-TLS CA skilríki: ekkert skilríki tiltekið"
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "ógilt EAP-TLS lykilorð: vantar"
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "ógildur EAP-TLS einkalykill: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "ógilt EAP-TLS notanda-skilríki: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Ódulritaðir einkalyklar eru óöruggir"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3672,11 +3668,11 @@ msgstr ""
 "\n"
 "(Þú getur sett lykilorð á einkalykla með openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Veldu þitt einkaskilríki..."
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Veldu þinn einkalykil..."
 
@@ -3696,36 +3692,36 @@ msgstr "_Einkalykill:"
 msgid "_Private key password:"
 msgstr "_Lykilorð einkalykils:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "ógilt EAP-TTLS CA skilríki: %s"
 
-#: ../src/wireless-security/eap-method-ttls.c:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "ógilt EAP-TTLS CA skilríki: ekkert skilríki tiltekið"
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../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:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
@@ -3735,11 +3731,11 @@ msgstr "Protected EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Auð_kenning:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "vantar leap-notandanafn"
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "vantar leap-lykilorð"
 
@@ -3797,14 +3793,14 @@ msgstr "_Sýna lykil"
 msgid "WEP inde_x:"
 msgstr "WEP _vísir:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, 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:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
@@ -3812,6 +3808,12 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Gerð:"
 
+#~ msgid "_Help"
+#~ msgstr "_Hjálp"
+
+#~ msgid "bdaddr"
+#~ msgstr "bdaddr"
+
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Virkja WiMA_X ferðabreiðband"
 
diff --git a/po/it.po b/po/it.po
index b5e569af..3599aa5f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -15,9 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-03-18 01:58+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2016-03-18 09:33+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -29,7 +28,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-03-09 08:20+0000\n"
 "X-Generator: Poedit 1.8.7\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3118
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Rete"
 
@@ -186,46 +185,46 @@ msgstr "C_onnetti"
 msgid "_Network name:"
 msgstr "_Nome rete:"
 
-#: ../src/ap-menu-item.c:84
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
 # (ndt) il punto alla file?
-#: ../src/ap-menu-item.c:89
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "sicura"
 
-#: ../src/applet.c:338
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Aggiunta/Attivazione della connessione non riuscita"
 
-#: ../src/applet.c:340 ../src/applet.c:394 ../src/applet.c:429
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
 #: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: ../src/applet.c:343 ../src/applet.c:432 ../src/applet-device-wifi.c:1447
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
 #: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Connessione non riuscita"
 
-#: ../src/applet.c:392
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Disconnessione dispositivo non riuscita"
 
-#: ../src/applet.c:397
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Disconnessione non riuscita"
 
-#: ../src/applet.c:427
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Attivazione della connessione non riuscita"
 
-#: ../src/applet.c:751 ../src/applet-device-wifi.c:1184
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Non mostrare più questo messaggio"
 
-#: ../src/applet.c:838
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -236,7 +235,7 @@ msgstr ""
 "La connessione VPN «%s» non è riuscita perché la connessione di rete è stata "
 "interrotta."
 
-#: ../src/applet.c:841
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -246,7 +245,7 @@ msgstr ""
 "La connessione VPN «%s» non è riuscita perché il servizio VPN è stato "
 "fermato improvvisamente."
 
-#: ../src/applet.c:844
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -257,7 +256,7 @@ msgstr ""
 "La connessione VPN «%s» non è riuscita perché il servizio VPN ha fornito una "
 "configurazione non valida."
 
-#: ../src/applet.c:847
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -267,7 +266,7 @@ msgstr ""
 "La connessione VPN «%s» non è riuscita perché il tentativo di connessione ha "
 "esaurito il tempo a disposizione."
 
-#: ../src/applet.c:850
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -277,7 +276,7 @@ msgstr ""
 "La connessione VPN «%s» non è riuscita perché il servizio VPN non è partito "
 "in tempo."
 
-#: ../src/applet.c:853
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -286,7 +285,7 @@ msgstr ""
 "\n"
 "La connessione VPN «%s» non è riuscita perché il servizio VPN non è partito."
 
-#: ../src/applet.c:856
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -296,7 +295,7 @@ msgstr ""
 "La connessione VPN «%s» non è riuscita perché non ci sono informazioni "
 "segrete VPN valide."
 
-#: ../src/applet.c:859
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -306,7 +305,7 @@ msgstr ""
 "La connessione VPN «%s» non è riuscita perché le informazioni segrete VPN "
 "non sono valide."
 
-#: ../src/applet.c:866
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -315,7 +314,7 @@ msgstr ""
 "\n"
 "La connessione VPN «%s» non è riuscita."
 
-#: ../src/applet.c:882
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -326,7 +325,7 @@ msgstr ""
 "La connessione VPN «%s» si è chiusa perché il collegamento di rete è stato "
 "interrotto."
 
-#: ../src/applet.c:885
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -336,7 +335,7 @@ msgstr ""
 "La connessione VPN «%s» si è chiusa perché il servizio VPN è stato fermato."
 
 # [NdT] certo che l'originare era proprio brutto
-#: ../src/applet.c:891
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -345,7 +344,7 @@ msgstr ""
 "\n"
 "La connessione VPN «%s» si è chiusa."
 
-#: ../src/applet.c:921
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -356,19 +355,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:923
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Connessione VPN stabilita con successo.\n"
 
-#: ../src/applet.c:925
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Messaggio di accesso VPN"
 
-#: ../src/applet.c:931 ../src/applet.c:939 ../src/applet.c:980
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Connessione VPN non riuscita"
 
-#: ../src/applet.c:984
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -382,7 +381,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:987
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -395,152 +394,146 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1277
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "dispositivo non pronto (manca il firmware)"
 
-#: ../src/applet.c:1279
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "dispositivo non pronto"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1289 ../src/applet-device-ethernet.c:109
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "disconnessi"
 
-#: ../src/applet.c:1305
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Disconnetti"
 
-#: ../src/applet.c:1319
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "dispositivo non gestito"
 
 # [NdT] qui ho tradotto appositamente device con dispositivo
-#: ../src/applet.c:1389
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Nessun dispositivo di rete disponibile"
 
-#: ../src/applet.c:1443
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Connessioni _VPN"
 
-#: ../src/applet.c:1497
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Configura VPN..."
 
-#: ../src/applet.c:1502
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Disconnetti VPN"
 
-#: ../src/applet.c:1612
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager non è in esecuzione..."
 
-#: ../src/applet.c:1617 ../src/applet.c:2620
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Funzionalità di rete disabilitate"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1826
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Abilita funzionalità di _rete"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1835
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Abilita _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1844
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Abilita rete a banda larga _mobile"
 
 #. Toggle notifications item
-#: ../src/applet.c:1856
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Abilita n_otifiche"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1868
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Informazioni _connessione"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1878
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Modifica connessioni..."
 
-#. Help item
-#: ../src/applet.c:1893
-msgid "_Help"
-msgstr "A_iuto"
-
-#. About item
-#: ../src/applet.c:1902
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "I_nformazioni"
 
-#: ../src/applet.c:2186
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Attualmente connessi a «%s»."
 
-#: ../src/applet.c:2229
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Disconnessi"
 
 #
-#: ../src/applet.c:2230
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "La connessione di rete è stata terminata."
 
-#: ../src/applet.c:2485
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Preparazione della connessione di rete «%s»..."
 
-#: ../src/applet.c:2488
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Richiesta autenticazione utente per la connessione di rete «%s»..."
 
-#: ../src/applet.c:2491 ../src/applet-device-bt.c:125
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
 #: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Richiesta di un indirizzo di rete per «%s»..."
 
-#: ../src/applet.c:2494
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Connessione di rete «%s» attiva"
 
-#: ../src/applet.c:2568
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Avvio della connessione VPN «%s»..."
 
-#: ../src/applet.c:2571
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Richiesta autenticazione utente per la connessione VPN «%s»..."
 
-#: ../src/applet.c:2574
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Richiesta di un indirizzo VPN per «%s»..."
 
-#: ../src/applet.c:2577
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Connessione VPN «%s» attiva"
 
-#: ../src/applet.c:2624
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Nessuna connessione di rete"
 
-#: ../src/applet.c:3223
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Applet NetworkManager"
 
@@ -1672,34 +1665,39 @@ msgid "De_fault"
 msgstr "_Predefinito"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignora"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "Pass_word per Wake on LAN:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -2138,7 +2136,7 @@ msgstr ""
 "provare a disabilitare il supporto per qualche metodo."
 
 #: ../src/connection-editor/connection-helpers.c:97
-#: ../src/connection-editor/page-ethernet.c:315
+#: ../src/connection-editor/page-ethernet.c:326
 #: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
@@ -2540,25 +2538,25 @@ msgstr ""
 "oppure entrambi. Esempio: \"em1\", \"3C:97:0E:42:1A:19\", \"em1 "
 "(3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-ethernet.c:317
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Impossibile caricare l'interfaccia utente per Ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:444
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Dispositivo Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:448
+#: ../src/connection-editor/page-ethernet.c:461
 #: ../src/connection-editor/page-vlan.c:741
 #: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "MAC clonato"
 
-#: ../src/connection-editor/page-ethernet.c:452
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Password Wake-on-LAN"
 
-#: ../src/connection-editor/page-ethernet.c:487
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Connessione Ethernet %d"
@@ -2792,12 +2790,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:578 ../src/mb-menu-item.c:52
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
 #: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:56
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
 #: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
@@ -3490,84 +3488,84 @@ msgstr ""
 "Non è pensato per l'uso con la riga di comando, ma per essere eseguito "
 "nell'ambiente grafico GNOME."
 
-#: ../src/mb-menu-item.c:54
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:58
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:123
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "non abilitato"
 
-#: ../src/mb-menu-item.c:129
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "non registrato"
 
-#: ../src/mb-menu-item.c:147
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Propria rete (%s)"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Propria rete"
 
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ricerca"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrazione negata"
 
-#: ../src/mb-menu-item.c:165 ../src/mb-menu-item.c:171
+#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (roaming %s)"
 
-#: ../src/mb-menu-item.c:167 ../src/mb-menu-item.c:173
+#: ../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:176
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Rete roaming (%s)"
 
-#: ../src/mb-menu-item.c:178
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Rete roaming"
@@ -3929,6 +3927,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Tipo:"
 
+#~ msgid "_Help"
+#~ msgstr "A_iuto"
+
 #~ msgid "bdaddr"
 #~ msgstr "bdaddr"
 
diff --git a/po/ja.po b/po/ja.po
index 1f046025..f63757f1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-08-29 11:47+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-08-29 14:09+0900\n"
 "Last-Translator: Hajime Taira <htaira@redhat.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "ネットワーク"
 
@@ -56,7 +56,8 @@ msgid "Disable disconnected notifications"
 msgstr "切断通知を無効にする"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
-msgid "Set this to true to disable notifications when disconnecting from a network."
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
 msgstr "これを true にすると、ネットワークからの切断中の通知を無効にします。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
@@ -64,16 +65,23 @@ msgid "Disable VPN notifications"
 msgstr "VPN 通知を無効にする"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:6
-msgid "Set this to true to disable notifications when connecting to or disconnecting from a VPN."
-msgstr "これを true にすると、VPN への接続、あるいは VPN からの切断の際の通知を無効にします。"
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"これを true にすると、VPN への接続、あるいは VPN からの切断の際の通知を無効に"
+"します。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:7
 msgid "Suppress networks available notifications"
 msgstr "ネットワーク使用可能通知を抑制する"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
-msgid "Set this to true to disable notifications when Wi-Fi networks are available."
-msgstr "これを true にすると、無線ネットワークが利用可能になった時の通知を無効にします。"
+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
 msgid "Stamp"
@@ -88,8 +96,11 @@ msgid "Disable WiFi Create"
 msgstr "Wi-Fi の作成を無効にする"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
-msgid "Set to true to disable creation of adhoc networks when using the applet."
-msgstr "これを true にすると、アプレットでのアドホックネットワークの作成を無効にします。"
+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
 msgid "Show the applet in notification area"
@@ -97,69 +108,122 @@ msgstr "通知領域にアプレットを表示する"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:14
 msgid "Set to FALSE to disable displaying the applet in the notification area."
-msgstr "これを false にすると、通知領域にアプレットを表示するのを無効化します。"
+msgstr ""
+"これを false にすると、通知領域にアプレットを表示するのを無効化します。"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "CA 証明書を無視"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:16
-msgid "Set this to true to disable warnings about CA certificates in EAP authentication."
-msgstr "これを true にすると、EAP の認証中の CA 証明書関連の警告を無効にします。"
+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
-msgid "Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication."
-msgstr "これを true にすると、EAP 認証のフェーズ 2 での CA 証明書関連の警告を無効にします。"
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+"これを true にすると、EAP 認証のフェーズ 2 での CA 証明書関連の警告を無効にし"
+"ます。"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "NetworkManager アプレット"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "NetworkManager アプレット"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X の認証"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "接続(_O)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "ネットワーク名(_N):"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "アドホック"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "接続の追加、あるいは有効にするのに失敗しました"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "不明なエラー"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "接続に失敗"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "デバイスの切断に失敗しました"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "切断失敗"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "接続を有効にするのに失敗しました"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "二度とこのメッセージを表示しない"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the network connection was interrupted."
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
 msgstr ""
 "\n"
 "ネットワーク接続が割り込みされた為、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -168,16 +232,17 @@ msgstr ""
 "\n"
 "VPN サービスが不意に停止した為、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service returned invalid configuration."
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
 msgstr ""
 "\n"
 "VPN サービスが無効な設定を返したため、VPN 接続 '%s'は失敗しました。"
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -186,7 +251,7 @@ msgstr ""
 "\n"
 "接続試行がタイムアウトしたため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -195,7 +260,7 @@ msgstr ""
 "\n"
 "VPN サービスが時間内に開始しなかったため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -204,7 +269,7 @@ msgstr ""
 "\n"
 "VPN サービスが開始に失敗したため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -213,7 +278,7 @@ msgstr ""
 "\n"
 "有効な VPN secret がないため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -222,7 +287,7 @@ msgstr ""
 "\n"
 "VPN secret が無効なため、VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -231,16 +296,17 @@ msgstr ""
 "\n"
 "VPN 接続 '%s' は失敗しました。"
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' disconnected because the network connection was interrupted."
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
 msgstr ""
 "\n"
 "ネットワーク接続が割り込みされたため、VPN 接続 '%s' は切断されました。"
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +315,7 @@ msgstr ""
 "\n"
 "VPN サービスが停止したため、VPN 接続 '%s' は切断されました。"
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -258,7 +324,7 @@ msgstr ""
 "\n"
 "VPN 接続 '%s' が切断されました。"
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -269,19 +335,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN 接続の確立に成功しました。\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN ログインメッセージ"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN 接続は失敗しました"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -293,7 +359,7 @@ msgstr ""
 "VPN サービスが開始に失敗したため、VPN 接続 '%s' は失敗しました。n\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -306,798 +372,544 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "デバイスの準備ができていません (ファームウェア未検出)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "デバイスの準備ができていません"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "切断されています"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "切断する"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "デバイスは管理されていません"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "ネットワークデバイスがありません"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "VPN 接続(_V)"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "VPN を設定(_C)..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "VPN を切断する(_D)"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager は実行されていません..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "ネットワークは無効になっています"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "ネットワークを有効にする(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi を有効にする(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "モバイルブロードバンドを有効にする(_M)"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMAX モバイルブロードバンドを有効にする(_X)"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "通知を有効にする(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "接続情報(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "接続を編集する..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "このアプリケーションについて(_A)"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "現在'%s' に接続しています。"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "切断されました"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "ネットワーク接続が切断されました。"
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "ネットワーク接続 '%s' を準備中..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "ネットワーク接続 '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' のネットワークアドレスを要求しています..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ネットワーク接続 '%s' はアクティブです。"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN 接続 '%s' を開始しています..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN 接続 '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s' の VPN アドレスを要求しています..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN 接続 '%s' はアクティブです"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "ネットワーク接続がありません"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager アプレット"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "利用可能"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "接続を確立しました"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "現在 Bond ネットワークに接続しています。"
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Bond 接続 '%s' を準備中..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Bond 接続 '%s' を設定中です..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Bond 接続 '%s' にはユーザー認証が必要です..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "'%s' のアドレスを要求しています..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Bond 接続 '%s' はアクティブです"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "現在ブリッジネットワークに接続しています。"
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "ブリッジ接続 '%s' を準備中..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "ブリッジ接続 '%s' を設定中です..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "ブリッジ接続 '%s' にはユーザー認証が必要です..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "ブリッジ 接続 '%s' はアクティブです"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK が違います; プロバイダーに連絡してください。"
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "開錠コードを送信中..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "モバイルブロードバンド (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "モバイルブロードバンド"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "利用可能"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "新規のモバイルブロードバンド接続..."
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "接続を確立しました"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "現在、モバイルブロードバンドネットワークに接続しています。"
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "モバイルブロードバンドネットワーク"
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "ホームネットワークに接続しました。"
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "ローミングネットワークに接続しました。"
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "現在、モバイルブロードバンドネットワークに接続しています。"
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "モバイルブロードバンド接続 '%s' を準備中です..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "モバイルブロードバンド接続 '%s' を設定中です..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "モバイルブロードバンド接続 '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "モバイルブロードバンド接続 '%s' はアクティブです。"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "新規のモバイルブロードバンド (CDMA) 接続..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "現在 CDMA ネットワークに接続しています。"
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "CDMA ネットワーク"
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "自動 Ethernet"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet ネットワーク (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet ネットワーク (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet ネットワーク"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet ネットワーク"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Ethernet ネットワークに接続しました。"
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Ethernet ネットワーク接続 '%s' を準備中です..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Ethernet ネットワーク接続 '%s' を設定中です..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../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:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' 用の Ethernet ネットワークアドレスを要求しています..."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Ethernet ネットワーク接続 '%s' はアクティブです"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL 認証"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "新規のモバイルブロードバンド (GSM) 接続..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "現在 GSM ネットワークに接続しています。"
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "GSM ネットワーク"
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "自動 InfiniBand"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand ネットワーク (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand ネットワーク (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "InfiniBand ネットワーク"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "InfiniBand ネットワーク"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "現在 InfiniBand ネットワークに接続しています。"
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "InfiniBand 接続 '%s' を準備中..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "InfiniBand 接続 '%s' を設定中です..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "InfiniBand 接続 '%s' にはユーザー認証が必要です..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand 接続 '%s' はアクティブです。"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Team ネットワークに接続しました。"
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Team 接続 '%s' を準備中..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Team 接続 '%s' を設定中です..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Team 接続 '%s' にはユーザー認証が必要です..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Team 接続 '%s' はアクティブです。"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "現在 VLAN に接続しています。"
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "VLAN 接続 '%s' を準備中..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "VLAN 接続 '%s' を設定中です..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "VLAN 接続 '%s' にはユーザー認証の設定中です..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VPN 接続 '%s' はアクティブです"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "非表示 Wi-Fi ネットワークに接続(_C)..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "新しい Wi-Fi ネットワークを作成(_N)..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(なし)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi ネットワーク (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi ネットワーク (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi ネットワーク"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi は無効になっています"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi はハードウェアのスイッチで無効になっています"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "その他のネットワーク"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi ネットワークは利用可能です"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Wi-Fi ネットワークに接続するにはネットワークメニューを使用します。"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Wi-Fi ネットワーク '%s' に接続しました。"
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Wi-Fi ネットワーク接続 '%s' を準備中..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Wi-Fi ネットワーク接続 '%s' を設定中です..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Wi-Fi ネットワーク '%s' にはユーザー認証が必要です..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "'%s' の Wi-Fi ネットワークアドレスを要求しています..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wi-Fi ネットワーク接続 '%s' はアクティブです: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr " Wi-Fi ネットワーク接続 '%s' はアクティブです"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "接続を有効にするのに失敗しました"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "新規接続の追加に失敗しました"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX モバイルブロードバンド (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX モバイルブロードバンド"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX は無効になっています"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX はハードウェアのスイッチで無効になっています"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "現在 WiMAX ネットワークに接続しています。"
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "モバイルブロードバンド接続 '%s' アクティブです: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "ローミング"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "接続情報の表示中にエラーが起きました:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "動的 WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "アドレス"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "なし"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (デフォルト)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "不明"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "不明"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP アドレス:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP アドレス:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "ブロードキャストアドレス:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "サブネットマスク:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "デフォルトルート:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "サブネットマスク:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 Wi-Fi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "全般"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "インターフェース:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "ハードウェアアドレス:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ドライバー:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "速度:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "セキュリティ:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "デフォルトルート:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "無視"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN の種類:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN ゲートウェイ:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN ユーザー名:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN バナー:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "ベース接続:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "不明"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "有効なアクティブ接続がありません!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1105,114 +917,159 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "また、コミュニティの他の多くの貢献者、翻訳者"
 
-#: ../src/applet-dialogs.c:987
-msgid "Notification area applet for managing your network devices and connections."
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
 msgstr "ネットワークデバイスと接続を管理するための通知領域アプレット。"
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager ウェブサイト"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "不足しているリソース"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "モバイルブロードバンドネットワークのパスワード"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' への接続にパスワードが必要です。"
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN の開錠が必要です"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN の開錠が必要です"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
-msgid "The mobile broadband device '%s' requires a SIM PIN code before it can be used."
-msgstr "モバイルブロードバンドデバイス %s' を使用するには SIM PIN ピンコードが必要です。"
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
+"モバイルブロードバンドデバイス %s' を使用するには SIM PIN ピンコードが必要で"
+"す。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN コード:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "PIN コードを表示"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK のアンロックが必要です"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK のアンロックが必要です"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
-msgid "The mobile broadband device '%s' requires a SIM PUK code before it can be used."
-msgstr "モバイルブロードバンドデバイス '%s' を使用するには SIM PUK コードが必要です。"
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr ""
+"モバイルブロードバンドデバイス '%s' を使用するには SIM PUK コードが必要です。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK コード:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "新規の PIN コード:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "新規の PIN コードを再入力:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK コードを表示"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
-msgid "IP addresses identify your computer on the network.  Click the \"Add\" button to add an IP address."
-msgstr "IP アドレスはネットワーク上のコンピューターを識別します。\"追加\" ボタンを押すとIP アドレスを追加できます。"
+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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "削除(_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "自動取得したルートを無視する(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "そのネットワーク上のリソースのためにのみこの接続を使用(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "If enabled, this connection will never be used as the default network connection."
-msgstr "有効になっている場合、この接続は決してデフォルトのネットワーク接続として 使用されません。"
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr ""
+"有効になっている場合、この接続は決してデフォルトのネットワーク接続として 使用"
+"されません。"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1220,23 +1077,25 @@ msgstr "有効になっている場合、この接続は決してデフォルト
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "作成…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "接続の種類を選んでください"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
-"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."
+"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."
 msgstr ""
 "新規接続で使用したい接続の種類を選択してください。\n"
 "\n"
-"VPN 接続を作成しようとしていて、作成したい VPN 接続の種類が一覧に無い場合は、正しい VPN プラグインをインストールしていないかもしれません。"
+"VPN 接続を作成しようとしていて、作成したい VPN 接続の種類が一覧に無い場合は、"
+"正しい VPN プラグインをインストールしていないかもしれません。"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
 msgid "Round-robin"
@@ -1279,73 +1138,92 @@ msgid "Bonded _connections:"
 msgstr "Bond 接続(_C):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "モード(_M):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "モード(_O):"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "編集(_E)"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "削除(_D)"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "編集(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "監視周期(_F):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "インターフェース名(_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "リンク監視(_L)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP 対象(_T):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-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:20
+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:"
 msgstr "接続遅延(_U):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "接断遅延(_D):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "プライマリ(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-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:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "バイト"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "経路のコスト(_C):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "優先度(_P):"
 
@@ -1357,44 +1235,89 @@ msgstr "ヘアピンモード(_H):"
 msgid "Bridged _connections:"
 msgstr "ブリッジ接続(_C):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "転送遅延(_F):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "Hello タイム(_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "ネットワークを有効にする(_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "STP (スパニングツリープロトコル) を有効化(_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "最大エージ(_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "エージング時間(_A):"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "自動"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "デフォルト"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "アドレス"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "アドレス"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "すべてのデバイス"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "不明なエラーのため接続 secret を更新できませんでした。"
 
@@ -1493,94 +1416,97 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "優先フロー制御"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 #, fuzzy
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "ユーザー優先度ごとの優先ポーズ転送を有効化もしくは無効化します。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "優先度:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "トラフィッククラス:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "厳密な帯域幅:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "優先帯域幅:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "グループ帯域幅:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr "ユーザーの優先度ごとの優先グループ ID を入力してください。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
-msgid "Enter the allowed link bandwidth percent each Priority Group may use.  The sum of all groups must total 100%."
+msgid ""
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:44
-msgid "Enter the percentage of priority group bandwidth each user priority may use."
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1593,7 +1519,7 @@ 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:4
+#: ../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
@@ -1601,8 +1527,9 @@ msgid "Sho_w password"
 msgstr "パスワードを表示(_W)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1614,7 +1541,8 @@ msgstr "パスワード(_P):"
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "自動"
@@ -1669,34 +1597,75 @@ msgstr "オートネゴシエーション(_O)"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "デバイスの MAC アドレス(_D):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "サービス(_S):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "クローンした MAC アドレス(_L):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
-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 クローニングあるいはMAC スプーフィングとして知られています。例: 00:11:22:33:44:55"
+#: ../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 ""
+"ここに入力された MAC アドレスは、この接続で利用するネットワークデバイスに使わ"
+"れるハードウェアアドレスとして使用されます。この機能は MAC クローニングあるい"
+"はMAC スプーフィングとして知られています。例: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "MTU(_M):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "バイト"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "デフォルト"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "無視する"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "ブロードキャスト"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "プライベートキーパスワード(_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1735,8 +1704,8 @@ msgstr "自動 (DNS 設定は手動)"
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "手動"
 
@@ -1747,8 +1716,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "他のコンピューターへ共有"
 
@@ -1762,52 +1731,70 @@ msgstr "方式(_M):"
 msgid "Addresses"
 msgstr "アドレス"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-msgid "The DHCP client identifier allows the network administrator to customize your computer's configuration.  If you wish to use a DHCP client identifier, enter it here."
-msgstr "DHCP クライアント識別子の使用で、ネットワーク管理者はコンピューターの設定を カスタマイズできます。DHCP クライアント識別子を使用したい場合は、ここに入力します。"
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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 クライアント識別子を使用したい場合は、ここに入力し"
+"ます。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-msgid "Domains used when resolving host names. Use commas to separate multiple domains."
-msgstr "ホスト名を解決する時に使用するドメイン。複数のドメインを分離する時はコンマを 使います。"
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+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.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "DNS サーバー(_V):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-msgid "IP addresses of domain name servers used to resolve host names. Use commas to separate multiple domain name server addresses."
-msgstr "ドメインネームサーバーの IP アドレスはホスト名を解決するために使用されます。 コンマを使用して複数のドメインネームサーバーアドレスを分離します。"
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+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.h:17
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "この接続を完了するには IPv4 アドレス化が必要になります(_4)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
-msgid "When connecting to IPv6-capable networks, allows the connection to complete if IPv4 configuration fails but IPv6 configuration succeeds."
-msgstr "IPv4 設定が失敗して、IPv6 設定が成功する場合、IPv6 対応のネットワークに接続する時に接続が完了するまで待ちます。"
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+msgid ""
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
+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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "ルート(_R)…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "無効になっています"
 
@@ -1819,88 +1806,65 @@ msgstr ""
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "IP addresses of domain name servers used to resolve host names. Use commas to separate multiple domain name server addresses. Link-local addresses will be automatically scoped to the connecting interface."
-msgstr "ドメインネームサーバーの IP アドレスはホスト名を解決するために使用されます。 コンマを使用して複数のドメインネームサーバーアドレスを分離します。リンクローカルアドレスは自動的に接続中のインターフェースにスコープされます。"
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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 アドレスはホスト名を解決するために使用されます。 "
+"コンマを使用して複数のドメインネームサーバーアドレスを分離します。リンクロー"
+"カルアドレスは自動的に接続中のインターフェースにスコープされます。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 のプライバシー拡張(_P):"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "この接続が完了するには IPv6 アドレス化が必要になります(_6)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "When connecting to IPv4-capable networks, allows the connection to complete if IPv6 configuration fails but IPv4 configuration succeeds."
-msgstr "IPv6 設定が失敗して、IPv4 設定が成功する場合、IPv4 対応のネットワークに接続する時に接続が完了するまで待ちます。"
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+msgid ""
+"When connecting to IPv4-capable networks, allows the connection to complete "
+"if IPv6 configuration fails but IPv4 configuration succeeds."
+msgstr ""
+"IPv6 設定が失敗して、IPv4 設定が成功する場合、IPv4 対応のネットワークに接続す"
+"る時に接続が完了するまで待ちます。"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "何でも"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3G 優先 (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2G 優先 (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "4G 優先 (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "4G (LTE) のみ利用"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "番号(_M):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "高度"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "APN(_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "ネットワーク ID(_E):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "タイプ(_T):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "変更..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "PIN 番号(_I):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "ホームネットワークが利用できない場合にローミングを許可(_R)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "パスワードを表示(_W)"
 
@@ -1967,32 +1931,55 @@ msgid "_Teamed connections:"
 msgstr "Team 接続(_T):"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "保存した Team 設定をインポートする(_M)..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "保存した Team 設定をインポートする(_I)..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "親インターフェース(_P):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN インターフェース名(_N):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "クローンした MAC アドレス(_C):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN ID(_I):"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "デバイス名 + 番号"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + 番号"
 
@@ -2009,391 +1996,466 @@ msgid "B/G (2.4 GHz)"
 msgstr "b/g (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "インフラストラクチャ"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "アドホック"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "送信パワー(_W):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "レート(_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "BSSID(_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "チャンネル(_H):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "バンド(_D):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "モード(_O):"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SSID(_I):"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "許可された認証方法"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "EAP(_E)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "拡張認証プロトコル (EAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "PAP(_P)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "パスワード認証プロトコル (PAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 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:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "チャレンジハンドシェイク認証プロトコル (CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 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:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft チャレンジハンドシェイク認証プロトコル (MS-CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 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:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft チャレンジハンドシェイク認証プロトコル バージョン2 (MS-CHAP v2)"
-
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-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 サーバーはすべての認証方法をサポートしています。 接続が失敗する場合は、一部の認証方法を無効にしてみてください。"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "アドレス"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "ネットマスク"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "ゲートウェイ"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "メトリック"
+msgstr ""
+"Microsoft チャレンジハンドシェイク認証プロトコル バージョン2 (MS-CHAP v2)"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "プレフィックス"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+"ほとんどの場合、プロバイダーの PPP サーバーはすべての認証方法をサポートしてい"
+"ます。 接続が失敗する場合は、一部の認証方法を無効にしてみてください。"
 
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "ブリッジ"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "ハードウェア"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "仮想"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "保存した VPN 設定をインポートする..."
 
-#: ../src/connection-editor/new-connection.c:378
-msgid "The connection editor dialog could not be initialized due to an unknown error."
-msgstr "接続エディターのダイアログは不明なエラーのために初期化できませんでした。"
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+"接続エディターのダイアログは不明なエラーのために初期化できませんでした。"
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "新しい接続を作成できませんでした"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "接続の削除に失敗しました"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "本当に 接続 %s を削除したいのですか ?"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "アドレス"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "ネットマスク"
+
+#: ../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
+msgid "Gateway"
+msgstr "ゲートウェイ"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "メトリック"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "プレフィックス"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "%s の編集"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "無名の接続を編集"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
-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:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "接続名(_N):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "エディターの初期化中にエラーです"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "接続の追加に失敗しました"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "この接続に対しての変更をすべて保存します。"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "このマシンのすべてのユーザー用接続の保存を認証する。"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "新しい接続を作成できませんでした"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "接続を編集できませんでした"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "接続エディターダイアログの作成中に不明なエラーです。"
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "エディターの初期化中にエラーです"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "接続の追加に失敗しました"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "接続情報の保存中にエラー"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "プロパティ '%s' / '%s' は無効です: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "接続名(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "エクスポート(_E)..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "未接続"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "接続中"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分前"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 時間前"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 日前"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ヶ月前"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年前"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "名前"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "前回の使用"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "選択した接続を編集する"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "選択した接続の編集を認証する"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "選択した接続を削除する"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "選択した接続の削除を認証する"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "VPN プラグインがインストールされていません"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "接続 '%s' の作成方法がわかりません"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "接続の作成中にエラー"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "接続を編集しようとしてエラー"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID '%s' の接続を発見できませんでした"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x セキュリティ"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "802.1x セキュリティユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "この接続に 802.1x セキュリティを使用する(_X)"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "DCB ユーザーインターフェースをロードできませんでした。"
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "Bluetooth デバイスが見付かりませんでした。"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "bond 接続 %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Ethernet ネットワーク"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Wi-Fi ネットワーク"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "bond ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "プライマリ(_P):"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "bond 接続 %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "ブリッジユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "ブリッジ接続 %d"
@@ -2401,280 +2463,361 @@ msgstr "ブリッジ接続 %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "ブリッジポート"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "ブリッジポートのユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "DCB ユーザーインターフェースをロードできませんでした。"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL ユーザーインターフェースをロードできませんでした。"
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 接続 %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
-msgid "This option locks this connection to the network device specified by its permanent MAC address entered here.  Example: 00:11:22:33:44:55"
-msgstr "このオプションはここに入力してある MAC アドレスで指定されたネットワークデバイスで、この接続をロックします。例: 00:11:22:33:44:55"
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"このオプションはここに入力してある MAC アドレスで指定されたネットワークデバイ"
+"スで、この接続をロックします。例: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Ethernet のユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "クローンした MAC アドレス(_L):"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../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 がアクティブの場合にのみ有意です。"
+#: ../src/connection-editor/page-general.c:52
+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 がアクティブの場合にのみ有意で"
+"す。"
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD が起動していません。"
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "一般的なユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand ユーザーインターフェースをロードできませんでした。"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 接続 %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "自動 (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "自動 (VPN) アドレス専用"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "自動 (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "自動 (PPP) アドレス専用"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "自動、アドレスのみ"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "自動 (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "自動 (PPPoE) アドレス専用"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "自動 (DHCP) アドレス専用"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "ローカルへのリンク専用"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "追加の DNS サーバー(_V):"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "追加の検索ドメイン(_E):"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s 用の IPv4 ルートを編集"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 のセッティング"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "自動、アドレスのみ"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "無視する"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "自動、DHCP のみ"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s 用の IPv6 ルートを編集"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 のセッティング"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "重複するスレーブ"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "スレーブ '%s' と '%s' は両方ともデバイス '%s' へ適用されます。"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, 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') へ適用されます。"
+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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s スレーブ %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "モバイルブロードバンドのユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "サポートされていないモバイルブロードバンドの接続タイプ。"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "モバイルブロードバンドプロバイダーのタイプを選択"
 
-#: ../src/connection-editor/page-mobile.c:647
-msgid "Select the technology your mobile broadband provider uses.  If you are unsure, ask your provider."
-msgstr "モバイルブロードバンドのプロバイダーが使用する技術を選択してください。 不明な場合は、プロバイダーに尋ねてください。"
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
+"モバイルブロードバンドのプロバイダーが使用する技術を選択してください。 不明な"
+"場合は、プロバイダーに尋ねてください。"
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
-msgstr "私のプロバイダーは GSM ベースの技術 (例えば、 GPRS, EDGE, UMTS, HSDPA) を使用します(_G)"
+msgstr ""
+"私のプロバイダーは GSM ベースの技術 (例えば、 GPRS, EDGE, UMTS, HSDPA) を使用"
+"します(_G)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr "私のプロバイダーは CDMA ベースの技術 (例えば、1xRTT, EVDO)を使用します(_D)"
+msgstr ""
+"私のプロバイダーは CDMA ベースの技術 (例えば、1xRTT, EVDO)を使用します(_D)"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "なし"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP の設定"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "インポートするファイルを選択する"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "エラー: ファイルに有効な JSON 設定が含まれていません。"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Team ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Team 接続 %d"
@@ -2682,47 +2825,56 @@ msgstr "Team 接続 %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Team ポート"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (\"%s\" 経由)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "ネットワーク接続がありません"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "vlan ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 接続 %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN ユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' 用の VPN プラグインサービスが見つかりませんでした。"
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 接続 %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2732,113 +2884,152 @@ msgstr ""
 "\n"
 "エラー: VPN サービスタイプがありません。"
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "VPN 接続の種類を選んでください"
 
-#: ../src/connection-editor/page-vpn.c:276
-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 プラグインをインストールしていないかもしれません。"
+#: ../src/connection-editor/page-vpn.c:255
+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 プラグインをインストールしていないかもしれま"
+"せん。"
+
+#: ../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 ""
+"このオプションはここに入力してある BSSID で指定された Wi-Fi アクセスポイント "
+"(AP) へこの接続をロックします。例: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:85
-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 で指定された Wi-Fi アクセスポイント (AP) へこの接続をロックします。例: 00:11:22:33:44:55"
+#: ../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)\""
+msgstr ""
+"このオプションはここに入力してある MAC アドレスで指定されたネットワークデバイ"
+"スで、この接続をロックします。例: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi ユーザーインターフェースをロードできませんでした。"
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "すべてのデバイス"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 接続 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit パスフレーズ"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "動的 WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
 # そういう仕様の名前なので訳すべきでない。
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi セキュリティ"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi セキュリティユーザーインターフェースを読み込めません。"
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "WiMAX ユーザーインターフェースをロードできませんでした。"
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX 接続 %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN 接続をインポートできません"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../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"
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
 "\n"
 "Error: %s."
 msgstr ""
-"ファイル '%s' は読み込めなかったか、または処理できる VPN 接続情報がありません\n"
+"ファイル '%s' は読み込めなかったか、または処理できる VPN 接続情報がありませ"
+"ん\n"
 "\n"
 "エラー: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "不明なエラー"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" と言うファイルは既に存在します。"
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "入れ替え(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN 接続をエクスポートできません"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2849,99 +3040,23 @@ msgstr ""
 "\n"
 "エラー: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN 接続をエクスポートする..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
-msgid "The NetworkManager Applet could not find some required resources (the .ui file was not found)."
-msgstr "NetworkManager アプレットは必要ないくつかのリソースをみつけられませんでした (.ui ファイルがみつかりません)。"
-
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "Bluetooth の設定はできません (D-Bus への接続に失敗: (%s) %s)。"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid "Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "Bluetooth の設定はできません (NetworkManager の検索中にエラー発生: (%s) %s)。"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "モバイル電話をネットワークデバイス (PAN/NAP) として使用する"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "モバイル電話 (DUN) を使用してインターネットにアクセスする"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "エラー: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "DUN 接続の作成に失敗しました: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "ご使用の電話は今、使用準備ができました"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "モバイルウィザードは取り消されました"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "不明な電話のデバイスタイプです (GSM や CDMA ではない)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "不明なモデムのタイプです。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "電話への接続に失敗しました。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "バス接続を取得しようとしてエラー"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "電話が不意に切断されました。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "電話の詳細検出がタイムアウトです。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "電話の設定を検出中です..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid "The default Bluetooth adapter must be enabled before setting up a Dial-Up-Networking connection."
-msgstr "デフォルトの Bluetooth アダプターを有効にしてから後に、ダイアルアップネットワーク接続をセットアップしてください。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "PAN 接続の作成に失敗しました: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "%s ネットワーク"
+#: ../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 ""
+"NetworkManager アプレットは必要ないくつかのリソースをみつけられませんでした "
+"(.ui ファイルがみつかりません)。"
 
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "アンロック(_U)"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "自動的にこのデバイスをアンロックする"
 
@@ -2949,405 +3064,520 @@ msgstr "自動的にこのデバイスをアンロックする"
 msgid "Connection Information"
 msgstr "接続情報"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "有効なネットワーク接続"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
-msgid "Your mobile broadband connection is configured with the following settings:"
-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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "使用デバイス:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "使用プロバイダー:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "使用プラン:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
-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/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "一覧に無い"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "使用プランの選択(_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
+"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"
 "\n"
-"ご自分のプランが不明な場合は、そのプランの APN についてプロバイダーにお尋ねください。"
+"ご自分のプランが不明な場合は、そのプランの APN についてプロバイダーにお尋ねく"
+"ださい。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "使用する請求書プランを選択"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "私のプランは一覧に有りません..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "プロバイダー"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "プロバイダー:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "使用プロバイダーを選択"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "国や地域の一覧:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "国や地域"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "私の国は一覧に有りません"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "GSM デバイスがインストールされています"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "CDMA デバイスがインストールされています"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
-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: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 ""
+"このアシスタントはユーザーが簡単に携帯 (3G) ネットワークへのモバイルブロード"
+"バンド接続ができるように手伝います。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "以下の情報が必要です:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "使用するブロードバンドプロバイダー名"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "使用するブロードバンド請求書プラン名"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "このモバイルブロードバンドデバイス用の接続を作成(_T):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "すべてのデバイス"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "モバイルブロードバンド接続のセットアップ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "新規のモバイルブロードバンド接続"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "有線"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "セカンダリパスワード(_S):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "セカンダリパスワード(_S):"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %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-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "切断する"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "新規..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "なし"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "作成(_R)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
-msgid "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
-msgstr "Wi-Fi ネットワーク '%s' にアクセスするにはパスワードか、または暗号化キーが必要です。"
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
+"Wi-Fi ネットワーク '%s' にアクセスするにはパスワードか、または暗号化キーが必"
+"要です。"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi ネットワークの認証が必要です"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi ネットワークでは認証が要求されます"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "新しい Wi-Fi ネットワークを作成"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "新規 Wi-Fi ネットワーク"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "作成したい Wi-Fi ネットワークの名前を入力してください。"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "非表示 Wi-Fi ネットワークに接続する"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "非表示 Wi-Fi ネットワーク"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
-msgid "Enter the name and security details of the hidden Wi-Fi network you wish to connect to."
-msgstr "接続したい Wi-Fi ネットワークの名前とセキュリティ詳細を入力してください。"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "セカンダリパスワード(_S):"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "パスワードを表示(_O)"
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"接続したい Wi-Fi ネットワークの名前とセキュリティ詳細を入力してください。"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi セキュリティ(_S):"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "接続(_O):"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi アダプター(_A):"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "使用法:"
 
-#: ../src/main.c:75
-msgid "This program is a component of NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/)."
-msgstr "このプログラムは NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/) のコンポーネントです。"
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+"このプログラムは NetworkManager (https://wiki.gnome.org/Projects/"
+"NetworkManager/) のコンポーネントです。"
 
-#: ../src/main.c:76
-msgid "It is not intended for command-line interaction but instead runs in the GNOME desktop environment."
-msgstr "コマンドラインでの利用は意図されていませんが、その代わりに GNOME デスクトップ環境で実行します。"
+#: ../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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "有効になっていません"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "登録されていません"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ホームネットワーク (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "ホームネットワーク"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "検索中"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "登録は拒否されました"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ローミング)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ローミングネットワーク (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "ローミングネットワーク"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "'%2$s' 上の SIM カード '%1$s' の PIN コード"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN コードが必要です"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "モバイルブロードバンドデバイスには PIN コードが必要です"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "モバイルブロードバンド接続 '%s' アクティブです: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "ローミング"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s 接続"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "このユーザーのパスワードのみ格納する(_U)"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "すべてのユーザーのパスワードを格納する(_A)"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER か PEM の証明書 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "PAC ファイルを選んでください..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC ファイル (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "すべてのファイル"
 
@@ -3384,15 +3614,32 @@ msgstr "内部認証(_I):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "自動 PAC プロビジョニングを許可(_V)"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "証明書権限(CA)証明書を選択..."
 
@@ -3420,29 +3667,64 @@ msgstr "CA 証明書は必要ありません(_R)"
 msgid "PEAP _version:"
 msgstr "PEAP バージョン(_V):"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "毎回このパスワードを要求する(_K)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "CA 証明書(_A):"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "暗号化のないプライベートキーは安全ではありません"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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"
+"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 ""
-"選択したプライベートキーはパスワードで保護されていないようです。この状態は 信用情報の侵害を許してしまいます。パスワード保護のあるプライベートキーを選択してください。\n"
+"選択したプライベートキーはパスワードで保護されていないようです。この状態は 信"
+"用情報の侵害を許してしまいます。パスワード保護のあるプライベートキーを選択し"
+"てください。\n"
 "\n"
 "(プライベートキーは openssl を使用してパスワード保護ができます)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "個人用証明書を選択する..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "プライベートキーを選択する..."
 
@@ -3464,23 +3746,36 @@ msgstr "プライベートキー(_K):"
 msgid "_Private key password:"
 msgstr "プライベートキーパスワード(_P):"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "トンネル化 TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "保護つき EAP (PEAP)"
 
@@ -3490,6 +3785,44 @@ msgstr "保護つき EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "認証(_T):"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (デフォルト)"
@@ -3514,6 +3847,291 @@ msgstr "キーを表示(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP インデックス(_X):"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "タイプ(_T):"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "WiMAX モバイルブロードバンドを有効にする(_X)"
+
+#~ msgid "_Help"
+#~ msgstr "ヘルプ(_H)"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "現在 Bond ネットワークに接続しています。"
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Bond 接続 '%s' を準備中..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Bond 接続 '%s' を設定中です..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Bond 接続 '%s' にはユーザー認証が必要です..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "'%s' のアドレスを要求しています..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Bond 接続 '%s' はアクティブです"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "現在ブリッジネットワークに接続しています。"
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "ブリッジ接続 '%s' を準備中..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "ブリッジ接続 '%s' を設定中です..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "ブリッジ接続 '%s' にはユーザー認証が必要です..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "ブリッジ 接続 '%s' はアクティブです"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "新規のモバイルブロードバンド (CDMA) 接続..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "現在 CDMA ネットワークに接続しています。"
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA ネットワーク"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "新規のモバイルブロードバンド (GSM) 接続..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "現在 GSM ネットワークに接続しています。"
+
+#~ msgid "GSM network."
+#~ msgstr "GSM ネットワーク"
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "自動 InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand ネットワーク (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand ネットワーク (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand ネットワーク"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand ネットワーク"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "現在 InfiniBand ネットワークに接続しています。"
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand 接続 '%s' を準備中..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand 接続 '%s' を設定中です..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand 接続 '%s' にはユーザー認証が必要です..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand 接続 '%s' はアクティブです。"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Team ネットワークに接続しました。"
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Team 接続 '%s' を準備中..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Team 接続 '%s' を設定中です..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Team 接続 '%s' にはユーザー認証が必要です..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Team 接続 '%s' はアクティブです。"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "現在 VLAN に接続しています。"
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "VLAN 接続 '%s' を準備中..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "VLAN 接続 '%s' を設定中です..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "VLAN 接続 '%s' にはユーザー認証の設定中です..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VPN 接続 '%s' はアクティブです"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX モバイルブロードバンド (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX モバイルブロードバンド"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX は無効になっています"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX はハードウェアのスイッチで無効になっています"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "現在 WiMAX ネットワークに接続しています。"
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "不明"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "不明"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "モード(_M):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "デバイスの MAC アドレス(_D):"
+
+#~ msgid "Any"
+#~ msgstr "何でも"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "3G 優先 (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "2G 優先 (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "4G 優先 (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "4G (LTE) のみ利用"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "保存した Team 設定をインポートする(_M)..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "インフラストラクチャ"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "接続情報の保存中にエラー"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "プロパティ '%s' / '%s' は無効です: %d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "自動 (PPP)"
+
+#~ 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)."
+#~ msgstr "Bluetooth の設定はできません (D-Bus への接続に失敗: (%s) %s)。"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Bluetooth の設定はできません (NetworkManager の検索中にエラー発生: (%s) "
+#~ "%s)。"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "モバイル電話をネットワークデバイス (PAN/NAP) として使用する"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "モバイル電話 (DUN) を使用してインターネットにアクセスする"
+
+#~ msgid "Error: %s"
+#~ msgstr "エラー: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "DUN 接続の作成に失敗しました: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "ご使用の電話は今、使用準備ができました"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "モバイルウィザードは取り消されました"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "不明な電話のデバイスタイプです (GSM や CDMA ではない)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "不明なモデムのタイプです。"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "電話への接続に失敗しました。"
+
+#~ msgid "error getting bus connection"
+#~ msgstr "バス接続を取得しようとしてエラー"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "電話が不意に切断されました。"
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "電話の詳細検出がタイムアウトです。"
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "電話の設定を検出中です..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "デフォルトの Bluetooth アダプターを有効にしてから後に、ダイアルアップネッ"
+#~ "トワーク接続をセットアップしてください。"
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "PAN 接続の作成に失敗しました: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s ネットワーク"
+
 #~ msgid "Primary DNS:"
 #~ msgstr "第一 DNS:"
 
@@ -3538,8 +4156,13 @@ msgstr "WEP インデックス(_X):"
 #~ msgid "No Certificate Authority certificate chosen"
 #~ msgstr "認証局の証明書が選択されていません"
 
-#~ msgid "Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate Authority certificate?"
-#~ msgstr "認証局の証明書を使用しない場合、安全でない詐欺的な Wi-Fi ネットワークに接続する可能性があります。認証局の証明書を選択しますか?"
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "認証局の証明書を使用しない場合、安全でない詐欺的な Wi-Fi ネットワークに接"
+#~ "続する可能性があります。認証局の証明書を選択しますか?"
 
 #~ msgid "Choose CA Certificate"
 #~ msgstr "CA 証明書を選択する"
@@ -3609,14 +4232,13 @@ msgstr "WEP インデックス(_X):"
 #~ msgstr "インポートした接続を編集できませんでした"
 
 #~ msgid "No VPN plugin available. Please install one to enable this button."
-#~ msgstr "VPN プラグインを利用できません。このボタンを有効にするには一つはインストールしてください。"
+#~ msgstr ""
+#~ "VPN プラグインを利用できません。このボタンを有効にするには一つはインストー"
+#~ "ルしてください。"
 
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "接続 '%s' を編集する方法がわかりません"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "Bluetooth デバイスが見付かりませんでした。"
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "Bluetooth の設定はできません (D-Bus プロキシの作成に失敗)。"
 
diff --git a/po/kk.po b/po/kk.po
index 9a8a7ec2..baf72a43 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2015-11-18 09:08+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2015-11-18 14:34+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
@@ -19,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.8.6\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3256
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Желі"
 
@@ -122,7 +121,6 @@ msgid ""
 msgstr ""
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
-#| msgid "NetworkManager Applet"
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
@@ -142,7 +140,7 @@ msgid ""
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X аутентификациясы"
 
@@ -164,45 +162,45 @@ msgstr "Ба_йланысу"
 msgid "_Network name:"
 msgstr "Желі а_тауы:"
 
-#: ../src/ap-menu-item.c:87
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr ""
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Байланысты қосу/белсендіру мүмкін емес"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Белгісіз қате"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Байланысты орнату сәтсіз"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Құрылғыны ажырату сәтсіз"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Ажырату сәтсіз"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Байланысты іске қосу сәтсіз"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Бұл хабарламаны келесіде көрсетпеу"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -212,7 +210,7 @@ msgstr ""
 "\n"
 "'%s' VPN байланысы сәтсіз, өйткені желілік байланыс үзілді."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -221,7 +219,7 @@ msgstr ""
 "\n"
 "'%s' VPN байланысы сәтсіз, өйткені VPN қызметі күтпегенде тоқтады."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -231,7 +229,7 @@ msgstr ""
 "\n"
 "'%s' VPN байланысы сәтсіз, өйткені VPN қызметі қате баптауларды қайтарды."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -240,7 +238,7 @@ msgstr ""
 "\n"
 "'%s' VPN байланысы сәтсіз, өйткені байланысты орнатудың күту уақыты бітті."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +247,7 @@ msgstr ""
 "\n"
 "'%s' VPN байланысы сәтсіз, өйткені VPN қызметі уақытында іске қосылмады."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -258,21 +256,21 @@ msgstr ""
 "\n"
 "'%s' VPN байланысы сәтсіз, өйткені VPN қызметі іске қосыла алмады."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because there were no valid VPN secrets."
 msgstr ""
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because of invalid VPN secrets."
 msgstr ""
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -281,7 +279,7 @@ msgstr ""
 "\n"
 "'%s' VPN байланысы сәтсіз."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -291,7 +289,7 @@ msgstr ""
 "\n"
 "'%s' VPN байланысы желілік байланыс үзілген соң ажыратылды."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -300,7 +298,7 @@ msgstr ""
 "\n"
 "'%s' VPN байланысы VPN қызметі тоқталған соң ажыратылды."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -309,7 +307,7 @@ msgstr ""
 "\n"
 "'%s' VPN байланысы ажыратылды."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -320,19 +318,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN байланысы сәтті орнатылды.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN кіру хабарламасы"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN байланысы сәтсіз"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -345,7 +343,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -358,548 +356,542 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "құрылғы дайын емес (firmware жоқ)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "құрылғы дайын емес"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "байланыспаған"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Байланысты үзу"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "құрылғы басқарылмайды"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Бірді-бір желілік құрылғы қолжетерсіз"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN байланыстары"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "VPN ба_птау..."
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "VPN а_жырату"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager іске қосылған емес..."
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Желі сөндірілген"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Ж_еліні іске қосу"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi-ды і_ске қосу"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "_Мобильді кеңжолақты желіні іске қосу"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "_Хабарламаларды іске қосу"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Байла_ныс ақпараты"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Байланыстарды түзету..."
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "Кө_мек"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "Осы т_уралы"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Сіз '%s' желісіне қосылдыңыз."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Ажыратылған"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Желілік байланыс ажыратылды."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "'%s' желілік байланысын дайындау..."
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "'%s' желілік байланысы үшін пайдаланушы аутентификациясы керек..."
 
-#: ../src/applet.c:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' үшін желілік адресті сұрау..."
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "'%s' желілік байланысы белсенді"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "'%s' VPN байланысын іске қосу..."
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "'%s' VPN байланысы үшін пайдаланушы аутентификациясы керек..."
 
-#: ../src/applet.c:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s' үшін VPN адресін сұрау..."
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "'%s' VPN байланысы белсенді"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Желілік байланыстар жоқ"
 
-#: ../src/applet.c:3382
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager апплеті"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK коды қате; провайдеріңізге хабарласыңыз."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 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:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Босату кодын жіберу..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Мобильді кеңжолақты (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Мобильді кеңжолақты"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Қолжетерлік"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Жаңа мобильді кеңжолақты байланысы..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Байланыс орнатылды"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Сіз мобильді кеңжолақты желісіне байланыс орнаттыңыз."
 
-#: ../src/applet-device-broadband.c:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Мобильді кеңжолақты желісі."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Сіз үй желісінде тіркелдіңіз."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Сіз роуминг желісінде тіркелдіңіз."
 
-#: ../src/applet-device-bt.c:93
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Сіз мобильді кеңжолақты желісіне байланыс орнаттыңыз."
 
-#: ../src/applet-device-bt.c:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "'%s' мобильді кеңжолақты байланысын дайындау..."
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "'%s' мобильді кеңжолақты байланысын баптау..."
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
 "'%s' мобильді кеңжолақты байланысы үшін пайдаланушы аутентификациясы керек..."
 
-#: ../src/applet-device-bt.c:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "'%s' мобильді кеңжолақты байланысы белсенді"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Авто Ethernet"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet желілері (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet желісі (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet желілері"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet желісі"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Сіз ethernet желісіне байланысқансыз."
 
-#: ../src/applet-device-ethernet.c:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "'%s' ethernet желілік байланысын дайындау..."
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "'%s' ethernet желілік байланысын баптау..."
 
-#: ../src/applet-device-ethernet.c:169
+#: ../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:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' үшін ethernet желілік адресін сұрау..."
 
-#: ../src/applet-device-ethernet.c:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "'%s' ethernet желілік байланысы белсенді"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL аутентификациясы"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Жасырын Wi-Fi же_лісіне байланысу..."
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Жаңа Wi-Fi желісін жа_сау..."
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ешнәрсе)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi желілері (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi желісі (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi желі(лер)"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi сөндірілген"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi құрылғы қосқышымен сөндірілген"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Көбірек желілер"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi желілері қолжетерлік"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Wi-Fi желісіне байланысты орнату үшін желі мәзірін қолданыңыз"
 
-#: ../src/applet-device-wifi.c:1237
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Сіз '%s' Wi-Fi желісіне байланыс орнаттыңыз."
 
-#: ../src/applet-device-wifi.c:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "'%s' Wi-Fi желілік байланысын дайындау..."
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "'%s' Wi-Fi желі байланысын баптау..."
 
-#: ../src/applet-device-wifi.c:1275
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "'%s' Wi-Fi желісі үшін пайдаланушы аутентификациясы керек..."
 
-#: ../src/applet-device-wifi.c:1278
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "'%s' үшін Wi-Fi желілік адресті сұрау..."
 
-#: ../src/applet-device-wifi.c:1289
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "'%s' Wi-Fi желілік байланысы белсенді: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "'%s' Wi-Fi желілік байланысы белсенді"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Байланысты белсендіру мүмкін емес"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Жаңа байланысты қосу мүмкін емес"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Байланыс ақпаратын көрсету сәтсіз:"
 
-#: ../src/applet-dialogs.c:75 ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Динамикалық WEP"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Көбірек адрестер"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (бастапқы)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мб/с"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Белгісіз"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Белгісіз"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "IP адресі:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Кең таратылым адресі:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Белгісіз"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Ішкі желі маскасы:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Жалпы"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Құрылғы адресі:"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Драйвер:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Жылдамдық:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Қауіпсіздік:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Бастапқы маршрут:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Елемеу"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN түрі:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN шлюзі:"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN пайд. аты:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN баннері:"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Негізгі байланыс:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Белгісіз"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Дұрыс белсенді байланыстар табылмады!"
 
-#: ../src/applet-dialogs.c:977
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -910,43 +902,43 @@ msgstr ""
 "және көптеген басқа қоғамдастық үлес қосушылары\n"
 "және аудармашылар"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Желілің құрылғылар мен байланыстарды басқару үшін хабарлау аймағының апплеті."
 
-#: ../src/applet-dialogs.c:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager веб сайты"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Ресурстар жоқ"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Мобильді кеңжолақты желісінің паролі"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' үшін байланыс орнату паролі керек."
 
-#: ../src/applet-dialogs.c:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM үшін PIN босатуы керек"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "SIM үшін PIN босатуы керек"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -955,25 +947,25 @@ msgstr ""
 "'%s' мобильді кеңжолақты құрылғысын қолдану алдында оған SIM PIN коды керек."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN коды:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "PIN кодын көрсету"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM үшін PUK босатуы керек"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "SIM үшін PUK босатуы керек"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -982,22 +974,22 @@ msgstr ""
 "'%s' мобильді кеңжолақты құрылғысын қолдану алдында оған SIM PUK коды керек."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK коды:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Жаңа PIN коды:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Жаңа PIN кодын қайталау:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK кодтарын көрсету"
 
@@ -1038,7 +1030,7 @@ msgstr "Қо_су"
 #: ../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:697
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "Ө_шіру"
 
@@ -1135,7 +1127,7 @@ 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:5
-#: ../src/connection-editor/nm-connection-list.c:681
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "Түз_ету"
 
@@ -1248,57 +1240,57 @@ msgstr ""
 msgid "_Aging time:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "автоматты"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "бастапқы"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "MAC адресі"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "Құрылғылық адресі"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:482
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:483
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "құрылғы"
 
-#: ../src/connection-editor/ce-page.c:589
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 
@@ -1508,8 +1500,8 @@ 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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1521,8 +1513,8 @@ msgstr "_Пароль:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Автоматты"
@@ -1603,35 +1595,39 @@ msgid "De_fault"
 msgstr "Ба_стапқы"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Елемеу"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "К_ең таратылым"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
-#| msgid "_Private key password:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1673,8 +1669,8 @@ msgstr "Автоматты, DNS баптаулары қолмен көрсеті
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Қолмен"
 
@@ -1685,8 +1681,8 @@ 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:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Басқа компьютерлермен бөліскен"
 
@@ -1720,15 +1716,15 @@ msgstr ""
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "І_здеу домендері:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "DNS _серверлері:"
 
@@ -1754,7 +1750,7 @@ msgid "_Routes…"
 msgstr "_Маршруттар…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Сөндірулі"
 
@@ -1893,11 +1889,13 @@ msgid "_Parent interface:"
 msgstr "_Аталық интерфейсі:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN интерфейсінің _аты:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "Кл_ондалған MAC адресі:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
@@ -1920,13 +1918,17 @@ msgstr ""
 msgid "_Loose binding"
 msgstr ""
 
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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:12
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
 msgid "Device name + number"
 msgstr "Құрылғы аты + нөмірі"
 
 #. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
-#: ../src/connection-editor/ce-page-vlan.ui.h:14
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + нөмірі"
 
@@ -1986,7 +1988,7 @@ msgstr ""
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
@@ -2040,188 +2042,188 @@ msgid ""
 "methods.  If connections fail, try disabling support for some methods."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:110
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Агрегацияланған (Team)"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Көпір"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:591 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Құрылғы"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Виртуалды"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Сақталған VPN баптауын импорттау..."
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Жаңа байланысты жасау мүмкін емес"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Байланысты өшіру мүмкін емес"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "%s байланысын өшіруді шынымен қалайсыз ба?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Адрес"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Желілік маскасы"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Метрика"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Префикс"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "%s түзету"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Атаусыз байланысты түзету"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Байланыс аты жоқ"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Түзеткіш іске қосылуда..."
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "Байланысты түзету мүмкін емес"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Сақтау"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Бұл байланысқа жасалған өзгерістерді сақтау."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Бұл машинадағы барлық пайдаланушылары үшін сақтауға аутентификациядан өту."
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Байланысты жасау мүмкін емес"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Байланысты түзету мүмкін емес"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Түзеткішті іске қосу қатесі"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Байланысты қосу сәтсіз"
 
@@ -2237,154 +2239,156 @@ msgstr "Байланыс а_ты:"
 msgid "_Export..."
 msgstr "_Экспорт..."
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "ешқашан"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "қазір"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d минут бұрын"
 
-#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d сағат бұрын"
 
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d күн бұрын"
 
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ай бұрын"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d жыл бұрын"
 
-#: ../src/connection-editor/nm-connection-list.c:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Аты"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Соңғы рет қолданылған"
 
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Таңдалған байланысты түзету"
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Таңдалған байланысты түзету үшін аутентификациядан өтіңіз"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Таңдалған байланысты өшіру"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Таңдалған байланысты өшіру үішн аутентификациядан өтіңіз"
 
-#: ../src/connection-editor/nm-connection-list.c:924
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "'%s' байланыстарын жасау жолы белгісіз"
 
-#: ../src/connection-editor/nm-connection-list.c:928
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Байланысты жасау қатесі"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Байланысты түзету қатесі"
 
-#: ../src/connection-editor/nm-connection-list.c:951
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID '%s' байланысы табылмады"
 
-#: ../src/connection-editor/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x қауіпсіздігі"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "802.1x қауіпсіздігінің пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-8021x-security.c:128
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Бұл байланыс үшін 802.1X қауіпсі_здігін қолдану"
 
-#: ../src/connection-editor/page-bluetooth.c:112
+#: ../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
 msgid "Could not load Bluetooth user interface."
 msgstr "Bluetooth пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-bluetooth.c:150
-msgid "bdaddr"
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:228
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth байланысы %d"
 
-#: ../src/connection-editor/page-bluetooth.c:272
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Bluetooth түрі"
 
-#: ../src/connection-editor/page-bluetooth.c:290
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:295
-#| msgid "Ethernet Network"
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:300
-#| msgid "Wi-Fi Network"
-#| msgid_plural "Wi-Fi Networks"
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:568
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "біріншілік"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr ""
@@ -2392,84 +2396,84 @@ msgstr ""
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "DCB пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL байланысы %d"
 
-#: ../src/connection-editor/page-ethernet.c:77
+#: ../src/connection-editor/page-ethernet.c:74
 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:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Ethernet пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-ethernet.c:447
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Ethernet құрылғысы"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:736
-#: ../src/connection-editor/page-wifi.c:583
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "клондалған MAC"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Бастапқы"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD іске қосылған емес."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Жалпы пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2477,179 +2481,179 @@ msgid ""
 "(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)\""
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 msgid "infiniband device"
 msgstr "infiniband құрылғысы"
 
-#: ../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-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Автоматты (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Автоматты (VPN), тек адрестер"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Автоматты, тек адрестер"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Автоматты (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Автоматты (PPPoE), тек адрестер"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Автоматты (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Автоматты (DHCP), тек адрестер"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Тек Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Қосымша DNS _серверлері:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Қосымша і_здеу домендері:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s үшін IPv4 маршруттарын түзету"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 баптаулары"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "\"%s\" IPv4 адресі жарамсыз"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "\"%s\" IPv4 адрестің желілік маскасы жарамсыз"
 
-#: ../src/connection-editor/page-ip4.c:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "\"%s\" IPv4 шлюзі жарамсыз"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "\"%s\" IPv4 DNS сервері жарамсыз"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Елемеу"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Автоматты, тек DHCP"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s үшін IPv6 маршруттарын түзету"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 баптаулары"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "\"%s\" IPv6 адресі жарамсыз"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "\"%s\" IPv6 адрес префиксі жарамсыз"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "\"%s\" IPv6 шлюзі жарамсыз"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "\"%s\" IPv6 DNS сервері жарамсыз"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:262
+#: ../src/connection-editor/page-master.c:260
 #, 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:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr ""
 "Мобильді кеңжолақты байланыстардың пайдаланушы интерфейсін жүктеу мүмкін "
 "емес."
 
-#: ../src/connection-editor/page-mobile.c:330
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Қолдауы жоқ мобильді кеңжолақты байланыс түрі."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Мобильді кеңжолақты провайдер түрін таңдаңыз"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2657,87 +2661,87 @@ msgstr ""
 "Сіздің мобильді кеңжолақты провайдеріңіз қолданатын технологияны таңдаңыз. "
 "Білмесеңіз, провайдеріңізден сұраңыз."
 
-#: ../src/connection-editor/page-mobile.c:564
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Менің провайдерім GSM не_гізіндегі технологияны қолдануда (мыс. GPRS, EDGE, "
 "UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Менің провайдерім CDMA негізін_дегі технологияны қолдануда (мыс. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ешнәрсе"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../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:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP баптаулары"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Импорттау үшін файлды таңдаңыз"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:272
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Агрегацияланған (Team) пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Агрегацияланған (Team) байланысы %d"
@@ -2745,11 +2749,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:154
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Агрегацияланған (Team) порты"
 
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:153
 msgid "Could not load team port user interface."
 msgstr ""
 "Агрегацияланған (Team) порттың пайдаланушы интерфейсін жүктеу мүмкін емес."
@@ -2757,151 +2761,151 @@ 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:416
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (\"%s\" арқылы)"
 
-#: ../src/connection-editor/page-vlan.c:428
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
 msgid "New connection..."
 msgstr "Желілік байланыс..."
 
-#: ../src/connection-editor/page-vlan.c:593
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Vlan пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-vlan.c:729
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:792
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN байланысы %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' үшін VPN плагин қызметі табылмады."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN байланысы %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
 "Error: no VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "VPN байланысының түрін таңдаңыз"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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:80
+#: ../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:91
+#: ../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:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u МГц)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Wi-Fi пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-wifi.c:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:579
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Wi-Fi құрылғысы"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi байланысы %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 биттік кілттік фразасы"
 
-#: ../src/connection-editor/page-wifi-security.c:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "Динамикалы WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 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:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi қауіпсіздігі"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Wi-Fi қауіпсіздігінің пайдаланушы интерфейсін жүктеу мүмкін емес."
 
-#: ../src/connection-editor/page-wifi-security.c:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN байланысын импорттау мүмкін емес"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2914,29 +2918,29 @@ msgstr ""
 "\n"
 "Қате: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "белгісіз қате"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" аты бар файл бар болып тұр."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "А_лмастыру"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN байланысын экспорттау мүмкін емес"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2947,11 +2951,11 @@ msgstr ""
 "\n"
 "Қате: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN байланысын экспорттау..."
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -2975,32 +2979,32 @@ msgstr "Байланыс ақпараты"
 msgid "Active Network Connections"
 msgstr "Белсенді желілік байланыстары"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../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:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../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:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3009,28 +3013,28 @@ msgid ""
 "Preferences menu."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Тізілмеген"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../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:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3038,217 +3042,217 @@ msgid ""
 "If you are unsure of your plan please ask your provider for your plan's APN."
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../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.c:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Провайдер"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Провайдер:"
 
-#: ../src/libnma/nma-mobile-wizard.c:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../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:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../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:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../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:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../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:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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 ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Сізге келесі ақпарат керек болады:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../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.c:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Бұ_л мобильді кеңжолақты құрылғы үшін байланысты жасау:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../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.c:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Жаңа мобильді кеңжолақты байланысы"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../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:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../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:55 ../src/libnm-gtk/nm-ui-utils.c:620
+#: ../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:56 ../src/libnm-gtk/nm-ui-utils.c:621
+#: ../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:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../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.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "Ү_шіншілік пароль:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
+#: ../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:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Байланысу үшін шертіңіз"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Жаңа..."
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "Жаса_у"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, 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:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi желі аутентификациясы керек"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi желісі үшін аутентификация керек"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Жаңа Wi-Fi желісін жасау"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Жаңа Wi-Fi желісі"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Жасалатын Wi-Fi желісінің атын енгізіңіз."
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Жасырын Wi-Fi желісіне байланысу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Жасырын Wi-Fi желісі"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3268,23 +3272,23 @@ msgstr "Ба_йланыс:"
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi _құрылғысы:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../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:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3294,17 +3298,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Қолданылуы:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3312,158 +3316,158 @@ msgstr ""
 "Бұл бағдарлама NetworkManager құрамасы болып табылады (https://wiki.gnome."
 "org/Projects/NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../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:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "іске қосылмаған"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "тіркелмеген"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Үй желісі (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Үй желісі"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "іздеу"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "тіркелу тайдырылған"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роуминг)"
 
-#: ../src/mb-menu-item.c:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Роуминг желісі (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Роуминг желісі"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr ""
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN коды керек"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Мобильді кеңжолақты құрылғы үшін PIN коды керек"
 
-#: ../src/mobile-helpers.c:610
+#: ../src/mobile-helpers.c:619
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "'%s' мобильді кеңжолақты байланысы белсенді: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "роуминг"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s байланысы"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:452
 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:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER не PEM сертификаттары (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "PAC файлын таңдаңыз..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC файлдары (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Барлық файлдар"
 
@@ -3499,32 +3503,32 @@ msgstr "І_шкі аутентификация:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../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:69
+#: ../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:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Сертификаттау орталығының сертификатын таңдаңыз..."
 
@@ -3552,47 +3556,46 @@ msgstr "CA сертификаты керек е_мес"
 msgid "PEAP _version:"
 msgstr "_PEAP нұсқасы:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
-#| msgid "C_A certificate:"
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "Жарамсыз EAP-TLS СО сертификаты: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Шифрленбеген жеке кілттері қауіпсіз емес болады"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3606,11 +3609,11 @@ msgstr ""
 "\n"
 "(Сіз жеке кілтіңізді openssl көмегімен парольмен қорғай аласыз)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Жеке сертификатыңызды таңдаңыз..."
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Жеке кілтіңізді таңдаңыз..."
 
@@ -3630,36 +3633,36 @@ msgstr "Жеке _кілт:"
 msgid "_Private key password:"
 msgstr "Ж_еке кілт паролі:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../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:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1x security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Туннельденген TLS"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Қорғалған EAP (PEAP)"
 
@@ -3669,11 +3672,11 @@ msgstr "Қорғалған EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Аутент_ификация:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
@@ -3704,7 +3707,7 @@ msgid "invalid wep-key: passphrase must be non-empty"
 msgstr ""
 
 #: ../src/wireless-security/ws-wep-key.c:133
-msgid "invalid wep-key: passphrase must be shorter then 64 characters"
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr ""
 
 #: ../src/wireless-security/ws-wep-key.ui.h:1
@@ -3731,14 +3734,14 @@ msgstr "Кіл_тті көрсету"
 msgid "WEP inde_x:"
 msgstr ""
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, 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:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
@@ -3746,6 +3749,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Түрі:"
 
+#~ msgid "_Help"
+#~ msgstr "Кө_мек"
+
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "WiMAX моб_ильді кеңжолақты желіні іске қосу"
 
diff --git a/po/km.po b/po/km.po
index 887b5e37..9b2b0bcf 100644
--- a/po/km.po
+++ b/po/km.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: po_nm-applet-km\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-04-21 21:56+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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,7 +21,7 @@ msgstr ""
 "X-Generator: WordForge 0.8 RC1\n"
 "X-Language: km-KH\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "បណ្ដាញ"
 
@@ -80,9 +80,7 @@ msgstr "តែម"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:10
 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 WiFi Create"
@@ -99,8 +97,7 @@ msgstr "បង្ហាញ​អាប់ភ្លេត​នៅ​ក្នុ
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:14
 msgid "Set to FALSE to disable displaying the applet in the notification area."
-msgstr ""
-"កំណត់​ទៅ​មិន​ពិត ដើម្បី​បិទ​ការ​បង្ហាញ​អាប់ភ្លេត​នៅ​ក្នុង​តំបន់​ជូន​ដំណឹង។"
+msgstr "កំណត់​ទៅ​មិន​ពិត ដើម្បី​បិទ​ការ​បង្ហាញ​អាប់ភ្លេត​នៅ​ក្នុង​តំបន់​ជូន​ដំណឹង។"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
@@ -110,180 +107,234 @@ msgstr "មិន​អើពើ​វិញ្ញាបនបត្រ CA"
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
-msgstr ""
-"កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ព្រមាន​អំពី​វិញ្ញាបនបត្រ CA "
-"នៅ​ក្នុង​ការ​ផ្ទៀងផ្ទាត់ EAP ។"
+msgstr "កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ព្រមាន​អំពី​វិញ្ញាបនបត្រ CA នៅ​ក្នុង​ការ​ផ្ទៀងផ្ទាត់ EAP ។"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
-"កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ព្រមាន​អំពី​វិញ្ញាបនបត្រ CA "
-"នៅ​ក្នុង​ដំណាក់កាល​ទី ២ នៃ​ការ​ផ្ទៀងផ្ទាត់ EAP ។"
+"កំណត់​វា​ទៅ​ពិត​ដើម្បី​បិទ​ការ​ព្រមាន​អំពី​វិញ្ញាបនបត្រ CA នៅ​ក្នុង​ដំណាក់កាល​ទី ២ នៃ​ការ​ផ្ទៀងផ្ទាត់ EAP ។"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "អាប់ភ្លេត NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "អាប់ភ្លេត NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "ការ​ផ្ទៀងផ្ទាត់ 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+#, fuzzy
+msgid "C_onnect"
+msgstr "បាន​តភ្ជាប់"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "ឈ្មោះ​បណ្ដាញ៖"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr "បណ្ដោះ​អាសន្ន"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr "សុវត្ថិភាព ។"
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម/ធ្វើឲ្យ​ការ​តភ្ជាប់​សកម្ម"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "មិន​ស្គាល់​កំហុស"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "ការ​តភ្ជាប់​បាន​បរាជ័យ"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ផ្ដាច់​ឧបករណ៍"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "ការ​ផ្ដាច់​បាន​បរាជ័យ"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ធ្វើឲ្យ​ការ​តភ្ជាប់​សកម្ម"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "កុំ​បង្ហាញ​សារ​នេះ​ម្ដងទៀត"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the network connection was "
 "interrupted."
 msgstr ""
-"\nការ​​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ "
-"ដោយសារ​ការ​តភ្ជាប់​បណ្ដាញ​ត្រូវ​បាន​កាត់​ជាប់​គាំង។"
+"\n"
+"ការ​​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​ការ​តភ្ជាប់​បណ្ដាញ​ត្រូវ​បាន​កាត់​ជាប់​គាំង។"
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 msgstr ""
-"\nការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN "
-"ត្រូវ​បាន​បញ្ឈប់​ដោយ​មិន​បាន​រំពឹង។"
+"\n"
+"ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN ត្រូវ​បាន​បញ្ឈប់​ដោយ​មិន​បាន​រំពឹង។"
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service returned invalid "
 "configuration."
 msgstr ""
-"\nការ​​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN "
-"បាន​បញ្ជូន​ត្រឡប់​នូវ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ដែល​មិន​ត្រឹមត្រូវ។"
+"\n"
+"ការ​​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN បាន​បញ្ជូន​ត្រឡប់​នូវ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ដែល​មិន​"
+"ត្រឹមត្រូវ។"
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the connection attempt timed out."
-msgstr "\nការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​អស់​ពេល​ក្នុង​ការ​តភ្ជាប់។"
+msgstr ""
+"\n"
+"ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​អស់​ពេល​ក្នុង​ការ​តភ្ជាប់។"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service did not start in time."
 msgstr ""
-"\nការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN "
-"មិន​បាន​ចាប់ផ្ដើម​ទាន់ពេលវេលា។"
+"\n"
+"ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN មិន​បាន​ចាប់ផ្ដើម​ទាន់ពេលវេលា។"
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service failed to start."
 msgstr ""
-"\nការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN "
-"បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម។"
+"\n"
+"ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម។"
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because there were no valid VPN secrets."
 msgstr ""
-"\nការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារមិន​មាន​ពាក្យសម្ងាត់ VPN "
-"​ត្រឹមត្រូវ។"
+"\n"
+"ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារមិន​មាន​ពាក្យសម្ងាត់ VPN ​ត្រឹមត្រូវ។"
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because of invalid VPN secrets."
 msgstr ""
-"\nការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​ពាក្យសម្ងាត់ VPN មិន​ត្រឹមត្រូវ។"
+"\n"
+"ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​ពាក្យសម្ងាត់ VPN មិន​ត្រឹមត្រូវ។"
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed."
-msgstr "\nការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ។"
+msgstr ""
+"\n"
+"ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ។"
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected because the network connection was "
 "interrupted."
 msgstr ""
-"\nការ​តភ្ជាប់ VPN '%s' បាន​ដាច់ "
-"ដោយសារ​ការ​តភ្ជាប់​បណ្ដាញ​ត្រូវ​បាន​ជាប់​គាំង។"
+"\n"
+"ការ​តភ្ជាប់ VPN '%s' បាន​ដាច់ ដោយសារ​ការ​តភ្ជាប់​បណ្ដាញ​ត្រូវ​បាន​ជាប់​គាំង។"
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected because the VPN service stopped."
-msgstr "\nការ​តភ្ជាប់ VPN '%s' បាន​ដាច់ ដោយសារ​សេវា VPN ត្រូវ​បាន​បញ្ឈប់។"
+msgstr ""
+"\n"
+"ការ​តភ្ជាប់ VPN '%s' បាន​ដាច់ ដោយសារ​សេវា VPN ត្រូវ​បាន​បញ្ឈប់។"
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected."
-msgstr "\nការ​តភ្ជាប់ VPN '%s' ត្រូវ​បាន​ដាច់។"
+msgstr ""
+"\n"
+"ការ​តភ្ជាប់ VPN '%s' ត្រូវ​បាន​ដាច់។"
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
 "\n"
 "%s\n"
-msgstr "បាន​បង្កើត​ការ​តភ្ជាប់ VPN ដោយ​ជោគជ័យ។\n\n%s\n"
+msgstr ""
+"បាន​បង្កើត​ការ​តភ្ជាប់ VPN ដោយ​ជោគជ័យ។\n"
+"\n"
+"%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "បាន​បង្កើត​ការ​តភ្ជាប់ VPN ដោយ​ជោគជ័យ។\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "សារ​ចូល VPN"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់ VPN"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -291,910 +342,605 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"\nការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN មិន​អាច​ចាប់ផ្ដើម​បាន។\n\n"
+"\n"
+"ការ​តភ្ជាប់ VPN '%s' បាន​បរាជ័យ ដោយសារ​សេវា VPN មិន​អាច​ចាប់ផ្ដើម​បាន។\n"
+"\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed to start.\n"
 "\n"
 "%s"
-msgstr "\nបាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម​ការ​តភ្ជាប់ VPN '%s' ។\n\n%s"
+msgstr ""
+"\n"
+"បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម​ការ​តភ្ជាប់ VPN '%s' ។\n"
+"\n"
+"%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "ឧបករណ៍​មិន​ទាន់​រួចរាល់ (បាត់​កម្មវិធី​ប​ង្កប់)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "ឧបករណ៍​មិន​ទាន់​រួចរាល់"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "បាន​ផ្ដាច់"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "ផ្ដាច់"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "មិន​បាន​គ្រប់គ្រង​ឧបករណ៍"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "មិនមាន​ឧបករណ៍​បណ្ដាញ"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "ការ​តភ្ជាប់ VPN"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "កំណត់​រចនាសម្ព័ន្ធ VPN..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "ផ្ដាច់ VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager មិន​ដំណើរការ..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2940
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "បាន​បិទ​ការ​តភ្ជាប់​បណ្ដាញ"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "បើក​ការ​តភ្ជាប់​បណ្ដាញ"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "បើក​វ៉ាយហ្វាយ"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "បើក​រលកអាកាស​ចល័ត"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "បើក​រលក​អាកាស​ចល័ត WiMA_X"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "បើក​ការ​ជូនដំណឹង"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "ព័ត៌មាន​ការ​តភ្ជាប់"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "កែសម្រួល​ការ​តភ្ជាប់..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "ជំនួយ"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "អំពី"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "ឥឡូវនេះ អ្នក​បាន​តភ្ជាប់​ទៅ '%s' ។"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "បាន​ផ្ដាច់"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "តំណ​ភ្ជាប់​បណ្ដាញ​ត្រូវ​បាន​ផ្ដាច់។"
 
-#: ../src/applet.c:2802
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "កំពុង​រៀបចំ​តភ្ជាប់​បណ្ដាញ '%s'..."
 
-#: ../src/applet.c:2805
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
-msgstr ""
-"បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​បណ្ដាញ '%s'..."
+msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​បណ្ដាញ '%s'..."
 
-#: ../src/applet.c:2808 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "កំពុង​ស្នើ​សុំ​អាសយដ្ឋាន​បណ្ដាញ​សម្រាប់ '%s'..."
 
-#: ../src/applet.c:2811
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ការ​តភ្ជាប់​បណ្ដាញ '%s' សកម្ម"
 
-#: ../src/applet.c:2894
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "កំពុង​ចាប់ផ្ដើម​តភ្ជាប់ VPN '%s'..."
 
-#: ../src/applet.c:2897
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់ VPN  '%s'..."
 
-#: ../src/applet.c:2900
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "កំពុង​ស្នើសុំ​អាសយដ្ឋាន VPN សម្រាប់ '%s'..."
 
-#: ../src/applet.c:2903
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "ការ​តភ្ជាប់ VPN '%s' សកម្ម"
 
-#: ../src/applet.c:2945
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "មិនមាន​ការ​តភ្ជាប់​បណ្ដាញ"
 
-#: ../src/applet.c:3615
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "អាប់ភ្លេត NetworkManager"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:765 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "មាន"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:792 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "បាន​បង្កើត​ការ​តភ្ជាប់"
-
-#: ../src/applet-device-bond.c:90
-#| msgid "You are now connected to the GSM network."
-msgid "You are now connected to the bonded network."
-msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ bonded ។"
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing bond connection '%s'..."
-msgstr "កំពុង​រៀបចំ​ការ​តភ្ជាប់ bond '%s'..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-#| msgid "Configuring mobile broadband connection '%s'..."
-msgid "Configuring bond connection '%s'..."
-msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់ bond '%s'..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for bond connection '%s'..."
-msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់ bond '%s'..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-#| msgid "Requesting a VPN address for '%s'..."
-msgid "Requesting address for '%s'..."
-msgstr "កំពុង​ស្នើសុំ​អាសយដ្ឋាន​សម្រាប់ '%s'..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Bond connection '%s' active"
-msgstr "ការ​តភ្ជាប់ bond '%s' សកម្ម"
-
-#: ../src/applet-device-bridge.c:90
-#| msgid "You are now connected to the WiMAX network."
-msgid "You are now connected to the bridged network."
-msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ​ប្រ៊ីដ្យ។"
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing bridge connection '%s'..."
-msgstr "កំពុង​រៀបចំ​តភ្ជាប់​បណ្ដាញ​ប្រ៊ីដ្យ '%s'..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-#| msgid "Configuring Wi-Fi network connection '%s'..."
-msgid "Configuring bridge connection '%s'..."
-msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់​ប្រ៊ីដ្យ '%s'..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for bridge connection '%s'..."
-msgstr ""
-"បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​ប្រ៊ីដ្យ '%s'..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Bridge connection '%s' active"
-msgstr "ការ​តភ្ជាប់​ប្រ៊ីដ្យ '%s' សកម្ម"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "កូដ PUK មិន​ត្រឹមត្រូវ សូម​ទាក់ទង​ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក។"
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "កំពុង​ផ្ញើ​កូដ​ដោះសោ..."
 
-#: ../src/applet-device-broadband.c:711 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:421
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "រលកអាកាស​ចល័ត (%s)"
 
-#: ../src/applet-device-broadband.c:713 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "រលកអាកាស​ចល័ត"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "មាន"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:778
-#| msgid "New Mobile Broadband Connection"
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ថ្មី..."
 
-#: ../src/applet-device-broadband.c:793
-#| msgid "You are now connected to the mobile broadband network."
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "បាន​បង្កើត​ការ​តភ្ជាប់"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅកាន់​បណ្ដាញ​រលក​អាកាស​ចល័ត។"
 
-#: ../src/applet-device-broadband.c:928 ../src/applet-device-broadband.c:934
-#| msgid "Mobile broadband network password"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "បណ្ដាញ​រលកអាកាស​ចល័ត"
 
-#: ../src/applet-device-broadband.c:929 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "ឥឡូវនេះ​អ្នក​បាន​ចុះឈ្មោះ​នៅ​លើ​បណ្ដាញ​ផ្ទះ។"
 
-#: ../src/applet-device-broadband.c:935 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "ឥឡូវនេះ​អ្នក​បាន​ចុះឈ្មោះ​នៅ​លើ​បណ្ដាញ​រ៉ូមីង។"
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "ឥឡូវនេះ អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ​រលក​អាកាស​ចល័ត។"
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "កំពុង​រៀបចំ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%s'..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%s'..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr ""
-"បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%"
-"s'..."
+msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%s'..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%s' សកម្ម"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "ការ​តភ្ជាប់ រលកអាកាស​ចល័ត​ថ្មី (CDMA)..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "ឥឡូវនេះ អ្នក​​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ CDMA ។"
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "បណ្ដាញ CDMA ។"
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "អ៊ីសឺរណិត​ស្វ័យប្រវត្តិ"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "បណ្ដាញ​អ៊ីសឺរណិត (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "បណ្ដាញ​អ៊ីសឺរណិត (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "បណ្ដាញ​អ៊ីសឺរណិត"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "បណ្ដាញ​អ៊ីសឺរណិត"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ​អ៊ីសឺរណិត។"
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "កំពុង​​រៀប​ចំ​ការ​តភ្ជាប់​បណ្ដាញ​អ៊ីសឺរណិត '%s'..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់​បណ្ដាញ​អ៊ីសឺរណិត '%s'..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
-msgstr ""
-"បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​បណ្ដាញ​អ៊ីសឺរណិត "
-"'%s'..."
+msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​បណ្ដាញ​អ៊ីសឺរណិត '%s'..."
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "កំពុង​ស្នើសុំ​​អាសយដ្ឋាន​បណ្ដាញ​អ៊ីសឺរណិត​សម្រាប់ '%s'..."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "ការ​តភ្ជាប់​បណ្ដាញ​អ៊ីសឺរណិត '%s' សកម្ម"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "ការ​ផ្ទៀងផ្ទាត់ DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ថ្មី (GSM) .."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ GSM ។"
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "បណ្ដាញ GSM ។"
-
-#: ../src/applet-device-infiniband.c:40
-#| msgid "InfiniBand"
-msgid "Auto InfiniBand"
-msgstr "InfiniBand ស្វ័យប្រវត្តិ"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-#| msgid "Wi-Fi Networks (%s)"
-msgid "InfiniBand Networks (%s)"
-msgstr "បណ្ដាញ InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-#| msgid "Wi-Fi Network (%s)"
-msgid "InfiniBand Network (%s)"
-msgstr "បណ្ដាញ InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-#| msgid "InfiniBand"
-msgid "InfiniBand Networks"
-msgstr "បណ្ដាញ InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-#| msgid "InfiniBand"
-msgid "InfiniBand Network"
-msgstr "បណ្ដាញ InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-#| msgid "You are now connected to the WiMAX network."
-msgid "You are now connected to the InfiniBand network."
-msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ InfiniBand ។"
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "កំពុង​រៀបចំ​ការ​តភ្ជាប់ InfiniBand '%s'..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-#| msgid "Configuring Wi-Fi network connection '%s'..."
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់ InfiniBand '%s'..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr ""
-"បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់ InfiniBand '%"
-"s'..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-#| msgid "InfiniBand connection %d"
-msgid "InfiniBand connection '%s' active"
-msgstr "ការ​តភ្ជាប់ InfiniBand '%s' សកម្ម"
-
-#: ../src/applet-device-team.c:86
-#| msgid "You are now connected to the ethernet network."
-msgid "You are now connected to the teamed network."
-msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ​ជា​ក្រុម។"
-
-#: ../src/applet-device-team.c:110
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing team connection '%s'..."
-msgstr "កំពុង​រៀបចំ​តភ្ជាប់​ជា​ក្រុម '%s'..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-#| msgid "Configuring Wi-Fi network connection '%s'..."
-msgid "Configuring team connection '%s'..."
-msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់​ជា​ក្រុម '%s'..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for team connection '%s'..."
-msgstr ""
-"បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​ជា​ក្រុម '%s'..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Team connection '%s' active"
-msgstr "ការ​តភ្ជាប់​ជា​ក្រុម '%s' សកម្ម"
-
-#: ../src/applet-device-vlan.c:204
-#| msgid "You are now connected to the CDMA network."
-msgid "You are now connected to the VLAN."
-msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ VLAN ។"
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-#| msgid "Starting VPN connection '%s'..."
-msgid "Preparing VLAN connection '%s'..."
-msgstr "កំពុង​កំណត់​ការ​តភ្ជាប់ VLAN '%s'..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-#| msgid "Starting VPN connection '%s'..."
-msgid "Configuring VLAN connection '%s'..."
-msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់ VLAN '%s'..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់ VLAN '%s'..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "VLAN connection '%s' active"
-msgstr "ការ​តភ្ជាប់ VLAN '%s' សកម្ម"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "កំពុង​តភ្ជាប់​ទៅ​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​​លាក់..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "បង្កើត​បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(គ្មាន)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "បណ្ដាញ​វ៉ាយហ្វាយ (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "បណ្ដាញ​វ៉ាយហ្វាយ (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "បាន​បិទ​វ៉ាយហ្វាយ"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "វ៉ាយហ្វាយត្រូវ​បាន​បិទ​ដោយ​កុងតាក់​ផ្នែក​រឹង"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "បណ្ដាញ​ជាច្រើនទៀត"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "មាន​បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ប្រើ​ម៉ឺនុយ​បណ្ដាញ​ដើម្បី​តភ្ជាប់​ទៅ​បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "ឥឡូវ​អ្នក​បាន​តភ្ជាប់​ទៅកាន់​បណ្ដាញ​វ៉ាយហ្វាយ '%s' ។"
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "កំពុង​រៀបចំ​ការ​តភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ '%s'..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ '%s'..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
-msgstr ""
-"បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ពី​អ្នកប្រើ​សម្រាប់​បណ្ដាញ​វ៉ាយហ្វាយ '%s'..."
+msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ពី​អ្នកប្រើ​សម្រាប់​បណ្ដាញ​វ៉ាយហ្វាយ '%s'..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "កំពុង​ស្នើ​សុំ​អាសយដ្ឋាន​បណ្ដាញ​សម្រាប់​សម្រាប់ '%s'..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "ការ​តភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ%s' សកម្ម ៖ %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "ការ​តភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ '%s' សកម្ម"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ធ្វើឲ្យ​ការ​តភ្ជាប់​សកម្ម"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម​ការ​តភ្ជាប់​ថ្មី"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "រលក​អាកាស​ចល័ត WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "រលក​អាកាស​ចល័ត WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX ត្រូវ​បានបិទ"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX ត្រូវ​បាន​បិទ​ដោយ​កុងតាក់​ផ្នែករឹង"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ WiMAX ។"
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%s' សកម្ម ៖ (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "រ៉ូមីង"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "កំហុស​ក្នុង​ការ​បង្ហាញ​ព័ត៌មាន​តភ្ជាប់៖"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:441
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP ថាមវន្ត"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "អាសយដ្ឋាន"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "គ្មាន"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (លំនាំដើម)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "មិនស្គាល់"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "មិនស្គាល់"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "អាសយដ្ឋាន IP ៖"
 
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "មិន​ស្គាល់"
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "អាសយដ្ឋាន​ផ្សាយ៖"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "មិនស្គាល់"
 
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "មិន​ស្គាល់"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Subnet Mask:"
 
-#: ../src/applet-dialogs.c:407
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "អ៊ឺសឺរណិត (%s)"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:423
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "ទូទៅ"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "ចំណុចប្រទាក់៖"
 
-#: ../src/applet-dialogs.c:449
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "អាសយដ្ឋាន​ផ្នែករឹង៖"
 
 #. Driver
-#: ../src/applet-dialogs.c:457
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "កម្មវិធី​បញ្ជា៖"
 
-#: ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "ល្បឿន៖"
 
-#: ../src/applet-dialogs.c:496
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "សុវត្ថិភាព៖"
 
-#: ../src/applet-dialogs.c:509
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:522
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
-msgid "IP Address:"
-msgstr "អាសយដ្ឋាន IP ៖"
-
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
-msgctxt "Address"
-msgid "Unknown"
-msgstr "មិនស្គាល់"
-
-#: ../src/applet-dialogs.c:566
-msgid "Broadcast Address:"
-msgstr "អាសយដ្ឋាន​ផ្សាយ៖"
-
-#. Prefix
-#: ../src/applet-dialogs.c:575
-msgid "Subnet Mask:"
-msgstr "Subnet Mask:"
-
-#: ../src/applet-dialogs.c:577
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "មិនស្គាល់"
-
-#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "ផ្លូវ​លំនាំដើម៖"
 
-#: ../src/applet-dialogs.c:597
-msgid "Primary DNS:"
-msgstr "DNS ទីមួយ៖"
-
-#: ../src/applet-dialogs.c:606
-msgid "Secondary DNS:"
-msgstr "DNS ទីពីរ៖"
-
-#: ../src/applet-dialogs.c:616
-msgid "Ternary DNS:"
-msgstr "DNS ទីបី៖"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:631
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "មិន​បាន​អើពើ"
 
-#: ../src/applet-dialogs.c:793
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "ប្រភេទ VPN ៖"
 
-#: ../src/applet-dialogs.c:800
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "ផ្លូវ​ចេញចូល VPN ៖"
 
-#: ../src/applet-dialogs.c:806
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "ឈ្មោះ​អ្នកប្រើ VPN ៖"
 
-#: ../src/applet-dialogs.c:812
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "ស្លាក VPN ៖"
 
-#: ../src/applet-dialogs.c:818
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "ការ​តភ្ជាប់គោល៖"
 
-#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "មិនស្គាល់"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:883
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "រក​មិន​ឃើញ​ការ​តភ្ជាប់​សកម្ម​ដែល​ត្រឹមត្រូវ!"
 
-#: ../src/applet-dialogs.c:911
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"រក្សាសិទ្ធិ​ឆ្នាំ ២០០៤-២០១១ ដោយ Red Hat, Inc.\nរក្សាសិទ្ធិ​ឆ្នាំ ២០០៥-២០០៨ "
-"ដោយ Novell, Inc.\nអ្នក​ចូលរួម និង​អ្នកបកប្រែ​របស់​សហគមន៍​ជាច្រើន​រូប​ទៀត"
+"រក្សាសិទ្ធិ​ឆ្នាំ ២០០៤-២០១១ ដោយ Red Hat, Inc.\n"
+"រក្សាសិទ្ធិ​ឆ្នាំ ២០០៥-២០០៨ ដោយ Novell, Inc.\n"
+"អ្នក​ចូលរួម និង​អ្នកបកប្រែ​របស់​សហគមន៍​ជាច្រើន​រូប​ទៀត"
 
-#: ../src/applet-dialogs.c:914
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr ""
-"អាប់ភ្លេត​តំបន់​ការ​ជូនដំណឹង​សម្រាប់​គ្រប់គ្រង​ឧបករណ៍​បណ្ដាញ "
-"និង​ការ​តភ្ជាប់​របស់​អ្នក។"
+msgstr "អាប់ភ្លេត​តំបន់​ការ​ជូនដំណឹង​សម្រាប់​គ្រប់គ្រង​ឧបករណ៍​បណ្ដាញ និង​ការ​តភ្ជាប់​របស់​អ្នក។"
 
-#: ../src/applet-dialogs.c:916
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "តំបន់បណ្ដាញ NetworkManager"
 
-#: ../src/applet-dialogs.c:931
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "បាត់​ធនធាន"
 
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "ពាក្យសម្ងាត់​របស់​បណ្ដាញ​រលកអាកាស​ចល័ត"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "បាន​ទាមទារ​ពាក្យសម្ងាត់​ដើម្បី​តភ្ជាប់​ទៅ '%s' ។"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "ពាក្យសម្ងាត់៖"
 
-#: ../src/applet-dialogs.c:1261
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "ទាមទារ​ការ​ដោះ​សោ SIM PIN"
 
-#: ../src/applet-dialogs.c:1262
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "ទាមទារ​ការ​ដោះ​សោ SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1264
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1202,25 +948,25 @@ msgid ""
 msgstr "ឧបករណ៍​រលកអាកាស​ចល័ត '%s' ទាមទារ​លេខ​កូដ SIM PIN ទើប​អាច​ប្រើ​បាន។"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1266
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "កូដ PIN ៖"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1270
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "បង្ហាញ​កូដ PIN"
 
-#: ../src/applet-dialogs.c:1272
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "ទាមទារ​ការ​ដោះ​សោ SIM PUK"
 
-#: ../src/applet-dialogs.c:1273
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "ទាមទារ​ការ​ដោះ​សោ SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1275
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1228,58 +974,85 @@ msgid ""
 msgstr "ឧបករណ៍​រលកអាកាស​ចល័ត '%s' ទាមទារ​លេខ​កូដ SIM PUK ទើប​អាច​ប្រើ​បាន។"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1277
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "កូដ PUK ៖"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1280
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "កូដ PIN ថ្មី៖"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1282
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "បញ្ចូល​កូដ PIN ថ្មី​ឡើងវិញ៖"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1287
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "បង្ហាញ​កូដ PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
 msgstr ""
-"អាសយដ្ឋាន IP កំណត់​អត្តសញ្ញាណ​កុំព្យូទ័រ​របស់​អ្នក​នៅ​លើ​បណ្ដាញ។ ចុច​ប៊ូតុង "
-"\"បន្ថែម\" ដើម្បី​បន្ថែម​អាសយដ្ឋាន IP ។"
+"អាសយដ្ឋាន IP កំណត់​អត្តសញ្ញាណ​កុំព្យូទ័រ​របស់​អ្នក​នៅ​លើ​បណ្ដាញ។ ចុច​ប៊ូតុង \"បន្ថែម\" ដើម្បី​បន្ថែម​"
+"អាសយដ្ឋាន IP ។"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "លុប"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "មិន​អើពើ​ផ្លូវ​ដែល​ទទួល​បាន​ដោយស្វ័យប្រវត្តិ"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "ប្រើ​ការ​តភ្ជាប់​នេះ​សម្រាប់​តែ​ធនធាន​នៅ​លើ​បណ្ដាញ​របស់​វា​ប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
-msgstr ""
-"ប្រសិនបើ​បើក "
-"ការ​តភ្ជាប់​នេះ​នឹង​មិន​ត្រូវ​បាន​ប្រើ​ជា​ការ​តភ្ជាប់​បណ្ដាញ​លំនាំដើម​ឡើយ។"
+msgstr "ប្រសិនបើ​បើក ការ​តភ្ជាប់​នេះ​នឹង​មិន​ត្រូវ​បាន​ប្រើ​ជា​ការ​តភ្ជាប់​បណ្ដាញ​លំនាំដើម​ឡើយ។"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1287,24 +1060,24 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "បង្កើត…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "ជ្រើស​ប្រភេទ​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
 "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."
 msgstr ""
-"ជ្រើស​ប្រភេទ​ការ​តភ្ជាប់​ដែល​អ្នក​ចង់​ប្រើ។\n\n "
-"ប្រសិនបើ​អ្នក​កំពុង​បង្កើត​ការ​តភ្ជាប់ VPN, ហើយ​ការ​តភ្ជាប់ VPN "
-"ដែល​អ្នក​ចង់​បង្កើត​មិន​មាន​នៅ​ក្នុង​បញ្ជី​ទេ "
+"ជ្រើស​ប្រភេទ​ការ​តភ្ជាប់​ដែល​អ្នក​ចង់​ប្រើ។\n"
+"\n"
+" ប្រសិនបើ​អ្នក​កំពុង​បង្កើត​ការ​តភ្ជាប់ VPN, ហើយ​ការ​តភ្ជាប់ VPN ដែល​អ្នក​ចង់​បង្កើត​មិន​មាន​នៅ​ក្នុង​បញ្ជី​ទេ "
 "អ្នក​ប្រហែល​ជា​មិន​បាន​ដំឡើង​កម្មវិធី​ជំនួយ VPN ដែល​ត្រឹមត្រូវ។"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
@@ -1348,143 +1121,187 @@ msgid "Bonded _connections:"
 msgstr "ការ​តភ្ជាប់ Bonded ៖"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
 msgstr "របៀប៖"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "កែសម្រួល"
-
-#. Delete
 #: ../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:703
-msgid "_Delete"
-msgstr "លុប"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "កែសម្រួល"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "ប្រេកង់​ត្រួតពិនិត្យ៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "ឈ្មោះ​ចំណុចប្រទាក់៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "ត្រួតពិនិត្យ​តំណ៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP _targets:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "ការ​ពន្យារពេល Link _up ៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "ការ​ពន្យារពេល Link _down ៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
-#| msgid "Primary DNS:"
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "ចម្បង៖"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
-msgstr ""
-"ឈ្មោះ​ចំណុច​ប្រទាក់​របស់​ឧបករណ៍​ច្បង។ បើ​បាន​កំណត់ "
-"ឧបករណ៍​នេះ​នឹង​ជា​កូនចៅ​សកម្ម​ជានិច្ច​ពេល​វា​មាន។"
+msgstr "ឈ្មោះ​ចំណុច​ប្រទាក់​របស់​ឧបករណ៍​ច្បង។ បើ​បាន​កំណត់ ឧបករណ៍​នេះ​នឹង​ជា​កូនចៅ​សកម្ម​ជានិច្ច​ពេល​វា​មាន។"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:17
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "បៃ"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "តម្លៃ​ផ្លូវ៖"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
-#| msgid "S_ecurity:"
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "សុវត្ថិភាព៖"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:3
-#| msgid "_Transport mode:"
 msgid "_Hairpin mode:"
 msgstr "របៀប​ដង្កៀប​សក់៖"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:1
-#| msgid "Bonded _connections:"
 msgid "Bridged _connections:"
 msgstr "ការ​តភ្ជាប់​ដែល​បាន​ចង៖"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
-#| msgid "Link _down delay:"
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "ការ​ពន្យារពេល​បញ្ជូន​បន្ត៖"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "ពេលវេលា​ស្វាគមន៍៖"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
-#| msgid "ms"
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "បើក​ការ​តភ្ជាប់​បណ្ដាញ"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "បើក STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "អាយុ​អតិប្បរមា៖"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "ពេលវេលា​ក្លាយ​ជា​ចាស់៖"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "លំនាំដើម"
 
-#: ../src/connection-editor/ce-page.c:359
-msgid "Failed to update connection secrets due to an unknown error."
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"បាន​បរាជ័យ​ក្នុង​ការ​ធ្វើ​បច្ចុប្បន្នភាព​តភ្ជាប់​សុវត្ថិភាព "
-"ដោយសារ​កំហុស​ដែល​មិន​ស្គាល់។"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "អាសយដ្ឋាន"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "អាសយដ្ឋាន"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "ឧបករណ៍​ណាមួយ"
+
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ធ្វើ​បច្ចុប្បន្នភាព​តភ្ជាប់​សុវត្ថិភាព ដោយសារ​កំហុស​ដែល​មិន​ស្គាល់។"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:1
-#| msgid "Use 802.1_X security for this connection"
 msgid "Use Data Center Bridging (DCB) for this connection"
 msgstr "ប្រើ Data Center Bridging (DCB) សម្រាប់​ការ​តភ្ជាប់​នេះ"
 
@@ -1509,7 +1326,6 @@ msgid "Feature"
 msgstr "លក្ខណៈ​ពិសេស"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:7
-#| msgid "Enable _Wi-Fi"
 msgid "Enable"
 msgstr "បើក"
 
@@ -1580,103 +1396,98 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "អាទិភាព​វត្ថុ​បញ្ជា​លំហូរ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "បិទ ឬ​បើក​អាទិភាព​ការ​បញ្ជូន​ផ្អាក​សម្រាប់​អាទិភាព​អ្នកប្រើ​នីមួយៗ។"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "អាទិភាព៖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-#| msgid "2"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-#| msgid "3"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-#| msgid "4"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "ថ្នាក់​ចរាចរ៖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "កម្រិត​បញ្ជូន​តឹងរ៉ឹង៖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "កម្រិត​បញ្ជូន​ងាទិភាព៖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "កម្រិត​បញ្ជូន​ក្រុម៖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "លេខ​សម្គាល់​ក្រុម៖"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr "បញ្ចូល​លេខ​សម្គាល់​ក្រុម​អាទិភាព​សម្រាប់​អាទិភាព​អ្នកប្រើ​នីមួយៗ។"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
-msgstr ""
-"បញ្ចូល​ភាគរយ​កម្រិត​បញ្ជូន​នៃ​ក្រុម​អាទិភាព​សម្រាប់​អាទិភាព​អ្នកប្រើ​នីមួយ​ដ"
-"ែល​អាច​នឹង​ប្រើ​។"
+msgstr "បញ្ចូល​ភាគរយ​កម្រិត​បញ្ជូន​នៃ​ក្រុម​អាទិភាព​សម្រាប់​អាទិភាព​អ្នកប្រើ​នីមួយ​ដែល​អាច​នឹង​ប្រើ​។"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "បិទ ឬ​បើក​កម្រិត​បញ្ជូន​តឹងរ៉ឹង​សម្រាប់​អាទិភាព​អ្នកប្រើ​នីមួយៗ។"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1689,7 +1500,7 @@ 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:4
+#: ../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
@@ -1697,8 +1508,9 @@ msgid "Sho_w password"
 msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1710,7 +1522,8 @@ msgstr "ពាក្យសម្ងាត់៖"
 #: ../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-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "ស្វ័យប្រវត្តិ"
@@ -1765,49 +1578,81 @@ msgstr "ចរចា​ស្វ័យប្រវត្តិ"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "អាសយដ្ឋាន MAC របស់​ឧបករណ៍៖"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "សេវា៖"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "អាសយដ្ឋាន MAC ដែល​បាន​ក្លូន៖"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 ""
-"អាសយដ្ឋាន MAC ដែល​បាន​បញ្ចូល​នៅ​ទីនេះ "
-"នឹង​ប្រើ​ជា​អាសយដ្ឋាន​ផ្នែក​រឹង​សម្រាប់​ឧបករណ៍​បណ្ដាញ "
-"ហើយ​ការ​តភ្ជាប់​នេះ​នឹង​ត្រូវ​បាន​ធ្វើឲ្យ​សកម្ម។  "
-"លក្ខណ​ពិសេស​នេះ​ត្រូវ​បាន​ស្គាល់​ថា​ជា​ការ​ក្លូន ឬ​ការ​ចម្លង​តាម។  ឧទាហរណ៍ ៖ "
-"00:11:22:33:44:55"
+"អាសយដ្ឋាន MAC ដែល​បាន​បញ្ចូល​នៅ​ទីនេះ នឹង​ប្រើ​ជា​អាសយដ្ឋាន​ផ្នែក​រឹង​សម្រាប់​ឧបករណ៍​បណ្ដាញ ហើយ​ការ​"
+"តភ្ជាប់​នេះ​នឹង​ត្រូវ​បាន​ធ្វើឲ្យ​សកម្ម។  លក្ខណ​ពិសេស​នេះ​ត្រូវ​បាន​ស្គាល់​ថា​ជា​ការ​ក្លូន ឬ​ការ​ចម្លង​តាម។  "
+"ឧទាហរណ៍ ៖ 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "បៃ"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "លំនាំដើម"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "មិន​អើពើ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "ផ្សាយ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "ពាក្យសម្ងាត់​សោ​ឯកជន៖"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
 msgstr "តភ្ជាប់​ទៅ VPN ដោយ​ស្វ័យប្រវត្តិ ពេល​ប្រើ​ការ​តភ្ជាប់​នេះ"
 
 #: ../src/connection-editor/ce-page-general.ui.h:2
-#| msgid "You are now connected to the WiMAX network."
 msgid "All _users may connect to this network"
 msgstr "អ្នកប្រើ​ទាំងអស់​អាច​តភ្ជាប់​ទៅ​បណ្ដាញ​នេះ"
 
@@ -1840,8 +1685,8 @@ msgstr "ស្វ័យប្រវត្តិ​ជាមួយ​នឹង​
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "ដោយដៃ"
 
@@ -1852,178 +1697,151 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "បាន​ចែករំលែក​ទៅ​កុំព្យូទ័រ​ផ្សេងទៀត"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "វិធីសាស្ត្រ៖"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "អាសយដ្ឋាន"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 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 អនុញ្ញាត​ឲ្យ​អ្នក​គ្រប់គ្រង​បណ្ដាញ ប្ដូរ​ការ​កំណត់​រចនាសម្ព័ន្ធ​កុំព្យូទ័រ​របស់​អ្នក​តាម​"
+"បំណង​បាន។ ប្រសិនបើ​អ្នក​ចង់​ប្រើ​គ្រឿង​សម្គាល់​ម៉ាស៊ីន​កូន DHCP សូម​បញ្ចូល​វា​នៅ​ទីនេះ។"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
-msgstr ""
-"ដែន​ដែល​បាន​ប្រើ នៅ​ពេល​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីន។ "
-"ប្រើ​សញ្ញា​ក្បៀស​ដើម្បី​បំបែក​ដែន​ច្រើន។"
+msgstr "ដែន​ដែល​បាន​ប្រើ នៅ​ពេល​ដោះស្រាយ​ឈ្មោះ​ម៉ាស៊ីន។ ប្រើ​សញ្ញា​ក្បៀស​ដើម្បី​បំបែក​ដែន​ច្រើន។"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 msgid "D_HCP client ID:"
 msgstr "លេខ​សម្គាល់​ម៉ាស៊ីន​កូន DHCP ៖"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "ស្វែងរក​ដែន៖"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "ម៉ាស៊ីន​មេ DNS ៖"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"ពេល​តភ្ជាប់​ទៅ​បណ្ដាញ IPv6 ដែល​អាច​តភ្ជាប់​បាន "
-"វា​នឹង​អនុញ្ញាត​ឲ្យ​បញ្ចប់​ការ​តភ្ជាប់ ប្រសិនបើ​ការ​កំណត់​រចនាសម្ព័ន្ធ​ IPv4 "
-"បរាជ័យ ប៉ុន្តែ​ការ​កំណត់​រចនាសម្ព័ន្ធ IPv6 គឺជោគជ័យ។"
+"ពេល​តភ្ជាប់​ទៅ​បណ្ដាញ IPv6 ដែល​អាច​តភ្ជាប់​បាន វា​នឹង​អនុញ្ញាត​ឲ្យ​បញ្ចប់​ការ​តភ្ជាប់ ប្រសិនបើ​ការ​កំណត់​"
+"រចនាសម្ព័ន្ធ​ IPv4 បរាជ័យ ប៉ុន្តែ​ការ​កំណត់​រចនាសម្ព័ន្ធ IPv6 គឺជោគជ័យ។"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "នាំផ្លូវ…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#| msgid ""
-#| "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:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "បាន​បិទ"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "ទាមទារអាសយដ្ឋាន IPv_6 សម្រាប់​ការ​តភ្ជាប់​នេះ ដើម្បី​បញ្ចប់"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
-"ពេល​តភ្ជាប់​ទៅ​បណ្ដាញ​ខ្សែ IPv4 ដែល​អាច​តភ្ជាប់ "
-"វា​នឹង​អនុញ្ញាត​ឲ្យ​បញ្ចប់​ការ​តភ្ជាប់ ប្រសិនបើ​ការ​កំណត់​រចនាសម្ព័ន្ធ IPv6 "
-"បរាជ័យ ប៉ុន្តែ​ការ​កំណត់​រចនាសម្ព័ន្ធ IPv4 គឺ​ជោគជ័យ។"
+"ពេល​តភ្ជាប់​ទៅ​បណ្ដាញ​ខ្សែ IPv4 ដែល​អាច​តភ្ជាប់ វា​នឹង​អនុញ្ញាត​ឲ្យ​បញ្ចប់​ការ​តភ្ជាប់ ប្រសិនបើ​ការ​កំណត់​"
+"រចនាសម្ព័ន្ធ IPv6 បរាជ័យ ប៉ុន្តែ​ការ​កំណត់​រចនាសម្ព័ន្ធ IPv4 គឺ​ជោគជ័យ។"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "ណាមួយ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "ចូលចិត្ត 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "ចូលចិត្ត 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "ចូលចិត្ត 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "ប្រើ​តែ 4G (LTE) ប៉ុណ្ណោះ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "មូលដ្ឋាន"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "លេខ៖"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "កម្រិត​ខ្ពស់"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "APN៖"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "លេខ​សម្គាល់​បណ្ដាញ៖"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "ប្រភេទ៖"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "ផ្លាស់ប្ដូរ..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "PIN៖"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "អនុញ្ញាត​ឲ្យ​រ៉ូមីង ប្រសិនបើ​មិន​មាន​បណ្ដាញ​ផ្ទះ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
 
@@ -2081,46 +1899,63 @@ msgid "_JSON config:"
 msgstr "ការ​កំណត់​រចនាសម្ព័ន្ធ JSON៖"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
-#| msgid "Import a saved VPN configuration..."
 msgid "_Import team configuration from a file..."
 msgstr "នាំចូល​ការ​កំណត់​រចនាសម្ព័ន្ធ​ក្រុម​ពី​ឯកសារ..."
 
 #: ../src/connection-editor/ce-page-team.ui.h:1
-#| msgid "Bonded _connections:"
 msgid "_Teamed connections:"
 msgstr "ការ​តភ្ជាប់​ដែល​បាន​ដាក់​ក្រុម៖"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-#| msgid "Import a saved VPN configuration..."
-msgid "I_mport team configuration from a file..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
 msgstr "នាំចូល​ការ​កំណត់​រចនាសម្ព័ន្ធ​ក្រុម​ពី​ឯកសារ..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
-#| msgid "Interface:"
 msgid "_Parent interface:"
 msgstr "ចំណុចប្រទាក់​មេ៖"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-#| msgid "_Interface name:"
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "ឈ្មោះ​ចំណុចប្រទាក់ VLAN៖"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#| msgid "C_loned MAC address:"
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "អាសយដ្ឋាន MAC ដែល​បាន​ក្លូន៖"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "លេខ​សម្គាល់ VLAN៖"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "ឈ្មោះ​ឧបករណ៍ + លេខ"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + លេខ"
 
@@ -2137,259 +1972,271 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "ហេដ្ឋារចនាសម្ព័ន្ធ"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "ថាមពល​បញ្ជូន៖"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "អត្រា៖"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "BSSID៖"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "ឆានែល៖"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "រលកអាកាស៖"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "របៀប៖"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SSID៖"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ដែល​បាន​អនុញ្ញាត"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "ពិធីការ​ផ្ទៀងផ្ទាត់​​ដែល​អាច​ពង្រីក​បាន (EAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "ពិធីការ​ផ្ទៀងផ្ទាត់​ពាក្យសម្ងាត់ (PAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "ពិធីការ​ផ្ទៀងផ្ទាត់​ការ​ស្វាគមន៍ (CHAP)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "ពិធីការ​ផ្ទៀងផ្ទាត់​ការ​ស្វាគមន៍​ម៉ៃក្រូសូហ្វ កំណែ ២ (MSCHAP v_2)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
 msgstr ""
-"ក្នុង​ករណី​ភាគច្រើន ម៉ាស៊ីន​មេ PPP "
-"របស់​ក្រុមហ៊ុន​ផ្ដល់​នឹង​គាំទ្រ​វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ទាំងអស់។ "
-"ប្រសិនបើ​ការ​តភ្ជាប់​បរាជ័យ "
-"សូម​សាកល្បង​បិទ​ការ​គាំទ្រ​វិធីសាស្ត្រ​មួយ​ចំនួន។"
+"ក្នុង​ករណី​ភាគច្រើន ម៉ាស៊ីន​មេ PPP របស់​ក្រុមហ៊ុន​ផ្ដល់​នឹង​គាំទ្រ​វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ទាំងអស់។ ប្រសិនបើ​ការ​"
+"តភ្ជាប់​បរាជ័យ សូម​សាកល្បង​បិទ​ការ​គាំទ្រ​វិធីសាស្ត្រ​មួយ​ចំនួន។"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:887
-msgid "Address"
-msgstr "អាសយដ្ឋាន"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "Netmask"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:921
-msgid "Gateway"
-msgstr "ផ្លូវចេញចូល"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "ម៉ែត្រ"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:904
-msgid "Prefix"
-msgstr "បុព្វបទ"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "អ៊ីសឺរណិត"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "វ៉ាយហ្វាយ"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "ប៊្លូធូស"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
-#| msgid "Hardware Address:"
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "ផ្នែក​រឹង"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "និមិត្ត"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "នាំចូល​ការ​កំណត់​រចនាសម្ព័ន្ធ VPN ដែល​បាន​រក្សាទុក..."
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
-msgstr ""
-"មិន​អាច​ចាប់ផ្ដើម​ប្រអប់​កម្មវិធី​កែសម្រួល​ការ​តភ្ជាប់​បាន​ទេ "
-"ដោយសារ​កំហុស​ដែល​មិន​ស្គាល់។"
+msgstr "មិន​អាច​ចាប់ផ្ដើម​ប្រអប់​កម្មវិធី​កែសម្រួល​ការ​តភ្ជាប់​បាន​ទេ ដោយសារ​កំហុស​ដែល​មិន​ស្គាល់។"
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "មិន​អាច​បង្កើត​ការ​តភ្ជាប់​ថ្មី​បាន​ឡើយ"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​លុប​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "តើ​អ្នក​ពិតជា​ចង់​លុប​កា​រ​តភ្ជាប់ %s មែន​ឬ?"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "អាសយដ្ឋាន"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Netmask"
+
+#: ../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
+msgid "Gateway"
+msgstr "ផ្លូវចេញចូល"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "ម៉ែត្រ"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "បុព្វបទ"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "កែសម្រួល %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "កែសម្រួល​ការ​តភ្ជាប់​ដែល​គ្មាន​ឈ្មោះ"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "ឈ្មោះ​ការ​តភ្ជាប់៖"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "កំហុស​ក្នុង​ការ​ចាប់ផ្ដើម​កម្មវិធី​កែសម្រួល"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម​ការ​តភ្ជាប់"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
-msgstr ""
-"កម្មវិធី​កែសម្រួល​ការ​តភ្ជាប់​មិន​អាច​រក​ឃើញ​ធនធាន​ដែល​បាន​ទាមទារ "
-"(រក​មិន​ឃើញ​ឯកសារ .ui)។"
+msgstr "កម្មវិធី​កែសម្រួល​ការ​តភ្ជាប់​មិន​អាច​រក​ឃើញ​ធនធាន​ដែល​បាន​ទាមទារ (រក​មិន​ឃើញ​ឯកសារ .ui)។"
 
-#: ../src/connection-editor/nm-connection-editor.c:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "រក្សាទុក"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "រក្សាទុក​ការ​ផ្លាស់ប្ដូរ​ណាមួយ​ដែល​បាន​ធ្វើ​ចំពោះ​ការ​តភ្ជាប់​នេះ។"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
-msgid "_Save..."
-msgstr "រក្សាទុក..."
-
 #: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
-msgstr ""
-"ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ "
-"ដើម្បី​រក្សាទុក​ការ​តភ្ជាប់​សម្រាប់​អ្នកប្រើ​ម៉ាស៊ីន​នេះ​ទាំងអស់។"
+msgstr "ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ដើម្បី​រក្សាទុក​ការ​តភ្ជាប់​សម្រាប់​អ្នកប្រើ​ម៉ាស៊ីន​នេះ​ទាំងអស់។"
 
 #: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
@@ -2401,619 +2248,711 @@ msgstr "មិន​អាច​កែសម្រួល​ការ​តភ្
 
 #: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
-msgstr ""
-"មាន​កំហុស​មិន​ស្គាល់​នៅ​ពេល​បង្កើត​ប្រអប់​កម្មវិធី​កែសម្រួល​ការ​តភ្ជាប់។"
+msgstr "មាន​កំហុស​មិន​ស្គាល់​នៅ​ពេល​បង្កើត​ប្រអប់​កម្មវិធី​កែសម្រួល​ការ​តភ្ជាប់។"
 
-#: ../src/connection-editor/nm-connection-editor.c:573
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "កំហុស​ក្នុង​ការ​ចាប់ផ្ដើម​កម្មវិធី​កែសម្រួល"
 
-#: ../src/connection-editor/nm-connection-editor.c:906
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បន្ថែម​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/nm-connection-editor.c:946
-msgid "Error saving connection"
-msgstr "កំហុស​ក្នុង​ការ​រក្សាទុក​ការ​តភ្ជាប់"
-
-#: ../src/connection-editor/nm-connection-editor.c:947
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "លក្ខណសម្បត្តិ '%s' / '%s' មិន​ត្រឹមត្រូវ៖ %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "ឈ្មោះ​ការ​តភ្ជាប់៖"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "នាំចេញ..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "កុំ"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "ឥឡូវនេះ"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d នាទី​កន្លងទៅ"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ម៉ោង​កន្លងទៅ"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ថ្ងៃ​កន្លងទៅ"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ខែ​កន្លងទៅ"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ឆ្នាំ​កន្លងទៅ"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "ឈ្មោះ"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "បាន​ប្រើ​លើក​ចុងក្រោយ"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "កែសម្រួល​ការ​តភ្ជាប់​ដែល​បាន​ជ្រើស"
 
-#: ../src/connection-editor/nm-connection-list.c:688
-msgid "_Edit..."
-msgstr "កែសម្រួល..."
-
-#: ../src/connection-editor/nm-connection-list.c:689
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ដើម្បី​កែសម្រួល​ការ​តភ្ជាប់​ដែល​បាន​ជ្រើស"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "លុប​ការ​តភ្ជាប់​ដែល​បាន​ជ្រើស"
 
-#: ../src/connection-editor/nm-connection-list.c:705
-msgid "_Delete..."
-msgstr "លុប..."
-
-#: ../src/connection-editor/nm-connection-list.c:706
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ដើម្បី​លុប​ការ​តភ្ជាប់​ដែល​បាន​ជ្រើស"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "មិន​បាន​ដំឡើង​កម្មវិធី​ជំនួយ VPN ។"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "មិន​ដឹង​វិធី​បង្កើត​ការ​តភ្ជាប់ '%s'"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "កំហុស​ក្នុងការ​បង្កើត​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/nm-connection-list.c:995
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "កំហុស​ក្នុង​ការ​កែសម្រួល​ការ​តភ្ជាប់"
 
-#: ../src/connection-editor/nm-connection-list.c:996
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "រក​មិន​ឃើញ​ការ​តភ្ជាប់​ដែល​មាន UUID '%s'"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "សុវត្ថិភាព 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ​សុវត្ថិភាព 802.1x ។"
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "ប្រើ​សុវត្ថិភាព 802.1_X សម្រាប់​ការ​តភ្ជាប់​នេះ"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ DCB ។"
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "រក​មិន​ឃើញ​ឧបករណ៍​ប៊្លូធូស​ឡើយ ។"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "ការ​តភ្ជាប់ bond %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "ប៊្លូធូស"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "បណ្ដាញ​អ៊ីសឺរណិត"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "បណ្ដាញ​វ៉ាយហ្វាយ"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ bond ​។"
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "ចម្បង៖"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "ការ​តភ្ជាប់ bond %d"
 
-#: ../src/connection-editor/page-bridge.c:211
-#| msgid "Could not load bond user interface."
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ​ប្រ៊ីដ្យ។"
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
-#| msgid "Bond connection %d"
 msgid "Bridge connection %d"
 msgstr "ការ​តភ្ជាប់​ប្រ៊ីដ្យ%d"
 
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "ច្រក​ប្រ៊ីដ្យ"
 
-#: ../src/connection-editor/page-bridge-port.c:117
-#| msgid "Could not load bond user interface."
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ​ច្រក​ប្រ៊ីដ្យ។"
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
-#| msgid "Could not load DSL user interface."
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ DCB ។"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ DSL ។"
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "ការ​តភ្ជាប់ DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 អចិន្ត្រៃយ៍​ដែល​បញ្ចូល​នៅ​ទីនេះ ។  "
-"ឧទាហរណ៍៖ 00:11:22:33:44:55"
+"ជម្រើស​នេះ​នឹង​ចាក់សោ​ការ​តភ្ជាប់​ទៅកាន់​ឧបករណ៍​បណ្ដាញ ដែល​បាន​បញ្ជាក់​ដោយ​អាសយដ្ឋាន MAC អចិន្ត្រៃយ៍​ដែល​"
+"បញ្ចូល​នៅ​ទីនេះ ។  ឧទាហរណ៍៖ 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ​អ៊ីសឺរណិត។"
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "អ៊ីសឺរណិត"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "អាសយដ្ឋាន MAC ដែល​បាន​ក្លូន៖"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "លំនាំដើម"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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:57
-#| msgid "NetworkManager is not running..."
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD មិន​កំពុង​ដំណើរការ..."
 
-#: ../src/connection-editor/page-general.c:330
-#| msgid "Could not load ethernet user interface."
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើទូទៅ។"
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ InfiniBand ។"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "ការ​តភ្ជាប់ InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "(VPN) ​ស្វ័យប្រវត្តិ"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "អាសយដ្ឋាន (VPN) ស្វ័យប្រវត្តិ​តែប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "(PPP) ស្វ័យប្រវត្តិ"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "អាសយដ្ឋាន (PPP) ស្វ័យប្រវត្តិ​តែប៉ុណ្ណោះ"
+msgid "Automatic, addresses only"
+msgstr "ស្វ័យប្រវត្តិ តែ​អាសយដ្ឋាន​ប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "(PPPoE) ស្វ័យប្រវត្តិ"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "អាសយដ្ឋាន (PPPoE) ស្វ័យប្រវត្តិ​តែប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "(DHCP) ស្វ័យប្រវត្តិ"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "អាសយដ្ឋាន (DHCP) ស្វ័យប្រវត្តិ​តែប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "តែ​ការ​តភ្ជាប់​មូលដ្ឋាន​ប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "បាន​បិទ"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "សេវា DNS បន្ថែម៖"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "ដែន​ស្វែងរក​បន្ថែម៖"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "កែសម្រួល​ផ្លូវ IPv4 សម្រាប់ %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "ការ​កំណត់ IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ IPv4 ។"
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "ស្វ័យប្រវត្តិ តែ​អាសយដ្ឋាន​ប៉ុណ្ណោះ"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "មិន​អើពើ"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "ស្វ័យប្រវត្តិ តែ DHCP ប៉ុណ្ណោះ"
 
-#: ../src/connection-editor/page-ip6.c:819
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "កែសម្រួល​ផ្លូវ​សម្រាប់ IPv6  %s"
 
-#: ../src/connection-editor/page-ip6.c:969
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "ការ​កំណត់ IPv6"
 
-#: ../src/connection-editor/page-ip6.c:971
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ IPv6 ។"
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "កូន​ចៅ​ស្ទួន"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "កូន​ចៅ '%s' និង '%s' ទាំង​ពីរ​គឺ​បាន​អនុវត្ត​ទៅកាន់​ឧបករណ៍ '%s'"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, 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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s កូន​ចៅ %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ​រលកអាកាស​ចល័ត។"
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "មិន​គាំទ្រ​ប្រភេទ​តភ្ជាប់​រលកអាកាស​ចល័ត។"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ជ្រើស​ប្រភេទ​ក្រុមហ៊ុន​ផ្ដល់​រលកអាកាស​ចល័ត"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr ""
-"ជ្រើស​បច្ចេកវិទ្យា​ដែល​ក្រុមហ៊ុន​ផ្ដល់​រលកអាកាស​ចល័ត​របស់​អ្នក​ប្រើ។ "
-"បើ​អ្នក​មិន​ច្បាស់ សូម​សួរ​ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក។"
+"ជ្រើស​បច្ចេកវិទ្យា​ដែល​ក្រុមហ៊ុន​ផ្ដល់​រលកអាកាស​ចល័ត​របស់​អ្នក​ប្រើ។ បើ​អ្នក​មិន​ច្បាស់ សូម​សួរ​ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក។"
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
-msgstr ""
-"ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា GSM-based (ឧ. GPRS, EDGE, UMTS, "
-"HSDPA)"
+msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា GSM-based (ឧ. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr ""
-"ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា CDMA-based (ឧ. 1xRTT, EVDO)"
+msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​ខ្ញុំ​ប្រើ​បច្ចេកវិទ្យា CDMA-based (ឧ. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:248
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:298
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:264
-#: ../src/wireless-security/eap-method-ttls.c:281
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "គ្មាន"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "ការ​កំណត់ PPP"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ PPP ។"
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "ជ្រើស​ឯកសារ​ដើម្បី​នាំចូល"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "កំហុស៖ ឯកសារ​មិន​មាន​ការ​កំណត់​រចនា​សម្មព័ន្ធ JSON ត្រឹមត្រូវ"
 
-#: ../src/connection-editor/page-team.c:247
-#| msgid "Could not load DSL user interface."
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ Team ។"
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
-#| msgid "DSL connection %d"
 msgid "Team connection %d"
 msgstr "ការ​តភ្ជាប់ Team %d"
 
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "ច្រក Team"
 
-#: ../src/connection-editor/page-team-port.c:159
-#| msgid "Could not load ethernet user interface."
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (តាម \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:489
-#| msgid "Could not load bond user interface."
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "មិនមាន​ការ​តភ្ជាប់​បណ្ដាញ"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ vlan ។"
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
-#| msgid "VPN connection %d"
 msgid "VLAN connection %d"
 msgstr "ការ​តភ្ជាប់ VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ VPN ។"
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "មិន​អាច​រក​ឃើញ​សេវា​កម្មវិធី​ជំនួយ VPN សម្រាប់ '%s' ។"
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "ការ​តភ្ជាប់ VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
 "Error: no VPN service type."
 msgstr ""
-"កម្មវិធី​ជំនួយ VPN បាន​បរាជ័យ​ក្នុង​ការ​នាំចូល​ការ​តភ្ជាប់ VPN "
-"ដោយ​ត្រឹមត្រូវ\n\nកំហុស៖ គ្មាន​ប្រភេទ​សេវា VPN ។"
+"កម្មវិធី​ជំនួយ VPN បាន​បរាជ័យ​ក្នុង​ការ​នាំចូល​ការ​តភ្ជាប់ VPN ដោយ​ត្រឹមត្រូវ\n"
+"\n"
+"កំហុស៖ គ្មាន​ប្រភេទ​សេវា VPN ។"
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "ជ្រើស​ប្រភេទ​តភ្ជាប់ VPN"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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:85
+#: ../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 ""
-"ជម្រើស​នេះ​នឹង​ចាក់សោ​ការ​តភ្ជាប់​ទៅកាន់​ចំណុច​ចូល​ដំណើរការ (AP) "
-"វ៉ាយហ្វាយ​ដែល​បាន​បញ្ជាក់​ដោយ BSSID បាន​បញ្ចូល​នៅ​ទីនេះ។  ឧទាហរណ៍៖ "
-"00:11:22:33:44:55"
+"ជម្រើស​នេះ​នឹង​ចាក់សោ​ការ​តភ្ជាប់​ទៅកាន់​ចំណុច​ចូល​ដំណើរការ (AP) វ៉ាយហ្វាយ​ដែល​បាន​បញ្ជាក់​ដោយ BSSID បាន​"
+"បញ្ចូល​នៅ​ទីនេះ។  ឧទាហរណ៍៖ 00:11:22:33:44:55"
+
+#: ../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)\""
+msgstr ""
+"ជម្រើស​នេះ​នឹង​ចាក់សោ​ការ​តភ្ជាប់​ទៅកាន់​ឧបករណ៍​បណ្ដាញ ដែល​បាន​បញ្ជាក់​ដោយ​អាសយដ្ឋាន MAC អចិន្ត្រៃយ៍​ដែល​"
+"បញ្ចូល​នៅ​ទីនេះ ។  ឧទាហរណ៍៖ 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ​វ៉ាយហ្វាយ។"
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "ឧបករណ៍​ណាមួយ"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "ការ​តភ្ជាប់​វ៉ាយហ្វាយ %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "ឃ្លា​សម្ងាត់ WEP 128-bit"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "WEP (802.1x) ថាមវន្ត"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ផ្ទាល់ខ្លួន"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ក្រុមហ៊ុន"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
-msgstr ""
-"មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ​សុវត្ថិភាព​វ៉ាយហ្វាយ "
-"ព្រោះ​មិនមាន​ការ​កំណត់​វ៉ាយហ្វាយ។"
+msgstr "មិន​អាច​ផ្ទុក​ចំណុច​ប្រទាក់​អ្នកប្រើ​សុវត្ថិភាព​វ៉ាយហ្វាយ ព្រោះ​មិនមាន​ការ​កំណត់​វ៉ាយហ្វាយ។"
 
-#: ../src/connection-editor/page-wifi-security.c:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "សុវត្ថិភាព​វ៉ាយហ្វាយ"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ​សុវត្ថិភាព​វ៉ាយហ្វាយ។"
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "មិន​អាច​ផ្ទុក​ចំណុចប្រទាក់​អ្នកប្រើ WiMAX ។"
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "ការ​តភ្ជាប់ WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "មិន​អាច​នាំចូល​ការ​​តភ្ជាប់ VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3021,144 +2960,60 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"មិន​អាច​អាន​ឯកសារ '%s' ឬ​វា​មិន​មាន​ព័ត៌មាន​ការ​តភ្ជាប់ VPN "
-"ដែល​ត្រូវ​បាន​ទទួល​ស្គាល់\n\nកំហុស៖ %s ។"
+"មិន​អាច​អាន​ឯកសារ '%s' ឬ​វា​មិន​មាន​ព័ត៌មាន​ការ​តភ្ជាប់ VPN ដែល​ត្រូវ​បាន​ទទួល​ស្គាល់\n"
+"\n"
+"កំហុស៖ %s ។"
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "មិន​ស្គាល់​កំហុស"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "មាន​ឯកសារ​ឈ្មោះ​ \"%s\" រួចហើយ។"
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "ជំនួស"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
-msgstr ""
-"តើ​អ្នក​ចង់​ជំនួស %s ដោយ​ការ​តភ្ជាប់ VPN ដែល​អ្នក​បាន​រក្សាទុក​ដែរ​ឬ​ទេ?"
+msgstr "តើ​អ្នក​ចង់​ជំនួស %s ដោយ​ការ​តភ្ជាប់ VPN ដែល​អ្នក​បាន​រក្សាទុក​ដែរ​ឬ​ទេ?"
 
-#: ../src/connection-editor/vpn-helpers.c:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "មិន​អាច​នាំចេញ​ការ​តភ្ជាប់ VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
 "\n"
 "Error: %s."
-msgstr "មិន​អាច​នាំចេញ​ការ​តភ្ជាប់ VPN '%s' ទៅកាន់ %s បាន​ឡើយ។\n\nកំហុស៖ %s ។"
+msgstr ""
+"មិន​អាច​នាំចេញ​ការ​តភ្ជាប់ VPN '%s' ទៅកាន់ %s បាន​ឡើយ។\n"
+"\n"
+"កំហុស៖ %s ។"
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "នាំចេញ​ការ​តភ្ជាប់ VPN..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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 ""
-"អាប់ភ្លេត NetworkManager មិន​អាច​​រក​ឃើញ​ធនធាន​មួយ​ចំនួន​ដែល​បាន​ទាមទារ "
-"(រក​មិន​ឃើញ​ឯកសារ .ui)។"
-
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"មិន​អាច​​កំណត់​រចនាសម្ព័ន្ធ​ប៊្លូធូស (ការ​តភ្ជាប់​ទៅកាន់ D-Bus បាន​បរាជ័យ៖ ("
-"%s) %s) ។"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"មិន​អាច​​កំណត់​រចនាសម្ព័ន្ធ​ប៊្លូធូស (កំហុស​ក្នុង​ការ​ស្វែងរក "
-"NetworkManager: (%s) %s) ។"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "ប្រើ​ទូរស័ព្ទ​ចល័ត​របស់​អ្នក​ជា​ឧបករណ៍​បណ្ដាញ (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "ចូល​ដំណើរការ​អ៊ីនធឺណិត​ដោយ​ប្រើ​ទូរស័ព្ទ​ចល័ត​របស់​អ្នក (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "កំហុស៖ %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ការ​តភ្ជាប់ DUN៖ %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "ឥឡូវនេះ​ទូរស័ព្ទ​របស់​អ្នក​អាច​ប្រើ​បាន​ហើយ!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "បាន​បោះបង់​អ្នក​ជំនួយការ​ទូរស័ព្ទ"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "មិន​ស្គាល់​ប្រភេទ​ឧបករណ៍​ទូរស័ព្ទ (មិន​មែន​ជា GSM ឬ CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "មិន​ស្គាល់​ប្រភេទ​ម៉ូដឹម។"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់​ទៅកាន់​ទូរស័ព្ទ។"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-#| msgid "Error editing connection"
-msgid "error getting bus connection"
-msgstr "កំហុស​ក្នុង​ការ​ការ​តភ្ជាប់​ខ្សែ​បញ្ជូន"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "បាន​ផ្ដាច់​ពី​ទូរស័ព្ទ​ដោយ​មិន​រំពឹង​ទុក។"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "អស់​ពេល​ក្នុង​ការ​ស្វែងរក​ព័ត៌មាន​លម្អិត​ទូរស័ព្ទ។"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "កំពុង​រក​មើល​ការ​កំណត់​រចនាសម្ព័ន្ធ​ទូរស័ព្ទ..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"អាដាប់ទ័រ​ប៊្លូធូស​លំនាំដើម​ត្រូវតែ​បាន​បើក "
-"មុន​ពេល​រៀបចំ​ការ​តភ្ជាប់​បណ្ដាញ​ហៅ។"
+"អាប់ភ្លេត NetworkManager មិន​អាច​​រក​ឃើញ​ធនធាន​មួយ​ចំនួន​ដែល​បាន​ទាមទារ (រក​មិន​ឃើញ​ឯកសារ .ui)។"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "ការ​បង្កើត​ការ​តភ្ជាប់ PAN បាន​បរាជ័យ៖ %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "បណ្ដាញ %s"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "ដោះ​សោ"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "ដោះ​សោ​ឧបករណ៍​នេះ​ដោយ​ស្វ័យ​ប្រវត្តិ"
 
@@ -3166,33 +3021,36 @@ msgstr "ដោះ​សោ​ឧបករណ៍​នេះ​ដោយ​ស្
 msgid "Connection Information"
 msgstr "ព័ត៌មាន​តភ្ជាប់"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "ការ​តភ្ជាប់​បណ្ដាញ​សកម្ម"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
-"ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​​ដូច​ខាងក្រ"
-"ោម៖"
+msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​​ដូច​ខាងក្រោម៖"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "ឧបករណ៍​របស់​អ្នក៖"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក៖"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "គម្រោង​របស់​អ្នក៖"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3200,264 +3058,315 @@ msgid ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 msgstr ""
-"ឥឡូវនេះ ការ​តភ្ជាប់​នឹង​ត្រូវ​បាន​ភ្ជាប់​ទៅកាន់​ក្រុមហ៊ុន​ផ្ដល់​រលកអាកាស​ចល័"
-"ត​ដោយ​ប្រើ​ការ​កំណត់​ដែល​អ្នក​បាន​ជ្រើស។ ប្រសិនបើ​ការ​តភ្ជាប់​បរាជ័យ "
-"ឬ​អ្នក​មិន​អាច​ចូល​ប្រើ​ធនធាន​បណ្ដាញ​បាន "
-"សូម​ពិនិត្យមើល​ការ​កំណត់​របស់​អ្នក​ឡើងវិញ។ "
-"ដើម្បី​កែប្រែ​ការ​កំណត់​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក ជ្រើស "
-"\"ការ​តភ្ជាប់​បណ្ដាញ\" ពី​ម៉ឺនុយ ប្រព័ន្ធ >> ចំណូលចិត្ត ។"
+"ឥឡូវនេះ ការ​តភ្ជាប់​នឹង​ត្រូវ​បាន​ភ្ជាប់​ទៅកាន់​ក្រុមហ៊ុន​ផ្ដល់​រលកអាកាស​ចល័ត​ដោយ​ប្រើ​ការ​កំណត់​ដែល​អ្នក​បាន​"
+"ជ្រើស។ ប្រសិនបើ​ការ​តភ្ជាប់​បរាជ័យ ឬ​អ្នក​មិន​អាច​ចូល​ប្រើ​ធនធាន​បណ្ដាញ​បាន សូម​ពិនិត្យមើល​ការ​កំណត់​របស់​អ្នក​"
+"ឡើងវិញ។ ដើម្បី​កែប្រែ​ការ​កំណត់​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​របស់​អ្នក ជ្រើស \"ការ​តភ្ជាប់​បណ្ដាញ\" ពី​ម៉ឺនុយ "
+"ប្រព័ន្ធ >> ចំណូលចិត្ត ។"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:266
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "បញ្ចាក់​ការ​កំណត់​រលកអាកាស​ចល័ត"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:330
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "មិន​បាន​រាយ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:461
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "ជ្រើស​គម្រោង​របស់​អ្នក៖"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:485
+#: ../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/libnm-gtk/nm-mobile-wizard.c:505
+#: ../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 របស់​អ្នក។"
+"ព្រមាន​៖ ការ​ជ្រើស​គម្រោង​មិន​ត្រឹមត្រូវ​អាច​​​បង្ហាញ​លទ្ធផល​នៅ​ក្នុង​ការ​ចេញ​វិក្កយបត្រ​ សម្រាប់​គណនី​រលកអាកាស ឬ​"
+"អាច​រារាំង​ការ​តភ្ជាប់​របស់​អ្នក។\n"
+"\n"
+"បើ​​អ្នក​មិន​ប្រាកដ​ជាមួយ​គម្រោង​របស់​អ្នក​ទេ​ ​សូម​​សួរ​ក្រុម​ហ៊ុន​ផ្ដល់​​របស់​អ្នក​ អំពី​​គម្រោង APN របស់​អ្នក។"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:512
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "ជ្រើស​គម្រោង​ចេញ​វិក្កយបត្រ​របស់​អ្នក"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:561
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "គម្រោង​របស់​ខ្ញុំ​​មិន​ត្រូវ​បាន​រាយ..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:714
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "ជ្រើស​ក្រុមហ៊ុន​ផ្ដល់​ពី​បញ្ជី៖"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:727
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ក្រុមហ៊ុន​ផ្ដល់"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:752
+#: ../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 ""
-"ខ្ញុំ​មិន​អាច​រក​ឃើញ​ក្រុមហ៊ុន​ផ្ដល់ ហើយ​ខ្ញុំ​ចង់​វាយ​បញ្ចូល​វា​ដោយ​ដៃ៖"
+msgstr "ខ្ញុំ​មិន​អាច​រក​ឃើញ​ក្រុមហ៊ុន​ផ្ដល់ ហើយ​ខ្ញុំ​ចង់​វាយ​បញ្ចូល​វា​ដោយ​ដៃ៖"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:765
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "ក្រុមហ៊ុន​ផ្ដល់៖"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:782
+#: ../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/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:795
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "ជ្រើស​ក្រុមហ៊ុន​ផ្ដល់​របស់​អ្នក"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "បញ្ជី​ប្រទេស ឬ​តំបន់៖"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "ប្រទេស ឬ​តំបន់"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "ប្រទេស​របស់​ខ្ញុំ​មិន​ត្រូវ​បាន​រាយ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1174
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ឧបករណ៍ GSM ដែល​បាន​ដំឡើង"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ឧបករណ៍ CDMA ដែល​បាន​ដំឡើង"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
+#: ../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 ""
-"អ្នកជំនួយការ​នឹង​ជួយ​អ្នក​ក្នុង​ការ​រៀបចំ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ទៅកាន់​ប"
-"ណ្ដាញ​ទូរស័ព្ទ (3G) ។"
+msgstr "អ្នកជំនួយការ​នឹង​ជួយ​អ្នក​ក្នុង​ការ​រៀបចំ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ទៅកាន់​បណ្ដាញ​ទូរស័ព្ទ (3G) ។"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "អ្នក​នឹង​ត្រូវការ​ព័ត៌មាន​ដូច​ខាងក្រោម៖"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "ឈ្មោះ​ក្រុម​ហ៊ុន​ផ្ដល់​​រលក​អាកាស​របស់​អ្នក"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ឈ្មោះ​គម្រោង​ចេញ​វិក្កយបត្រ​រលកអាកាស​របស់​អ្នក"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
+#: ../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)"
+msgstr "(ក្នុង​ករណី​ខ្លះ​) គម្រោង​ចេញ​វិក្កយបត្រ​រលកអាកាស​​​របស់​ APN (Access Point Name)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../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 "បង្កើត​ការ​តភ្ជាប់​សម្រាប់​ឧបករណ៍​រលកអាកាស​ចល័ត​នេះ៖"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "ឧបករណ៍​ណាមួយ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "រៀបចំ​ការ​តភ្ជាប់​រលកអាកាស​ចល័ត"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ថ្មី"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "មាន​ខ្សែ"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "ប៊្លូធូស"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "ពាក្យសម្ងាត់៖"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "ពាក្យសម្ងាត់៖"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+msgid "Sh_ow passwords"
+msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "ថ្មី..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "គ្មាន"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "បង្កើត"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
-msgstr ""
-"បាន​ទាមទារ​ពាក្យសម្ងាត់ ឬ​សោ​ការ​ដាក់​លេខកូដ "
-"ដើម្បី​ចូល​ដំណើរការ​បណ្ដាញ​វ៉ាយហ្វាយ '%s' ។"
+msgstr "បាន​ទាមទារ​ពាក្យសម្ងាត់ ឬ​សោ​ការ​ដាក់​លេខកូដ ដើម្បី​ចូល​ដំណើរការ​បណ្ដាញ​វ៉ាយហ្វាយ '%s' ។"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​តាម​បណ្ដាញ​វ៉ាយហ្វាយ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "បង្កើត​បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "បណ្ដាញ​វ៉ាយហ្វាយ​ថ្មី"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "បញ្ចូល​ឈ្មោះ​សម្រាប់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​អ្នក​ចង់​បង្កើត។"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "តភ្ជាប់​ទៅកាន់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​លាក់"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​លាក់"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
-msgstr ""
-"បញ្ចូល​ព័ត៌មាន​លម្អិត​អំពី​ឈ្មោះ "
-"និង​សុវត្ថិភាព​របស់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​អ្នក​ចង់​តភ្ជាប់។"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-#| msgid "_Password:"
-msgid "_Secondary Password:"
-msgstr "ពាក្យសម្ងាត់៖"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-#| msgid "Sho_w passwords"
-msgid "Sh_ow passwords"
-msgstr "បង្ហាញ​ពាក្យសម្ងាត់"
+msgstr "បញ្ចូល​ព័ត៌មាន​លម្អិត​អំពី​ឈ្មោះ និង​សុវត្ថិភាព​របស់​បណ្ដាញ​វ៉ាយហ្វាយ​ដែល​អ្នក​ចង់​តភ្ជាប់។"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "សុវត្ថិភាព​វ៉ាយហ្វាយ៖"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "ការ​តភ្ជាប់៖"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "អាដាប់ទ័រ​វ៉ាយហ្វាយ៖"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "ការ​ប្រើប្រាស់៖"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3465,7 +3374,7 @@ msgstr ""
 "កម្មវិធី​នេះ គឺជា​សមាសភាគ​នៃ NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/) ។"
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3473,138 +3382,151 @@ msgstr ""
 "វា​មិន​ត្រូវ​បាន​ប្រើ​សម្រាប់​អន្តរកម្ម​បន្ទាត់​ពាក្យ​បញ្ជា​ទេ ប៉ុន្តែ​ប្រើ​សម្រាប់​ដំណើរការ​នៅ​ក្នុង​បរិស្ថាន​ផ្ទៃតុ​"
 "របស់ GNOME ។"
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "មិន​បាន​បើក"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "មិន​បាន​ចុះឈ្មោះ"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "បណ្ដាញ​មូលដ្ឋាន (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "បណ្ដាញ​មូលដ្ឋាន"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ស្វែងរក"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "បាន​បដិសេធ​ការ​ចុះឈ្មោះ"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (រ៉ូមីង)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "បណ្ដាញ​រ៉ូមីង (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "បណ្ដាញ​រ៉ូមីង"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "កូដ​ PIN សម្រាប់​ស៊ីមកាត '%s' នៅ​លើ '%s'"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "បាន​ទាមទារ​កូដ PIN"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "បាន​ទាមទារ​កូដ PIN សម្រាប់​ឧបករណ៍​រលកអាកាស​ចល័ត"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត '%s' សកម្ម ៖ (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "រ៉ូមីង"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "ការ​តភ្ជាប់ %s"
 
-#: ../src/utils/utils.c:376
-msgid "Store the password only for this _user"
-msgstr "រក្សាទុក​ពាក្យសម្ងាត់​​សម្រាប់​តែ​អ្នកប្រើ​នេះ​ប៉ុណ្ណោះ"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:378
-msgid "Store the password for _all users"
-msgstr "រក្សាទុក​ពាក្យសម្ងាត់​សម្រាប់​គ្រប់​អ្នកប្រើ​ទាំងអស់"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
-#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "វិញ្ញាបនបត្រ DER ឬ PEM  (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:298
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:400
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "ជ្រើស​ឯកសារ PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "ឯកសារ PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "ឯកសារ​ទាំងអស់"
 
@@ -3640,14 +3562,32 @@ msgstr "ការ​ផ្ទៀងផ្ទាត់​ខាងក្នុង
 msgid "Allow automatic PAC pro_visioning"
 msgstr "អនុញ្ញាត​ការ​ផ្ដល់ PAC ដោយ​ស្វ័យប្រវត្តិ"
 
-#: ../src/wireless-security/eap-method-peap.c:281
-#: ../src/wireless-security/wireless-security.c:417
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:377
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:377
+#: ../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 "ជ្រើស​វិញ្ញាបនបត្រ​ប្រភព​វិញ្ញាបនបត្រ..."
 
@@ -3668,7 +3608,6 @@ msgstr "វិញ្ញាបនបត្រ CA ៖"
 #: ../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
-#| msgid "Ignore CA certificate"
 msgid "No CA certificate is _required"
 msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនបត្រ CA"
 
@@ -3676,15 +3615,46 @@ msgstr "មិន​បាន​ទាមទារ​វិញ្ញាបនប
 msgid "PEAP _version:"
 msgstr "កំណែ PEAP ៖"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "សួរ​រក​ពាក្យសម្ងាត់​នេះ​រាល់ពេល"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "វិញ្ញាបនបត្រ CA ៖"
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "សោ​ឯកជន​ដែល​មិន​បាន​ដាក់​លេខ​កូដ គឺ​គ្មាន​សុវត្ថិភាព"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3692,16 +3662,16 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"សោ​ឯកជន​ដែល​បាន​ជ្រើស​មិន​បង្ហាញ​ថា​ត្រូវ​បាន​ការពារ​ដោយ​ពាក្យសម្ងាត់​ទេ។ "
-"វា​អាច​ធ្វើឲ្យ​លិខិត​សម្គាល់​សុវត្ថិភាព​របស់​អ្នក​ត្រូវ​បាន​កែប្រែ។ សូម​ជ្រើ"
-"ស​សោ​ឯកជន​ដែល​ការ​ពារ​ដោយ​ពាក្យសម្ងាត់។\n\n(អ្នក​អាច​ការពារ​សោ​ឯកជន​ដោយ​ពាក្"
-"យសម្ងាត់​បាន​ដោយ​ប្រើ openssl)"
+"សោ​ឯកជន​ដែល​បាន​ជ្រើស​មិន​បង្ហាញ​ថា​ត្រូវ​បាន​ការពារ​ដោយ​ពាក្យសម្ងាត់​ទេ។ វា​អាច​ធ្វើឲ្យ​លិខិត​សម្គាល់​"
+"សុវត្ថិភាព​របស់​អ្នក​ត្រូវ​បាន​កែប្រែ។ សូម​ជ្រើស​សោ​ឯកជន​ដែល​ការ​ពារ​ដោយ​ពាក្យសម្ងាត់។\n"
+"\n"
+"(អ្នក​អាច​ការពារ​សោ​ឯកជន​ដោយ​ពាក្យសម្ងាត់​បាន​ដោយ​ប្រើ openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "ជ្រើស​វិញ្ញាបនបត្រ​ផ្ទាល់ខ្លួន​របស់​អ្នក..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "ជ្រើស​សោ​ឯកជន​របស់​អ្នក..."
 
@@ -3721,23 +3691,36 @@ msgstr "សោ​ឯកជន៖"
 msgid "_Private key password:"
 msgstr "ពាក្យសម្ងាត់​សោ​ឯកជន៖"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
@@ -3747,6 +3730,44 @@ msgstr "Protected EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "ផ្ទៀងផ្ទាត់៖"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 "១ (លំនាំដើម)"
@@ -3771,6 +3792,338 @@ msgstr "បង្ហាញ​សោ"
 msgid "WEP inde_x:"
 msgstr "លិបិក្រម WEP៖"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "ប្រភេទ៖"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "បើក​រលក​អាកាស​ចល័ត WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "ជំនួយ"
+
+#~| msgid "You are now connected to the GSM network."
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ bonded ។"
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "កំពុង​រៀបចំ​ការ​តភ្ជាប់ bond '%s'..."
+
+#~| msgid "Configuring mobile broadband connection '%s'..."
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់ bond '%s'..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់ bond '%s'..."
+
+#~| msgid "Requesting a VPN address for '%s'..."
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "កំពុង​ស្នើសុំ​អាសយដ្ឋាន​សម្រាប់ '%s'..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "ការ​តភ្ជាប់ bond '%s' សកម្ម"
+
+#~| msgid "You are now connected to the WiMAX network."
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ​ប្រ៊ីដ្យ។"
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "កំពុង​រៀបចំ​តភ្ជាប់​បណ្ដាញ​ប្រ៊ីដ្យ '%s'..."
+
+#~| msgid "Configuring Wi-Fi network connection '%s'..."
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់​ប្រ៊ីដ្យ '%s'..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​ប្រ៊ីដ្យ '%s'..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "ការ​តភ្ជាប់​ប្រ៊ីដ្យ '%s' សកម្ម"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "ការ​តភ្ជាប់ រលកអាកាស​ចល័ត​ថ្មី (CDMA)..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "ឥឡូវនេះ អ្នក​​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ CDMA ។"
+
+#~ msgid "CDMA network."
+#~ msgstr "បណ្ដាញ CDMA ។"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "ការ​តភ្ជាប់​រលកអាកាស​ចល័ត​ថ្មី (GSM) .."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ GSM ។"
+
+#~ msgid "GSM network."
+#~ msgstr "បណ្ដាញ GSM ។"
+
+#~| msgid "InfiniBand"
+#~ msgid "Auto InfiniBand"
+#~ msgstr "InfiniBand ស្វ័យប្រវត្តិ"
+
+#~| msgid "Wi-Fi Networks (%s)"
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "បណ្ដាញ InfiniBand (%s)"
+
+#~| msgid "Wi-Fi Network (%s)"
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "បណ្ដាញ InfiniBand (%s)"
+
+#~| msgid "InfiniBand"
+#~ msgid "InfiniBand Networks"
+#~ msgstr "បណ្ដាញ InfiniBand"
+
+#~| msgid "InfiniBand"
+#~ msgid "InfiniBand Network"
+#~ msgstr "បណ្ដាញ InfiniBand"
+
+#~| msgid "You are now connected to the WiMAX network."
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ InfiniBand ។"
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "កំពុង​រៀបចំ​ការ​តភ្ជាប់ InfiniBand '%s'..."
+
+#~| msgid "Configuring Wi-Fi network connection '%s'..."
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់ InfiniBand '%s'..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់ InfiniBand '%s'..."
+
+#~| msgid "InfiniBand connection %d"
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "ការ​តភ្ជាប់ InfiniBand '%s' សកម្ម"
+
+#~| msgid "You are now connected to the ethernet network."
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ​ជា​ក្រុម។"
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "កំពុង​រៀបចំ​តភ្ជាប់​ជា​ក្រុម '%s'..."
+
+#~| msgid "Configuring Wi-Fi network connection '%s'..."
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់​ជា​ក្រុម '%s'..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់​ជា​ក្រុម '%s'..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Team connection '%s' active"
+#~ msgstr "ការ​តភ្ជាប់​ជា​ក្រុម '%s' សកម្ម"
+
+#~| msgid "You are now connected to the CDMA network."
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ VLAN ។"
+
+#~| msgid "Starting VPN connection '%s'..."
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "កំពុង​កំណត់​ការ​តភ្ជាប់ VLAN '%s'..."
+
+#~| msgid "Starting VPN connection '%s'..."
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "កំពុង​កំណត់​រចនាសម្ព័ន្ធ​ការ​តភ្ជាប់ VLAN '%s'..."
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ពី​អ្នកប្រើ​សម្រាប់​ការ​តភ្ជាប់ VLAN '%s'..."
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "ការ​តភ្ជាប់ VLAN '%s' សកម្ម"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "រលក​អាកាស​ចល័ត WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "រលក​អាកាស​ចល័ត WiMAX"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX ត្រូវ​បានបិទ"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX ត្រូវ​បាន​បិទ​ដោយ​កុងតាក់​ផ្នែករឹង"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "ឥឡូវនេះ​អ្នក​បាន​តភ្ជាប់​ទៅ​បណ្ដាញ WiMAX ។"
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "មិន​ស្គាល់"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "មិន​ស្គាល់"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Primary DNS:"
+#~ msgstr "DNS ទីមួយ៖"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "DNS ទីពីរ៖"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "DNS ទីបី៖"
+
+#~ msgid "_Mode:"
+#~ msgstr "របៀប៖"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "អាសយដ្ឋាន MAC របស់​ឧបករណ៍៖"
+
+#~ msgid "Any"
+#~ msgstr "ណាមួយ"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "ចូលចិត្ត 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "ចូលចិត្ត 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "ចូលចិត្ត 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "ប្រើ​តែ 4G (LTE) ប៉ុណ្ណោះ"
+
+#~| msgid "Import a saved VPN configuration..."
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "នាំចូល​ការ​កំណត់​រចនាសម្ព័ន្ធ​ក្រុម​ពី​ឯកសារ..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "ហេដ្ឋារចនាសម្ព័ន្ធ"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "_Save..."
+#~ msgstr "រក្សាទុក..."
+
+#~ msgid "Error saving connection"
+#~ msgstr "កំហុស​ក្នុង​ការ​រក្សាទុក​ការ​តភ្ជាប់"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "លក្ខណសម្បត្តិ '%s' / '%s' មិន​ត្រឹមត្រូវ៖ %d"
+
+#~ msgid "_Edit..."
+#~ msgstr "កែសម្រួល..."
+
+#~ msgid "_Delete..."
+#~ msgstr "លុប..."
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "(PPP) ស្វ័យប្រវត្តិ"
+
+#~ 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)."
+#~ msgstr "មិន​អាច​​កំណត់​រចនាសម្ព័ន្ធ​ប៊្លូធូស (ការ​តភ្ជាប់​ទៅកាន់ D-Bus បាន​បរាជ័យ៖ (%s) %s) ។"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "មិន​អាច​​កំណត់​រចនាសម្ព័ន្ធ​ប៊្លូធូស (កំហុស​ក្នុង​ការ​ស្វែងរក NetworkManager: (%s) %s) ។"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "ប្រើ​ទូរស័ព្ទ​ចល័ត​របស់​អ្នក​ជា​ឧបករណ៍​បណ្ដាញ (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "ចូល​ដំណើរការ​អ៊ីនធឺណិត​ដោយ​ប្រើ​ទូរស័ព្ទ​ចល័ត​របស់​អ្នក (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "កំហុស៖ %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ការ​តភ្ជាប់ DUN៖ %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "ឥឡូវនេះ​ទូរស័ព្ទ​របស់​អ្នក​អាច​ប្រើ​បាន​ហើយ!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "បាន​បោះបង់​អ្នក​ជំនួយការ​ទូរស័ព្ទ"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "មិន​ស្គាល់​ប្រភេទ​ឧបករណ៍​ទូរស័ព្ទ (មិន​មែន​ជា GSM ឬ CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "មិន​ស្គាល់​ប្រភេទ​ម៉ូដឹម។"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់​ទៅកាន់​ទូរស័ព្ទ។"
+
+#~| msgid "Error editing connection"
+#~ msgid "error getting bus connection"
+#~ msgstr "កំហុស​ក្នុង​ការ​ការ​តភ្ជាប់​ខ្សែ​បញ្ជូន"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "បាន​ផ្ដាច់​ពី​ទូរស័ព្ទ​ដោយ​មិន​រំពឹង​ទុក។"
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "អស់​ពេល​ក្នុង​ការ​ស្វែងរក​ព័ត៌មាន​លម្អិត​ទូរស័ព្ទ។"
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "កំពុង​រក​មើល​ការ​កំណត់​រចនាសម្ព័ន្ធ​ទូរស័ព្ទ..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr "អាដាប់ទ័រ​ប៊្លូធូស​លំនាំដើម​ត្រូវតែ​បាន​បើក មុន​ពេល​រៀបចំ​ការ​តភ្ជាប់​បណ្ដាញ​ហៅ។"
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "ការ​បង្កើត​ការ​តភ្ជាប់ PAN បាន​បរាជ័យ៖ %s"
+
+#~ msgid "%s Network"
+#~ msgstr "បណ្ដាញ %s"
+
 #~ msgid "Connect _automatically"
 #~ msgstr "តភ្ជាប់​ដោយ​ស្វ័យប្រវត្តិ"
 
@@ -3795,12 +4148,6 @@ msgstr "លិបិក្រម WEP៖"
 #~ msgid "Wired network"
 #~ msgstr "បណ្ដាញ​មាន​ខ្សែ"
 
-#~ msgid "ad-hoc"
-#~ msgstr "បណ្ដោះ​អាសន្ន"
-
-#~ msgid "secure."
-#~ msgstr "សុវត្ថិភាព ។"
-
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "បណ្ដាញ​ឥត​ខ្សែ (%s)"
 
@@ -3881,9 +4228,6 @@ msgstr "លិបិក្រម WEP៖"
 #~ msgid "Available to all users"
 #~ msgstr "មាន​សម្រាប់​អ្នកប្រើ​ទាំងអស់"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "រក​មិន​ឃើញ​ឧបករណ៍​ប៊្លូធូស​ឡើយ ។"
-
 #~ msgid ""
 #~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
 #~ msgstr "មិន​អាច​កំណត់​រចនាសម្ព័ន្ធ​ប៊្លូធូស​បាន​ឡើយ (បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់​ទៅកាន់ D-Bus ៖ %s) ។"
diff --git a/po/kn.po b/po/kn.po
index f00ee5d3..aa0de0c3 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -2,1349 +2,1746 @@
 # Kannada translation of network-manager-applet.
 # Copyright (C) 2009 network-manager-applet's COPYRIGHT HOLDER
 # This file is distributed under the same license as the network-manager-applet package.
-# 
+#
 # Shankar Prasad <svenkate@redhat.com>, 2009, 2010, 2011.
 # Shankar <svenkate@redhat.com>, 2014. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-21 08:48-0400\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
 "Language: kn\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../nm-applet.desktop.in.h:1
-msgid "Network Manager"
-msgstr "ಜಾಲಬಂಧ ವ್ಯವಸ್ಥಾಪಕ"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#, fuzzy
+msgid "Network"
+msgstr "%s ಜಾಲಬಂಧ"
 
 #: ../nm-applet.desktop.in.h:2
-msgid "Control your network connections"
+#, fuzzy
+msgid "Manage your network connections"
 msgstr "ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿಯಂತ್ರಿಸಿ"
 
-#: ../nm-applet.schemas.in.h:1
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು"
+
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸಿ ಹಾಗು ಬದಲಾಯಿಸಿ"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "ಸಂಪರ್ಕಗೊಂಡ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
-#: ../nm-applet.schemas.in.h:2
-msgid ""
-"Set this to TRUE to disable notifications when connecting to a network."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "ಒಂದು ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಸಾಧಿಸುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
 "ಬದಲಾಯಿಸಿ."
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಲಾದ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
-#: ../nm-applet.schemas.in.h:4
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
-"ಒಂದು ಜಾಲಬಂಧದಿಂದ ಸಂಪರ್ಕ ಕಡಿದುಹಾಕುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE "
-"ಗೆ ಬದಲಾಯಿಸಿ."
+"ಒಂದು ಜಾಲಬಂಧದಿಂದ ಸಂಪರ್ಕ ಕಡಿದುಹಾಕುವಾಗ ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಗೆ "
+"ಬದಲಾಯಿಸಿ."
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "ಸಂಪರ್ಕಗೊಂಡ ಸೂಚನೆಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, 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
 msgid "Suppress networks available notifications"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿವೆ ಎಂಬ ಸೂಚನೆಗಳನ್ನು ತಡೆಹಿಡಿ"
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
-"ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿರುವುದನ್ನು ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE "
-"ಬದಲಾಯಿಸಿ."
+"ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿರುವುದನ್ನು ಸೂಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು TRUE ಬದಲಾಯಿಸಿ."
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "ಮುದ್ರೆ"
 
-#: ../nm-applet.schemas.in.h:8
-msgid ""
-"Used to determine whether settings should be migrated to a new version."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "ಸಿದ್ಧತೆಗಳನ್ನು ಹೊಸ ಆವೃತ್ತಿಗೆ ವರ್ಗಾಯಿಸಬೇಕೆ ಎಂದು ನಿರ್ಧರಿಸಲು ಬಳಸಲಾಗುತ್ತದೆ"
 
-#: ../nm-applet.schemas.in.h:9
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
 msgstr "WiFi ನಿರ್ಮಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸು"
 
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
-"ಆಪ್ಲೆಟ್‌ ಅನ್ನು ಬಳಸುವಾಗ ಒಂದು ತಾತ್ಕಾಲಿಕ ಜಾಲಬಂಧವನ್ನು ರಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು "
-"ಇದನ್ನು TRUE ಗೆ ಬದಲಾಯಿಸಿ."
+"ಆಪ್ಲೆಟ್‌ ಅನ್ನು ಬಳಸುವಾಗ ಒಂದು ತಾತ್ಕಾಲಿಕ ಜಾಲಬಂಧವನ್ನು ರಚಿಸುವುದನ್ನು ಅಶಕ್ತಗೊಳಿಸಲು ಇದನ್ನು "
+"TRUE ಗೆ ಬದಲಾಯಿಸಿ."
 
-#: ../nm-applet.schemas.in.h:11
-msgid "Show WPA protocol chooser widget"
-msgstr "WPA ಪ್ರೊಟೊಕಾಲ್ ಆಯ್ಕೆಗಾರ ವಿಡ್ಗೆಟ್ ಅನ್ನು ತೋರಿಸು"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:12
-msgid "Set to TRUE to show the WPA protocol chooser when editing connections."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
-"ಸಂಪರ್ಕಗಳನ್ನು ಸಂಪಾದಿಸುವಾಗ WPA ಪ್ರೊಟೊಕಾಲ್ ಆಯ್ಕೆಗಾರವನ್ನು ತೋರಿಸಲು ಇದನ್ನು TRUE ಗೆ "
-"ಹೊಂದಿಸಲಾಗುತ್ತದೆ."
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
 
-#: ../nm-connection-editor.desktop.in.h:2
-msgid "Manage and change your network connection settings"
-msgstr "ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸಿ ಹಾಗು ಬದಲಾಯಿಸಿ"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
 
-#: ../src/applet-dbus-manager.c:165
-#, c-format
-msgid "An instance of nm-applet is already running.\n"
-msgstr "nm-ಆಪ್ಲೆಟ್‌ನ ಒಂದು ಸನ್ನಿವೇಶವು ಈಗಾಗಲೆ ಚಾಲನೆಯಲ್ಲಿದೆ.\n"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
 
-#: ../src/applet-dbus-manager.c:167
-#, c-format
-msgid "Could not acquire the %s service. (%d)\n"
-msgstr "%s ಸೇವೆಯನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ. (%d)\n"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "ಜಾಲಬಂಧ ವ್ಯವಸ್ಥಾಪಕ"
 
-#: ../src/applet-device-bond.c:74 ../src/applet-device-bridge.c:74
-#: ../src/applet-device-bt.c:95 ../src/applet-device-cdma.c:329
-#: ../src/applet-device-gsm.c:372 ../src/applet-device-infiniband.c:131
-#: ../src/applet-device-vlan.c:189 ../src/applet-device-wifi.c:782
-#: ../src/applet-device-wired.c:135
-msgid "Available"
-msgstr "ಲಭ್ಯ"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "ಜಾಲಬಂಧ ವ್ಯವಸ್ಥಾಪಕ"
 
-#: ../src/applet-device-bond.c:87 ../src/applet-device-bridge.c:87
-#: ../src/applet-device-bt.c:107 ../src/applet-device-cdma.c:368
-#: ../src/applet-device-gsm.c:411 ../src/applet-device-infiniband.c:146
-#: ../src/applet-device-vlan.c:202 ../src/applet-device-wifi.c:1231
-#: ../src/applet-device-wired.c:150
-msgid "Connection Established"
-msgstr "ಸಂಪರ್ಕವನ್ನು ಸಾಧಿಸಲಾಗಿದೆ"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
 
-#: ../src/applet-device-bond.c:88
-msgid "You are now connected to the bonded network."
-msgstr "ನೀವು ಈಗ ಬಾಂಡ್ ಮಾಡಿದ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ."
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
 
-#: ../src/applet-device-bond.c:112
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#, fuzzy
+msgid "802.1X authentication"
+msgstr "ತಂತಿಸಹಿತ 802.1X ದೃಢೀಕರಣ"
 
-#: ../src/applet-device-bond.c:115
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+#: ../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
+msgid "_Cancel"
+msgstr ""
 
-#: ../src/applet-device-bond.c:118
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "ಸಂಪರ್ಕ ಜೋಡಿಸು(_o)"
 
-#: ../src/applet-device-bond.c:121 ../src/applet-device-bridge.c:121
-#: ../src/applet-device-infiniband.c:180 ../src/applet-device-vlan.c:236
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "'%s' ಗಾಗಿ ಒಂದು ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "ಜಾಲಬಂಧದ ಹೆಸರು(_N):"
 
-#: ../src/applet-device-bond.c:125 ../src/applet-device-bridge.c:125
-#: ../src/applet-device-vlan.c:240
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VLAN ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "ತಾತ್ಕಾಲಿಕ"
 
-#: ../src/applet-device-bridge.c:88
-msgid "You are now connected to the bridged network."
-msgstr "ನೀವು ಈಗ ಬ್ರಿಜ್‌ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ."
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
 
-#: ../src/applet-device-bridge.c:112
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "ಬ್ರಿಜ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/applet-device-bridge.c:115
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "ಬ್ರಿಜ್‌ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "ಅಜ್ಞಾತ"
 
-#: ../src/applet-device-bridge.c:118
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "ಬ್ರಿಜ್ ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/applet-device-bt.c:108
-msgid "You are now connected to the mobile broadband network."
-msgstr "ನೀವು ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "ಸಂಪರ್ಕಕಡಿದು ಹೋಗಿದೆ"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಲಾಗಿದೆ"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/applet-device-bt.c:132 ../src/applet-device-cdma.c:397
-#: ../src/applet-device-gsm.c:440
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "ಈ ಸಂದೇಶವನ್ನು ಇನ್ನೊಮ್ಮೆ ತೋರಿಸಬೇಡ"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕಕ್ಕೆ ತಡೆಯುಂಟಾಗಿದೆ."
 
-#: ../src/applet-device-bt.c:135 ../src/applet-device-cdma.c:400
-#: ../src/applet-device-gsm.c:443
+#: ../src/applet.c:847
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯನ್ನು ಅನಿರೀಕ್ಷಿತವಾಗಿ ನಿಲ್ಲಿಸಲಾಗಿದೆ."
 
-#: ../src/applet-device-bt.c:138 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:446
+#: ../src/applet.c:850
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "'%s' ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕಕ್ಕಾಗಿ ಅಗತ್ಯವಿರುವ ಬಳಕೆದಾರ ದೃಢೀಕರಣ..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯು ಅಮಾನ್ಯವಾದ ಸಂರಚನೆಯನ್ನು ಮರಳಿಸಿದೆ."
 
-#: ../src/applet-device-bt.c:141 ../src/applet-device-cdma.c:406
-#: ../src/applet-device-gsm.c:449 ../src/applet.c:2568
+#: ../src/applet.c:853
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "'%s' ಗಾಗಿನ ಜಾಲಬಂಧ ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ ಸಂಪರ್ಕದ ಪ್ರಯತ್ನದ ಕಾಲಾವಧಿ ಮೀರಿದೆ."
 
-#: ../src/applet-device-bt.c:145 ../src/applet-device-cdma.c:423
-#: ../src/applet-device-gsm.c:461
+#: ../src/applet.c:856
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ '%s' ವು ಸಕ್ರಿಯವಾಗಿದೆ"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯು ಸರಿಯಾದ ಸಮಯದಲ್ಲಿ ಆರಂಭಗೊಳ್ಳಲಿಲ್ಲ."
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:638
-#: ../src/mb-menu-item.c:55
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:859
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯು ಆರಂಭಗೊಳ್ಳಲು ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../src/applet-device-cdma.c:278 ../src/applet-device-gsm.c:322
+#: ../src/applet.c:862
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ ಮಾನ್ಯವಾದ ಯಾವುದೆ VPN ರಹಸ್ಯಗಳಿಲ್ಲ "
+"(ಸೀಕ್ರೇಟ್‌ಗಳಿಲ್ಲ)."
 
-#: ../src/applet-device-cdma.c:280 ../src/applet-device-gsm.c:324
-#: ../src/connection-editor/new-connection.c:118
-#: ../src/connection-editor/page-mobile.c:326
-msgid "Mobile Broadband"
-msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್"
+#: ../src/applet.c:865
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"ಅಮಾನ್ಯವಾದ VPN ರಹಸ್ಯಗಳಿರದ(ಸಿಕ್ರೇಟ್‌ಗಳಿರದ) VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:342
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "ಹೊಸ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ (CDMA)..."
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../src/applet-device-cdma.c:369
-msgid "You are now connected to the CDMA network."
-msgstr "ನೀವು ಈಗ CDMA ಜಾಲಬಂಧದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
+#: ../src/applet.c:888
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ಕಡಿದು ಹೋಗಿದೆ ಏಕೆಂದರೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕಕ್ಕೆ ತಡೆಯುಂಟಾಗಿದೆ."
 
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-gsm.c:456
+#: ../src/applet.c:891
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "'%s' ಎಂಬ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವು ಸಕ್ರಿಯವಾಗಿದೆ: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ಕಡಿದು ಹೋಗಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯನ್ನು ನಿಲ್ಲಿಸಲಾಗಿದೆ."
 
-#: ../src/applet-device-cdma.c:421 ../src/applet-device-gsm.c:459
-msgid "roaming"
-msgstr "ರೋಮಿಂಗ್"
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ಕಡಿದು ಹೋಗಿದೆ."
 
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:641
-#: ../src/mb-menu-item.c:60
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:385
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "ಹೊಸ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ (GSM) ಸಂಪರ್ಕ..."
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
 
-#: ../src/applet-device-gsm.c:412
-msgid "You are now connected to the GSM network."
-msgstr "ಈಗ ನೀವು GSM ಜಾಲಬಂಧದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "VPN ಪ್ರವೇಶ ಸಂದೇಶ"
 
-#: ../src/applet-device-gsm.c:688
-msgid "PIN code required"
-msgstr "PIN ಕೋಡ್‌ನ ಅಗತ್ಯವಿದೆ"
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "VPN ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/applet-device-gsm.c:690
-msgid "PUK code required"
-msgstr "PUK ಕೋಡ್‌ನ ಅಗತ್ಯವಿದೆ"
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯು ಆರಂಭಗೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:701
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಕ್ಕಾಗಿ PIN ಕೋಡ್‌ನ ಅಗತ್ಯವಿರುತ್ತದೆ"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN ಸಂಪರ್ಕ '%s' ಆರಂಭಗೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:703
-msgid "PUK code is needed for the mobile broadband device"
-msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಕ್ಕಾಗಿ PUK ಕೋಡ್‌ನ ಅಗತ್ಯವಿರುತ್ತದೆ"
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "ಸಾಧನವು ಸಿದ್ಧಗೊಂಡಿಲ್ಲ (ಫರ್ಮ್-ವೇರ್ ಕಾಣಿಸುತ್ತಿಲ್ಲ)"
 
-#: ../src/applet-device-gsm.c:836
-msgid "Wrong PIN code; please contact your provider."
-msgstr "PIN ಕೋಡ್ ಸರಿಯಿಲ್ಲ; ದಯವಿಟ್ಟು ನಿಮ್ಮ ಸೇವಾಕರ್ತರನ್ನು ಸಂಪರ್ಕಿಸಿ."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "ಸಾಧನವು ಸಿದ್ಧಗೊಂಡಿಲ್ಲ"
 
-#: ../src/applet-device-gsm.c:859
-msgid "Wrong PUK code; please contact your provider."
-msgstr "PUK ಕೋಡ್ ಸರಿಯಿಲ್ಲ; ದಯವಿಟ್ಟು ನಿಮ್ಮ ಸೇವಾಕರ್ತರನ್ನು ಸಂಪರ್ಕಿಸಿ."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "ಸಂಪರ್ಕಕಡಿದು ಹೋಗಿದೆ"
 
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:886
-msgid "Sending unlock code..."
-msgstr "ಅನ್‌ಲಾಕ್ ಮಾಡುವ ಕೋಡ್ ಅನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ..."
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕು"
 
-#: ../src/applet-device-gsm.c:946
-msgid "SIM PIN unlock required"
-msgstr "SIM PIN ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "ಸಾಧನವನ್ನು ನಿರ್ವಹಿಸಲಾಗಿಲ್ಲ"
 
-#: ../src/applet-device-gsm.c:947
-msgid "SIM PIN Unlock Required"
-msgstr "SIM PIN ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "ಯಾವುದೆ ಜಾಲಬಂಧ ಸಾಧನಗಳು ಲಭ್ಯವಿಲ್ಲ"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:949
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"'%s' ಎಂಬ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನವನ್ನು ಬಳಸುವ ಮೊದಲು ಅದಕ್ಕೆ ಒಂದು SIM PIN "
-"ಕೋಡ್‌ನ ಅಗತ್ಯವಿರುತ್ತದೆ."
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "_VPN ಸಂಪರ್ಕಗಳು"
 
-#: ../src/applet-device-gsm.c:950
-msgctxt "PIN code entry label"
-msgid "PIN code:"
-msgstr "PIN ಕೋಡ್‌:"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "VPN ಅನ್ನು ಸಂರಚಿಸು(_C)..."
 
-#: ../src/applet-device-gsm.c:953
-msgctxt "Show/obscure PIN checkbox label"
-msgid "Show PIN code"
-msgstr "PIN ಕೋಡ್‌ ಅನ್ನು ತೋರಿಸು:"
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "VPN ಇಂದ ಸಂಪರ್ಕವನ್ನು ಕಡಿದು ಹಾಕು(_D)"
 
-#: ../src/applet-device-gsm.c:956
-msgid "SIM PUK unlock required"
-msgstr "SIM PUK ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager ಚಾಲನೆಯಲ್ಲಿಲ್ಲ..."
 
-#: ../src/applet-device-gsm.c:957
-msgid "SIM PUK Unlock Required"
-msgstr "SIM PUK ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "ಜಾಲಬಂಧವನ್ನು ಅಶಕ್ತಗೊಳಿಸಲಾಗಿದೆ"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:959
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"'%s' ಎಂಬ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನವನ್ನು ಬಳಸುವ ಮೊದಲು ಅದಕ್ಕೆ ಒಂದು SIM PUK "
-"ಕೋಡ್‌ನ ಅಗತ್ಯವಿರುತ್ತದೆ."
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸು(_N)"
 
-#: ../src/applet-device-gsm.c:960
-msgctxt "PUK code entry label"
-msgid "PUK code:"
-msgstr "PUK ಕೋಡ್:"
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "ವೈರ್ಲೆಸ್ ಅನ್ನು ಶಕ್ತಗೊಳಿಸು(_W)"
 
-#: ../src/applet-device-gsm.c:962
-msgctxt "New PIN entry label"
-msgid "New PIN code:"
-msgstr "ಹೊಸ PIN ಕೋಡ್‌:"
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡನ್ನು ಶಕ್ತಗೊಳಿಸು(_M)"
 
-#: ../src/applet-device-gsm.c:963
-msgctxt "New PIN verification entry label"
-msgid "Re-enter new PIN code:"
-msgstr "ಹೊಸ PIN ಕೋಡ್ ಅನ್ನು ಮರಳಿ ನಮೂದಿಸಿ:"
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "ಸೂಚನೆಗಳನ್ನು ಶಕ್ತಗೊಳಿಸು(_o)"
 
-#: ../src/applet-device-gsm.c:967
-msgctxt "Show/obscure PIN/PUK checkbox label"
-msgid "Show PIN/PUK codes"
-msgstr "ಹೊಸ PIN/PUK ಕೋಡ್‌ಗಳನ್ನು ತೋರಿಸು"
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿ(_I)"
 
-#: ../src/applet-device-infiniband.c:41
-msgid "Auto InfiniBand"
-msgstr "ಸ್ವಯಂ InfiniBand"
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "ಸಂಪರ್ಕಗಳನ್ನು ಸಂಪಾದಿಸು..."
 
-#: ../src/applet-device-infiniband.c:96
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand ಜಾಲಬಂಧಗಳು (%s)"
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "ಇದರ ಬಗ್ಗೆ(_A)"
 
-#: ../src/applet-device-infiniband.c:98
+#: ../src/applet.c:2179
 #, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand ಜಾಲಬಂಧ (%s)"
-
-#: ../src/applet-device-infiniband.c:101
-msgid "InfiniBand Networks"
-msgstr "InfiniBand ಜಾಲಬಂಧಗಳು"
-
-#: ../src/applet-device-infiniband.c:103
-msgid "InfiniBand Network"
-msgstr "InfiniBand ಜಾಲಬಂಧ"
+msgid "You are now connected to '%s'."
+msgstr "ನೀವು '%s' ಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-infiniband.c:123 ../src/applet-device-vlan.c:180
-#: ../src/applet-device-wired.c:127 ../src/applet.c:1358
-msgid "disconnected"
-msgstr "ಸಂಪರ್ಕಕಡಿದು ಹೋಗಿದೆ"
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಲಾಗಿದೆ"
 
-#: ../src/applet-device-infiniband.c:147
-msgid "You are now connected to the InfiniBand network."
-msgstr "ನೀವು ಈಗ InfiniBand ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ."
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕವು ಕಡಿದು ಹೋಗಿದೆ."
 
-#: ../src/applet-device-infiniband.c:171
+#: ../src/applet.c:2474
 #, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "InfiniBand ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+msgid "Preparing network connection '%s'..."
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-infiniband.c:174
+#: ../src/applet.c:2477
 #, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "InfiniBand ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+msgid "User authentication required for network connection '%s'..."
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
 
-#: ../src/applet-device-infiniband.c:177
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "InfiniBand ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
+msgid "Requesting a network address for '%s'..."
+msgstr "'%s' ಗಾಗಿನ ಜಾಲಬಂಧ ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-infiniband.c:184
+#: ../src/applet.c:2483
 #, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
+msgid "Network connection '%s' active"
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
 
-#: ../src/applet-device-vlan.c:203
-msgid "You are now connected to the VLAN."
-msgstr "ನೀವು ಈಗ VLAN ಜಾಲಬಂಧದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "VPN ಸಂಪರ್ಕ '%s' ಅನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-vlan.c:227
+#: ../src/applet.c:2560
 #, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "VLAN ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
 
-#: ../src/applet-device-vlan.c:230
+#: ../src/applet.c:2563
 #, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "VLAN ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+msgid "Requesting a VPN address for '%s'..."
+msgstr "'%s' ಗಾಗಿ ಒಂದು VPN ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-vlan.c:233
+#: ../src/applet.c:2566
 #, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "VLAN ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
+msgid "VPN connection '%s' active"
+msgstr "VPN ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
 
-#: ../src/applet-device-wifi.c:88
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "ಅಡಗಿಸಲಾದ ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಕ್ಕಾಗಿ ಸಂಪರ್ಕ ಸಾಧಿಸು(_C)..."
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "ಯಾವುದೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕವಿಲ್ಲ"
 
-#: ../src/applet-device-wifi.c:121
-msgid "Create _New Ad-Hoc Wireless Network..."
-msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕವನ್ನು ರಚಿಸು(_N)..."
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "NetworkManager ಆಪ್ಲೆಟ್"
 
-#: ../src/applet-device-wifi.c:718
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು (%s)"
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr "PUK ಕೋಡ್ ಸರಿಯಿಲ್ಲ; ದಯವಿಟ್ಟು ನಿಮ್ಮ ಸೇವಾಕರ್ತರನ್ನು ಸಂಪರ್ಕಿಸಿ."
 
-#: ../src/applet-device-wifi.c:720
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ (%s)"
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "PIN ಕೋಡ್ ಸರಿಯಿಲ್ಲ; ದಯವಿಟ್ಟು ನಿಮ್ಮ ಸೇವಾಕರ್ತರನ್ನು ಸಂಪರ್ಕಿಸಿ."
 
-#: ../src/applet-device-wifi.c:722
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
-msgstr[1] "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು"
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr "ಅನ್‌ಲಾಕ್ ಮಾಡುವ ಕೋಡ್ ಅನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-wifi.c:748
-msgid "wireless is disabled"
-msgstr "ವೈರ್ಲೆಸ್ ಅಶಕ್ತಗೊಂಡಿದೆ"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ (%s)"
 
-#: ../src/applet-device-wifi.c:809
-msgid "More networks"
-msgstr "ಹೆಚ್ಚಿನ ಜಾಲಬಂಧಗಳು"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್"
 
-#: ../src/applet-device-wifi.c:1012
-msgid "Wireless Networks Available"
-msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿವೆ"
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "ಲಭ್ಯ"
 
-#: ../src/applet-device-wifi.c:1013
-msgid "Click on this icon to connect to a wireless network"
-msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಈ ಚಿಹ್ನೆಯ ಮೇಲೆ ಕ್ಲಿಕ್ಕಿಸಿ"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "ಹೊಸ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ"
 
-#: ../src/applet-device-wifi.c:1016 ../src/applet.c:723
-msgid "Don't show this message again"
-msgstr "ಈ ಸಂದೇಶವನ್ನು ಇನ್ನೊಮ್ಮೆ ತೋರಿಸಬೇಡ"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "ಸಂಪರ್ಕವನ್ನು ಸಾಧಿಸಲಾಗಿದೆ"
 
-#: ../src/applet-device-wifi.c:1229
-#, c-format
-msgid "You are now connected to the Wi-Fi network '%s'."
-msgstr "ನೀವು ಈಗ ವೈ-ಫೈ ಜಾಲಬಂಧ '%s' ನೊಂದಿಗೆ ಈಗ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "ನೀವು ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
 
-#: ../src/applet-device-wifi.c:1230 ../src/applet-device-wifi.c:1260
-msgid "(none)"
-msgstr "(ಯಾವುದೂ ಇಲ್ಲ)"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಜಾಲಬಂಧದ ಗುಪ್ತಪದ"
 
-#: ../src/applet-device-wifi.c:1270
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಜ್ಜುಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+#: ../src/applet-device-broadband.c:957
+#, fuzzy
+msgid "You are now registered on the home network."
+msgstr "ನೀವು ಈಗ ಬಾಂಡ್ ಮಾಡಿದ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ."
 
-#: ../src/applet-device-wifi.c:1273
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+#: ../src/applet-device-broadband.c:963
+#, fuzzy
+msgid "You are now registered on a roaming network."
+msgstr "ನೀವು ಈಗ ಬ್ರಿಜ್‌ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ."
+
+#: ../src/applet-device-bt.c:88
+msgid "You are now connected to the mobile broadband network."
+msgstr "ನೀವು ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಗಾಗಿ ಅಗತ್ಯವಿರುವ ಬಳಕೆದಾರರ ದೃಢೀಕರಣ..."
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "'%s' ಗಾಗಿನ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-wifi.c:1299
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ: %s (%d%%)"
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "'%s' ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕಕ್ಕಾಗಿ ಅಗತ್ಯವಿರುವ ಬಳಕೆದಾರ ದೃಢೀಕರಣ..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
+msgid "Mobile broadband connection '%s' active"
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ '%s' ವು ಸಕ್ರಿಯವಾಗಿದೆ"
 
-#: ../src/applet-device-wired.c:45
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "ಸ್ವಯಂ ಎತರ್ನೆಟ್"
 
-#: ../src/applet-device-wired.c:100
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಗಳು (%s)"
 
-#: ../src/applet-device-wired.c:102
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ (%s)"
 
-#: ../src/applet-device-wired.c:105
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಗಳು"
 
-#: ../src/applet-device-wired.c:107
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ"
 
-#: ../src/applet-device-wired.c:151
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "ನೀವು ಈಗ ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ."
 
-#: ../src/applet-device-wired.c:175
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಜ್ಜುಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-wired.c:178
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-wired.c:181
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಗಾಗಿ ಅಗತ್ಯವಿರುವ ಬಳಕೆದಾರರ ದೃಢೀಕರಣ..."
 
-#: ../src/applet-device-wired.c:184
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' ಗಾಗಿ ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
 
-#: ../src/applet-device-wired.c:188
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
 
-#: ../src/applet-device-wired.c:439
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL ದೃಢೀಕರಣ"
 
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "ಅಡಗಿಸಲಾದ ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಕ್ಕಾಗಿ ಸಂಪರ್ಕ ಸಾಧಿಸು(_C)..."
+
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
+msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕವನ್ನು ರಚಿಸು(_N)..."
+
+#: ../src/applet-device-wifi.c:431
+msgid "(none)"
+msgstr "(ಯಾವುದೂ ಇಲ್ಲ)"
+
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧಗಳು (%s)"
+
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ (%s)"
+
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ"
+msgstr[1] "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ"
+
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "ವೈರ್ಲೆಸ್ ಅಶಕ್ತಗೊಂಡಿದೆ"
+
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:996
+msgid "More networks"
+msgstr "ಹೆಚ್ಚಿನ ಜಾಲಬಂಧಗಳು"
+
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
+msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು ಲಭ್ಯವಿವೆ"
+
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು ಈ ಚಿಹ್ನೆಯ ಮೇಲೆ ಕ್ಲಿಕ್ಕಿಸಿ"
+
+#: ../src/applet-device-wifi.c:1364
+#, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "ನೀವು ಈಗ ವೈ-ಫೈ ಜಾಲಬಂಧ '%s' ನೊಂದಿಗೆ ಈಗ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
+
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಗಾಗಿ ಅಗತ್ಯವಿರುವ ಬಳಕೆದಾರರ ದೃಢೀಕರಣ..."
+
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "'%s' ಗಾಗಿನ ಜಾಲಬಂಧ ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
+
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ: %s (%d%%)"
+
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "ತಂತಿಯುಕ್ತ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
+
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "ಹೊಸ ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ:"
 
-#: ../src/applet-dialogs.c:110
-#: ../src/connection-editor/page-wireless-security.c:287
-#: ../src/wireless-dialog.c:957
-#: ../src/wireless-security/wireless-security.c:418
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:112
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "ಡೈನಮಿಕ್ WEP"
 
-#: ../src/applet-dialogs.c:114 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:227
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+msgid "More addresses"
+msgstr ""
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235
-#: ../src/connection-editor/page-wireless-security.c:241
-#: ../src/wireless-dialog.c:914
-msgctxt "No wifi security used"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ಯಾವುದೂ ಇಲ್ಲ"
 
-#: ../src/applet-dialogs.c:244
-msgctxt "No wired security used"
-msgid "None"
-msgstr "ಯಾವುದೂ ಇಲ್ಲ"
-
-#: ../src/applet-dialogs.c:247
-msgctxt "Unknown/unrecognized wired or wifi security"
-msgid "Unknown"
-msgstr "ಅಜ್ಞಾತ"
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
 
-#: ../src/applet-dialogs.c:317 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:319 ../src/applet-dialogs.c:425
-#: ../src/applet-dialogs.c:459 ../src/applet-dialogs.c:475
-#: ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#, fuzzy
+msgctxt "Speed"
+msgid "Unknown"
+msgstr "ಅಜ್ಞಾತ"
+
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#, fuzzy
+msgctxt "Address"
+msgid "Unknown"
+msgstr "ಅಜ್ಞಾತ"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP ವಿಳಾಸ:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "ಪ್ರಸರಣಾ ವಿಳಾಸ:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+#, fuzzy
+msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "ಅಜ್ಞಾತ"
 
-#: ../src/applet-dialogs.c:354
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "ಸಬ್‌ನೆಟ್ ಮಾಸ್ಕ್‍:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ಇತರ್ನೆಟ್ (%s)"
 
-#: ../src/applet-dialogs.c:356
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:358
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:360
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:366
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "ಸಾಮಾನ್ಯ"
 
-#: ../src/applet-dialogs.c:370
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "ಸಂಪರ್ಕಸಾಧನ:"
 
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "ಯಂತ್ರಾಂಶ ವಿಳಾಸ:"
 
 #. Driver
-#: ../src/applet-dialogs.c:392
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ಚಾಲಕ:"
 
-#: ../src/applet-dialogs.c:428
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "ವೇಗ:"
 
-#. Security
-#: ../src/applet-dialogs.c:435
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "ಸುರಕ್ಷತೆ:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:446
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:457 ../src/applet-dialogs.c:562
-msgid "IP Address:"
-msgstr "IP ವಿಳಾಸ:"
-
-#: ../src/applet-dialogs.c:473
-msgid "Broadcast Address:"
-msgstr "ಪ್ರಸರಣಾ ವಿಳಾಸ:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:482
-msgid "Subnet Mask:"
-msgstr "ಸಬ್‌ನೆಟ್ ಮಾಸ್ಕ್‍:"
-
-#: ../src/applet-dialogs.c:492 ../src/applet-dialogs.c:577
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ ರೌಟ್:"
 
-#: ../src/applet-dialogs.c:504
-msgid "Primary DNS:"
-msgstr "ಪ್ರಾಥಮಿಕ DNS:"
-
-#: ../src/applet-dialogs.c:513
-msgid "Secondary DNS:"
-msgstr "ದ್ವಿತೀಯ DNS:"
-
-#: ../src/applet-dialogs.c:523
-msgid "Ternary DNS:"
-msgstr "ತೃತೀಯ DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:538
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:547
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "ಕಡೆಗಣಿಸು"
 
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "ಬಗೆ(_T):"
+
+#: ../src/applet-dialogs.c:822
+#, fuzzy
+msgid "VPN Gateway:"
+msgstr "ಗೇಟ್‌ವೇ"
+
+#: ../src/applet-dialogs.c:828
+#, fuzzy
+msgid "VPN Username:"
+msgstr "ಬಳಕೆದಾರಹೆಸರು(_U):"
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "ಸಂಪರ್ಕ(_n):"
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr "ಅಜ್ಞಾತ"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:653
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "ಯಾವುದೆ ಸಕ್ರಿಯ ಸಂಪರ್ಕಗಳು ಕಂಡುಬಂದಿಲ್ಲ!"
 
-#: ../src/applet-dialogs.c:765
-msgid "Copyright © 2004-2012 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc."
-msgstr "ಹಕ್ಕು © 2004-2012 Red Hat, Inc.\n"
+#: ../src/applet-dialogs.c:985
+#, fuzzy
+msgid ""
+"Copyright © 2004-2014 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:767
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr ""
-"ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಾಧನಗಳು ಹಾಗು ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸುವ ಸೂಚನಾ ಸ್ಥಳದ ಆಪ್ಲೆಟ್."
+msgstr "ನಿಮ್ಮ ಜಾಲಬಂಧ ಸಾಧನಗಳು ಹಾಗು ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸುವ ಸೂಚನಾ ಸ್ಥಳದ ಆಪ್ಲೆಟ್."
 
-#: ../src/applet-dialogs.c:769
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager ಜಾಲತಾಣ"
 
-#: ../src/applet-dialogs.c:772
-msgid "translator-credits"
-msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ ಎಂ. ವಿ. <svenkate@redhat.com>"
-
-#: ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "ಕಾಣೆಯಾದ ಸಂಪನ್ಮೂಲಗಳು"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಜಾಲಬಂಧದ ಗುಪ್ತಪದ"
 
-#: ../src/applet-dialogs.c:824
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' ನೊಂದಿಗೆ ಸಂಪರ್ಕಹೊಂದಲು ಅಗತ್ಯವಿರುವ ಗುಪ್ತಪದ."
 
-#: ../src/applet-dialogs.c:845
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "ಗುಪ್ತಪದ:"
 
-#: ../src/applet.c:836
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
-msgstr "\n"
-"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕಕ್ಕೆ ತಡೆಯುಂಟಾಗಿದೆ."
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "SIM PIN ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
 
-#: ../src/applet.c:839
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "SIM PIN ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯನ್ನು ಅನಿರೀಕ್ಷಿತವಾಗಿ "
-"ನಿಲ್ಲಿಸಲಾಗಿದೆ."
+"'%s' ಎಂಬ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನವನ್ನು ಬಳಸುವ ಮೊದಲು ಅದಕ್ಕೆ ಒಂದು SIM PIN ಕೋಡ್‌ನ "
+"ಅಗತ್ಯವಿರುತ್ತದೆ."
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+#, fuzzy
+msgid "PIN code:"
+msgstr "PIN ಕೋಡ್‌:"
 
-#: ../src/applet.c:842
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+#, fuzzy
+msgid "Show PIN code"
+msgstr "PIN ಕೋಡ್‌ ಅನ್ನು ತೋರಿಸು:"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "SIM PUK ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "SIM PUK ಅನ್‌ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯು ಅಮಾನ್ಯವಾದ ಸಂರಚನೆಯನ್ನು "
-"ಮರಳಿಸಿದೆ."
+"'%s' ಎಂಬ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನವನ್ನು ಬಳಸುವ ಮೊದಲು ಅದಕ್ಕೆ ಒಂದು SIM PUK ಕೋಡ್‌ನ "
+"ಅಗತ್ಯವಿರುತ್ತದೆ."
 
-#: ../src/applet.c:845
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
-msgstr "\n"
-"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ ಸಂಪರ್ಕದ ಪ್ರಯತ್ನದ ಕಾಲಾವಧಿ ಮೀರಿದೆ."
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+#, fuzzy
+msgid "PUK code:"
+msgstr "PUK ಕೋಡ್:"
 
-#: ../src/applet.c:848
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
-""
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+#, fuzzy
+msgid "New PIN code:"
+msgstr "ಹೊಸ PIN ಕೋಡ್‌:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+#, fuzzy
+msgid "Re-enter new PIN code:"
+msgstr "ಹೊಸ PIN ಕೋಡ್ ಅನ್ನು ಮರಳಿ ನಮೂದಿಸಿ:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+#, 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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
 msgstr ""
-"\n"
-"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯು ಸರಿಯಾದ ಸಮಯದಲ್ಲಿ "
-"ಆರಂಭಗೊಳ್ಳಲಿಲ್ಲ."
 
-#: ../src/applet.c:851
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯು ಆರಂಭಗೊಳ್ಳಲು ವಿಫಲಗೊಂಡಿದೆ."
+"IP ವಿಳಾಸಗಳು ಜಾಲಬಂಧದಲ್ಲಿ ನಿಮ್ಮ ಗಣಕವನ್ನು ಗುರುತಿಸುತ್ತವೆ.  IP ವಿಳಾಸವನ್ನು ಸೇರಿಸಲು "
+"\"ಸೇರಿಸು\" ಗುಂಡಿಯನ್ನು ಒತ್ತಿ."
 
-#: ../src/applet.c:854
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+#: ../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
+msgid "_Add"
 msgstr ""
-"\n"
-"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ ಮಾನ್ಯವಾದ ಯಾವುದೆ VPN ರಹಸ್ಯಗಳಿಲ್ಲ "
-"(ಸೀಕ್ರೇಟ್‌ಗಳಿಲ್ಲ)."
 
-#: ../src/applet.c:857
-#, c-format
-msgid "\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+#. 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
+msgid "_Delete"
+msgstr "ಅಳಿಸು (_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+#, 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
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"ಅಮಾನ್ಯವಾದ VPN ರಹಸ್ಯಗಳಿರದ(ಸಿಕ್ರೇಟ್‌ಗಳಿರದ) VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ."
+"ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ, ಈ ಸಂಪರ್ಕವನ್ನು ಎಂದಿಗೂ ಸಹ ಪೂರ್ವನಿಯೋಜಿತ ಜಾಲಬಂಧವಾಗಿ ಬಳಸಲಾಗುವುದಿಲ್ಲ."
+
+#: ../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/applet.c:864
-#, c-format
-msgid "\n"
-"The VPN connection '%s' failed."
-msgstr "\n"
-"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ."
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+#, fuzzy
+msgid "Create…"
+msgstr "ರಚಿಸು(_r)"
 
-#: ../src/applet.c:882
-#, c-format
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "ಹೊಸ ಸಂಪರ್ಕವನ್ನು ರಚಿಸು"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
-msgstr "\n"
-"VPN ಸಂಪರ್ಕ '%s' ಕಡಿದು ಹೋಗಿದೆ ಏಕೆಂದರೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕಕ್ಕೆ ತಡೆಯುಂಟಾಗಿದೆ."
+"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."
+msgstr ""
 
-#: ../src/applet.c:885
-#, c-format
-msgid "\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
-msgstr "\n"
-"VPN ಸಂಪರ್ಕ '%s' ಕಡಿದು ಹೋಗಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯನ್ನು ನಿಲ್ಲಿಸಲಾಗಿದೆ."
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr "ರೌಂಡ್-ರಾಬಿನ್"
 
-#: ../src/applet.c:891
-#, c-format
-msgid "\n"
-"The VPN connection '%s' disconnected."
-msgstr "\n"
-"VPN ಸಂಪರ್ಕ '%s' ಕಡಿದು ಹೋಗಿದೆ."
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr "ಸಕ್ರಿಯ ಬ್ಯಾಕ್ಅಪ್"
 
-#: ../src/applet.c:922
-msgid "VPN Login Message"
-msgstr "VPN ಪ್ರವೇಶ ಸಂದೇಶ"
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr "XOR"
 
-#: ../src/applet.c:934 ../src/applet.c:942 ../src/applet.c:989
-msgid "VPN Connection Failed"
-msgstr "VPN ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr "ಪ್ರಸರಣೆ"
 
-#: ../src/applet.c:996
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr "802.3ad"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr "ಅಡಾಪ್ಟೀವ್ ಟ್ರಾನ್ಸ್‌ಮಿಟ್ ಲೋಡ್ ಬ್ಯಾಲೆನ್ಸಿಂಗ್"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr "ಅಡಾಪ್ಟೀವ್ ಲೋಡ್ ಬ್ಯಾಲೆನ್ಸಿಂಗ್"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr "MII (ಸಲಹೆ ಮಾಡಲಾಗುವ)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr "ARP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+msgid "Bonded _connections:"
+msgstr "ಬಾಂಡ್ ಮಾಡಿದ ಸಂಪರ್ಕಗಳು:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "ಸಂಪಾದಿಸು (_E)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr "ಮೇಲ್ವಿಚಾರಣಾ ಫ್ರೀಕ್ವೆನ್ಸಿ ( _f):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:"
+msgstr "ಸಂಪರ್ಕಸಾಧನದ ಹೆಸರು (_I):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr "ಕೊಂಡಿ ಮೇಲ್ವಿಚಾರಣೆ (_L):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr "ARP ಗುರಿಗಳು (_t):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"VPN ಸಂಪರ್ಕ '%s' ವಿಫಲಗೊಂಡಿದೆ ಏಕೆಂದರೆ VPN ಸೇವೆಯು ಆರಂಭಗೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ.\n"
-"\n"
-"%s"
-
-#: ../src/applet.c:999
-#, c-format
-msgid "\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
-msgstr "\n"
-"VPN ಸಂಪರ್ಕ '%s' ಆರಂಭಗೊಳ್ಳುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ.\n"
-"\n"
-"%s"
+"ಕೊಂಡಿ ಸ್ಥಿತಿಯನ್ನು ಪರಿಶೀಲಿಸುವಾಗ, ಒಂದು IP  ವಿಳಾಸ, ಅಥವ ಒಂದು ವಿರಾಮ-ಚಿಹ್ನೆಯಿಂದ "
+"ಪ್ರತ್ಯೇಕಗೊಂಡ IP ವಿಳಾಸಗಳ ಪಟ್ಟಿ."
 
-#: ../src/applet.c:1346
-msgid "device not ready (firmware missing)"
-msgstr "ಸಾಧನವು ಸಿದ್ಧಗೊಂಡಿಲ್ಲ (ಫರ್ಮ್-ವೇರ್ ಕಾಣಿಸುತ್ತಿಲ್ಲ)"
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr "ಲಿಂಕ್ ಅಪ್ ವಿಳಂಬ (_u):"
 
-#: ../src/applet.c:1348
-msgid "device not ready"
-msgstr "ಸಾಧನವು ಸಿದ್ಧಗೊಂಡಿಲ್ಲ"
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr "ಲಿಂಕ್ ಡೌನ್ ವಿಳಂಬ (_d):"
 
-#: ../src/applet.c:1374
-msgid "Disconnect"
-msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕು"
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "ಪ್ರಾಥಮಿಕ DNS:"
 
-#: ../src/applet.c:1388
-msgid "device not managed"
-msgstr "ಸಾಧನವನ್ನು ನಿರ್ವಹಿಸಲಾಗಿಲ್ಲ"
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr ""
 
-#: ../src/applet.c:1546
-msgid "No network devices 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+msgid "_MTU:"
+msgstr "_MTU:"
 
-#: ../src/applet.c:1599
-msgid "_VPN Connections"
-msgstr "_VPN ಸಂಪರ್ಕಗಳು"
+#: ../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
+msgid "bytes"
+msgstr "ಬೈಟ್‌ಗಳು"
 
-#: ../src/applet.c:1652
-msgid "_Configure VPN..."
-msgstr "VPN ಅನ್ನು ಸಂರಚಿಸು(_C)..."
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
 
-#: ../src/applet.c:1656
-msgid "_Disconnect VPN"
-msgstr "VPN ಇಂದ ಸಂಪರ್ಕವನ್ನು ಕಡಿದು ಹಾಕು(_D)"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "ಸುರಕ್ಷತೆ(_S):"
 
-#: ../src/applet.c:1765
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager ಚಾಲನೆಯಲ್ಲಿಲ್ಲ..."
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#, fuzzy
+msgid "_Hairpin mode:"
+msgstr "ವರ್ಗಾವಣೆ ಕ್ರಮ (_T):"
 
-#: ../src/applet.c:1770 ../src/applet.c:2696
-msgid "Networking disabled"
-msgstr "ಜಾಲಬಂಧವನ್ನು ಅಶಕ್ತಗೊಳಿಸಲಾಗಿದೆ"
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "ಬಾಂಡ್ ಮಾಡಿದ ಸಂಪರ್ಕಗಳು:"
 
-#. 'Enable Networking' item
-#: ../src/applet.c:1998
-msgid "Enable _Networking"
-msgstr "ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸು(_N)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#, fuzzy
+msgid "_Forward delay:"
+msgstr "ಲಿಂಕ್ ಡೌನ್ ವಿಳಂಬ (_d):"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2007
-msgid "Enable _Wireless"
-msgstr "ವೈರ್ಲೆಸ್ ಅನ್ನು ಶಕ್ತಗೊಳಿಸು(_W)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2016
-msgid "Enable _Mobile Broadband"
-msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡನ್ನು ಶಕ್ತಗೊಳಿಸು(_M)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#, fuzzy
+msgid "s"
+msgstr "ms"
 
-#. Toggle notifications item
-#: ../src/applet.c:2027
-msgid "Enable N_otifications"
-msgstr "ಸೂಚನೆಗಳನ್ನು ಶಕ್ತಗೊಳಿಸು(_o)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸು(_N)"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2038
-msgid "Connection _Information"
-msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿ(_I)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2048
-msgid "Edit Connections..."
-msgstr "ಸಂಪರ್ಕಗಳನ್ನು ಸಂಪಾದಿಸು..."
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2062
-msgid "_Help"
-msgstr "ನೆರವು(_H)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2071
-msgid "_About"
-msgstr "ಇದರ ಬಗ್ಗೆ(_A)"
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "ಸ್ವಯಂಚಾಲಿತ"
 
-#: ../src/applet.c:2340
+#: ../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
-msgid "You are now connected to '%s'."
-msgstr "ನೀವು '%s' ಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
+msgid "default"
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
 
-#: ../src/applet.c:2380
-msgid "Disconnected"
-msgstr "ಸಂಪರ್ಕ ಕಡಿದು ಹಾಕಲಾಗಿದೆ"
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
 
-#: ../src/applet.c:2381
-msgid "The network connection has been disconnected."
-msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕವು ಕಡಿದು ಹೋಗಿದೆ."
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "ವಿಳಾಸ"
 
-#: ../src/applet.c:2562
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "ವಿಳಾಸ"
 
-#: ../src/applet.c:2565
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
+msgid "invalid %s for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2571
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid "Network connection '%s' active"
-msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
+msgid "invalid %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2652
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "VPN ಸಂಪರ್ಕ '%s' ಅನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ..."
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2655
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
+msgid "invalid interface-name (%s)"
+msgstr ""
 
-#: ../src/applet.c:2658
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "'%s' ಗಾಗಿ ಒಂದು VPN ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "ಯಾವುದೆ ಸಾಧನ"
 
-#: ../src/applet.c:2661
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr ""
+"ಒಂದು ಗೊತ್ತಿರದ ದೋಷದಿಂದಾಗಿ ಸಂಪರ್ಕ ರಹಸ್ಯಗಳನ್ನು (ಸೀಕ್ರೆಟ್‌ಗಳನ್ನು) ಅಪ್‌ಡೇಟ್ ಮಾಡುವಲ್ಲಿ "
+"ವಿಫಲಗೊಂಡಿದೆ."
 
-#: ../src/applet.c:2700
-msgid "No network connection"
-msgstr "ಯಾವುದೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕವಿಲ್ಲ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "ಈ ಸಂಪರ್ಕಕ್ಕಾಗಿ 802.1X ಸುರಕ್ಷತೆಯನ್ನು ಬಳಸು"
 
-#: ../src/applet.c:3255
-msgid "NetworkManager Applet"
-msgstr "NetworkManager ಆಪ್ಲೆಟ್"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
 
-#: ../src/applet.c:3261 ../src/wired-dialog.c:132
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
 msgstr ""
-"NetworkManager ಆಪ್ಲೆಟ್‌ಗೆ ಕೆಲವು ಅಗತ್ಯ ಸಂಪನ್ಮೂಲಗಳು ಕಂಡುಬಂದಿಲ್ಲ (ಗ್ಲೇಡ್ ಕಡತವು "
-"ಕಂಡುಬಂದಿಲ್ಲ)."
 
-#: ../src/applet.glade.h:1
-msgid "Other Wireless Network..."
-msgstr "ಇತರೆ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.glade.h:2
-msgid "_Wireless security:"
-msgstr "ವೈರ್ಲೆಸ್ ಸುರಕ್ಷತೆ(_W):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.glade.h:3
-msgid " "
-msgstr " "
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.glade.h:4
-msgid "_Network name:"
-msgstr "ಜಾಲಬಂಧದ ಹೆಸರು(_N):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.glade.h:5
-msgid "Co_nnection:"
-msgstr "ಸಂಪರ್ಕ(_n):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.glade.h:6
-msgid "Wireless _adapter:"
-msgstr "ವೈರ್ಲೆಸ್ ಅಡಾಪ್ಟರ್(_a):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.glade.h:7
-msgid "C_onnect"
-msgstr "ಸಂಪರ್ಕ ಜೋಡಿಸು(_o)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.glade.h:8
-msgid "Connection Information"
-msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.glade.h:9
-msgid "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">ಸಕ್ರಿಯ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು</span>"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#: ../src/applet.glade.h:10
-msgid "_Key:"
-msgstr "ಕೀಲಿ(_K):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#: ../src/applet.glade.h:11
-msgid "Sho_w key"
-msgstr "ಕೀಲಿಯನ್ನು ತೋರಿಸು(_w)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#: ../src/applet.glade.h:12
-msgid "_Authentication:"
-msgstr "ದೃಢೀಕರಣ(_A):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
 
-#: ../src/applet.glade.h:13
-msgid "Open System\n"
-"Shared Key"
-msgstr "ಮುಕ್ತ ವ್ಯವಸ್ಥೆ\n"
-"ಹಂಚಲಾದ ಕೀಲಿ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
 
-#: ../src/applet.glade.h:15
-msgid "WEP inde_x:"
-msgstr "WEP ಸೂಚಿ(_x):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
 
-#: ../src/applet.glade.h:16
-msgid "1 (Default)\n"
-"2\n"
-"3\n"
-"4"
-msgstr "1 (ಪೂರ್ವನಿಯೋಜಿತ)\n"
-"2\n"
-"3\n"
-"4"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#: ../src/applet.glade.h:20 ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
-msgid "_Username:"
-msgstr "ಬಳಕೆದಾರಹೆಸರು(_U):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#: ../src/applet.glade.h:21 ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "_Password:"
-msgstr "ಗುಪ್ತಪದ(_P):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#: ../src/applet.glade.h:22 ../src/connection-editor/ce-page-dsl.ui.h:3
-msgid "Sho_w password"
-msgstr "ಗುಪ್ತಪದವನ್ನು ತೋರಿಸು(_w)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.glade.h:23
-msgid "WPA Protocol:"
-msgstr "WPA ಪ್ರೊಟೊಕಾಲ್:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.glade.h:24
-msgid "Anony_mous identity:"
-msgstr "ಅನಾಮಧೇಯ ಗುರುತು(_m):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.glade.h:25
-msgid "_PAC file:"
-msgstr "_PAC ಕಡತ:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.glade.h:26
-msgid "I_nner authentication:"
-msgstr "ಆಂತರಿಕ ದೃಢೀಕರಣ(_n):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.glade.h:27
-msgid "_Allow automatic PAC provisioning"
-msgstr "ಸ್ವಯಂಚಾಲಿತ P_AC ಪ್ರಾವಿಶನಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸು"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.glade.h:28
-msgid "Anonymous\n"
-"Authenticated\n"
-"Both"
-msgstr "ಅಜ್ಞಾತ\n"
-"ದೃಢೀಕೃತ\n"
-"ಎರಡೂ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.glade.h:31
-msgid "I_dentity:"
-msgstr "ಗುರುತು(_d):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
 
-#: ../src/applet.glade.h:32
-msgid "_User certificate:"
-msgstr "ಬಳಕೆದಾರ ಪ್ರಮಾಣಪತ್ರ(_U):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
 
-#: ../src/applet.glade.h:33
-msgid "C_A certificate:"
-msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
 
-#: ../src/applet.glade.h:34
-msgid "No CA certificate is _required"
-msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.glade.h:35
-msgid "Private _key:"
-msgstr "ಖಾಸಗಿ ಕೀಲಿ(_k):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/applet.glade.h:36
-msgid "_Private key password:"
-msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/applet.glade.h:37
-msgid "As_k for this password every time"
-msgstr "ಪ್ರತಿ ಬಾರಿಯೂ ಈ ಗುಪ್ತಪದಕ್ಕಾಗಿ ಕೇಳು(_k)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/applet.glade.h:38
-msgid "_PEAP version:"
-msgstr "_PEAP ಆವೃತ್ತಿ:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/applet.glade.h:39
-msgid "Automatic\n"
-"Version 0\n"
-"Version 1"
-msgstr "ಸ್ವಯಂಚಾಲಿತ\n"
-"ಆವೃತ್ತಿ 0\n"
-"ಆವೃತ್ತಿ 1"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/applet.glade.h:42
-msgid "label"
-msgstr "ಲೇಬಲ್"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/applet.glade.h:43
-msgid "Show it"
-msgstr "ಅದನ್ನು ತೋರಿಸು"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/applet.glade.h:44
-msgid "_Unlock"
-msgstr "ಅನ್‌ಲಾಕ್ ಮಾಡು(_U)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "ಸ್ವಯಂಚಾಲಿತ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:236
-#: ../src/connection-editor/nm-connection-editor.c:822
-msgid "Failed to update connection secrets due to an unknown error."
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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-bond.ui.h:1
-msgid "Round-robin"
-msgstr "ರೌಂಡ್-ರಾಬಿನ್"
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-msgid "Active backup"
-msgstr "ಸಕ್ರಿಯ ಬ್ಯಾಕ್ಅಪ್"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
-msgid "XOR"
-msgstr "XOR"
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+msgid "Enter the traffic class for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-msgid "Broadcast"
-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:"
+msgstr "ಬಳಕೆದಾರಹೆಸರು(_U):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
-msgid "802.3ad"
-msgstr "802.3ad"
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "_Service:"
+msgstr "ಸೇವೆ(_S):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
-msgid "Adaptive transmit load balancing"
-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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+msgid "Sho_w password"
+msgstr "ಗುಪ್ತಪದವನ್ನು ತೋರಿಸು(_w)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
-msgid "Adaptive load balancing"
-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:"
+msgstr "ಗುಪ್ತಪದ(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
-msgid "MII (recommended)"
-msgstr "MII (ಸಲಹೆ ಮಾಡಲಾಗುವ)"
+#: ../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
+msgid "Automatic"
+msgstr "ಸ್ವಯಂಚಾಲಿತ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
-msgid "ARP"
-msgstr "ARP"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "ಟ್ವಿಸ್ಟೆಡ್ ಪೇರ್ (TP)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
-msgstr "ಬಾಂಡ್ ಮಾಡಿದ ಸಂಪರ್ಕಗಳು:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "ಅಟ್ಯಾಚ್‌ಮೆಂಟ್ ಯುನಿಟ್ ಇಂಟರ್ಫೇಸ್ (AUI)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "ಕ್ರಮ (_M):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-msgid "_Edit"
-msgstr "ಸಂಪಾದಿಸು (_E)"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "ಮೀಡಿಯಾ ಇಂಡಿಪೆಂಡೆಂಟ್ ಇಂಟರ್ಫೇಸ್ (MII)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:13
-msgid "_Delete"
-msgstr "ಅಳಿಸು (_D)"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
-msgid "Monitoring _frequency:"
-msgstr "ಮೇಲ್ವಿಚಾರಣಾ ಫ್ರೀಕ್ವೆನ್ಸಿ ( _f):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "ms"
-msgstr "ms"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-msgid "_Interface name:"
-msgstr "ಸಂಪರ್ಕಸಾಧನದ ಹೆಸರು (_I):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
-msgid "_Link Monitoring:"
-msgstr "ಕೊಂಡಿ ಮೇಲ್ವಿಚಾರಣೆ (_L):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "ಸಂಪರ್ಕಸ್ಥಾನ(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "ARP _targets:"
-msgstr "ARP ಗುರಿಗಳು (_t):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "ವೇಗ(_S):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "ಸಂಪೂರ್ಣ ಡ್ಯೂಪ್ಲೆಕ್ಸ್(_x)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "ಸ್ವಯಂಪರಿಹರಿಸು(ಆಟೊನೆಗೋಶಿಯೇಟ್)(_o)"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "ಸೇವೆ(_S):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#, fuzzy
+msgid "C_loned MAC address:"
+msgstr "ತದ್ರೂಪುಗೊಳಿಸಲಾದ _MAC ವಿಳಾಸ:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid ""
-"An IP address, or a comma-separated list of IP addresses, to look for when "
-"checking the link status."
+"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 ""
-"ಕೊಂಡಿ ಸ್ಥಿತಿಯನ್ನು ಪರಿಶೀಲಿಸುವಾಗ, ಒಂದು IP  ವಿಳಾಸ, ಅಥವ ಒಂದು ವಿರಾಮ-ಚಿಹ್ನೆಯಿಂದ "
-"ಪ್ರತ್ಯೇಕಗೊಂಡ IP ವಿಳಾಸಗಳ ಪಟ್ಟಿ."
+"ಇಲ್ಲಿ ನಮೂದಿಸಲಾದ MAC ವಿಳಾಸವನ್ನು ಈ ಸಂಪರ್ಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾದ ಸಾಧನಕ್ಕಾಗಿನ ಯಂತ್ರಾಂಶ "
+"ವಿಳಾಸವಾಗಿ ಬಳಸಲಾಗುತ್ತದೆ.  ಈ ಸವಲತ್ತನ್ನು MAC ಕ್ಲೋನಿಂಗ್ ಅಥವ ಸ್ಪೂಫಿಂಗ್ ಎಂದು "
+"ಕರೆಯಲಾಗುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
-msgid "Link _up delay:"
-msgstr "ಲಿಂಕ್ ಅಪ್ ವಿಳಂಬ (_u):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _down delay:"
-msgstr "ಲಿಂಕ್ ಡೌನ್ ವಿಳಂಬ (_d):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
-msgstr "ಸೇವೆ(_S):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "ಆಲಕ್ಷಿಸು"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "ವರ್ಗಾವಣೆ ಕ್ರಮ (_T):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "_Device MAC address:"
-msgstr "ಸಾಧನದ MAC ವಿಳಾಸ(_D):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wired.ui.h:19
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "ಬೈಟ್‌ಗಳು"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "ಪ್ರಸರಣೆ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
-"ಈ ಆಯ್ಕೆಯು ಇಲ್ಲಿ ನಮೂದಿಸಲಾದ ಶಾಶ್ವತ MAC ವಿಳಾಸದಿಂದ ಸೂಚಿಸಲಾದ ಜಾಲಬಂಧ ಸಾಧನಕ್ಕೆ ಈ "
-"ಸಂಪರ್ಕವನ್ನು ಲಾಕ್ ಮಾಡುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
+
+#: ../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.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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:7
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 msgid "Datagram"
 msgstr "ಡೇಟಾಗ್ರಾಮ್"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:9
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 msgid "Connected"
 msgstr "ಸಂಪರ್ಕ ಜೋಡಿಸಲಾಗಿದೆ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:1
-#: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#: ../src/connection-editor/page-ip6.c:135
-msgid "Automatic"
-msgstr "ಸ್ವಯಂಚಾಲಿತ"
-
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1352,7 +1749,7 @@ msgstr "ಮ್ಯಾನುವಲ್ DNS ಸಿದ್ಧತೆಗಳೊಂದಿ�
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:162
+#: ../src/connection-editor/page-ip4.c:166
 #: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "ಕೈಯಾರೆ"
@@ -1364,42 +1761,34 @@ 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:180
+#: ../src/connection-editor/page-ip4.c:186
 #: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "ಇತರೆ ಗಣಕಗಳೊಂದಿಗೆ ಹಂಚಲಾಗಿದೆ"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "ವಿಧಾನ(_M):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "<b>Addresses</b>"
-msgstr "<b>ವಿಳಾಸಗಳು</b>"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-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-page-ip6.ui.h:10
+#, fuzzy
+msgid "Addresses"
+msgstr "ವಿಳಾಸ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 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 ಕ್ಲೈಂಟ್ "
+"ಐಡೆಂಟಿಫಯರ್ ಅನುವು ಮಾಡಿಕೊಡುತ್ತದೆ.  ನೀವು DHCP ಕ್ಲೈಂಟ್ ಐಡೆಂಟಿಫಯರನ್ನು ಬಳಸಲು ಬಯಸಿದಲ್ಲಿ "
+"ಅದನ್ನು ಇಲ್ಲಿ ನಮೂದಿಸಿ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1407,22 +1796,26 @@ msgstr ""
 "ಆತಿಥೇಯ ಹೆಸರುಗಳನ್ನು ಪರಿಹರಿಸುವಾಗ ಬಳಸಲಾದ ಡೊಮೈನುಗಳು.ಅನೇಕ ಡೊಮೈನುಗಳಿದ್ದಲ್ಲಿ ಅವನ್ನು "
 "ಪ್ರತ್ಯೇಕಿಸಲು ವಿರಾಮ ಚಿಹ್ನೆಗಳನ್ನು ಬಳಸಿ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:10
-msgid "_Search domains:"
+#: ../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
+#, fuzzy
+msgid "S_earch domains:"
 msgstr "ಹುಡುಕು ಡೊಮೈನ್‌ಗಳು(_S):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "_DNS servers:"
+#: ../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:"
 msgstr "_DNS ಪರಿಚಾರಕಗಳು:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1430,11 +1823,12 @@ msgstr ""
 "ಆತಿಥೇಯ ಹೆಸರುಗಳನ್ನು ಪರಿಹರಿಸಲು ಬಳಸಲಾಗುವ ಡೊಮೈನ್‌ ಹೆಸರಿನ ಪರಿಚಾರಕಗಳ IP ವಿಳಾಸಗಳು. "
 "ಅನೇಕ ಡೊಮೈನ್ ಹೆಸರಿನ ಪರಿಚಾರಕ ವಿಳಾಸಗಳನ್ನು ಪ್ರತ್ಯೇಕಿಸಲು ವಿರಾಮ ಚಿಹ್ನೆಗಳನ್ನು ಬಳಸಿ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
-msgid "Require IPv4 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#, 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1442,36 +1836,44 @@ msgstr ""
 "IPv6-ಸಾಮರ್ಥ್ಯವನ್ನು ಹೊಂದಿರುವ ಜಾಲಬಂಧಗಳೊಂದಿಗೆ ಸಂಪರ್ಕ ಹೊಂದುವಾಗ, ಎಲ್ಲಿಯಾದರೂ IPv4 "
 "ಸಂರಚನೆಯು ವಿಫಲಗೊಂಡು IPv6 ಯಶಸ್ವಿಯಾದಲ್ಲಿ ಸಂಪರ್ಕವು ಪೂರ್ಣಗೊಳ್ಳಲು ಅನುಮತಿಸುತ್ತದೆ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "_Routes&#x2026;"
-msgstr "ರೌಟ್‌ಗಳು (_R)&#x2026;"
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:18
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "Ig_nore automatically obtained routes"
-msgstr "ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಡೆಯಲಾದ ರೌಟ್‌ಗಳನ್ನು ಆಲಕ್ಷಿಸು(_n)"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "ಅಶಕ್ತಗೊಂಡ"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:19
 #: ../src/connection-editor/ce-page-ip6.ui.h:17
-msgid "Use this c_onnection only for resources on its network"
+#, fuzzy
+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 ""
-"ಈ ಸಂಪರ್ಕವನ್ನು ಕೇವಲ ಅದರ ಜಾಲಬಂಧದ ಸಂಪನ್ಮೂಲಗಳನ್ನು ಬಳಸಲು ಮಾತ್ರವೆ ಉಪಯೋಗಿಸು(_o)"
+"ಆತಿಥೇಯ ಹೆಸರುಗಳನ್ನು ಪರಿಹರಿಸಲು ಬಳಸಲಾಗುವ ಡೊಮೈನ್‌ ಹೆಸರಿನ ಪರಿಚಾರಕಗಳ IP ವಿಳಾಸಗಳು. "
+"ಅನೇಕ ಡೊಮೈನ್ ಹೆಸರಿನ ಪರಿಚಾರಕ ವಿಳಾಸಗಳನ್ನು ಪ್ರತ್ಯೇಕಿಸಲು ವಿರಾಮ ಚಿಹ್ನೆಗಳನ್ನು ಬಳಸಿ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:20
 #: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+msgid "IPv6 _privacy extensions:"
 msgstr ""
-"ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ, ಈ ಸಂಪರ್ಕವನ್ನು ಎಂದಿಗೂ ಸಹ ಪೂರ್ವನಿಯೋಜಿತ ಜಾಲಬಂಧವಾಗಿ "
-"ಬಳಸಲಾಗುವುದಿಲ್ಲ."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#, fuzzy
+msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "ಈ ಸಂಪರ್ಕವು ಪೂರ್ಣಗೊಳ್ಳಲು IPv6 ವಿಳಾಸ ನೀಡಿಕೆಯ ಅಗತ್ಯವಿರುತ್ತದೆ"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1480,79 +1882,60 @@ msgstr ""
 "ಸಂರಚನೆಯು ವಿಫಲಗೊಂಡು IPv4 ಯಶಸ್ವಿಯಾದಲ್ಲಿ ಸಂಪರ್ಕವು ಪೂರ್ಣಗೊಳ್ಳಲು ಅನುಮತಿಸುತ್ತದೆ."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "ಯಾವುದಾದರೂ"
+msgid "Basic"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3G ಗೆ (UMTS/HSPA) ಆದ್ಯತೆ ನೀಡು"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2Gಗೆ (GPRS/EDGE) ಆದ್ಯತೆ ನೀಡು"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "<b>Basic</b>"
-msgstr "<b>ಮೂಲಭೂತ</b>"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "Nu_mber:"
 msgstr "ಸಂಖ್ಯೆ(_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "<b>Advanced</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#, fuzzy
+msgid "Advanced"
 msgstr "<b>ಸುಧಾರಿತ</b>"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "ಜಾಲಬಂಧ ID(_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
-msgid "_Type:"
-msgstr "ಬಗೆ(_T):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "ಬದಲಾಯಿಸು..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-msgid "PI_N:"
-msgstr "PI_N:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-msgid "Allow roaming if home network is not available"
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#, fuzzy
+msgid "Allow _roaming if home network is not available"
 msgstr "ನೆಲೆ(ಹೋಮ್) ಜಾಲಬಂಧ ಲಭ್ಯವಿಲ್ಲದೆ ಇಲ್ಲದೆ ಇದ್ದಲ್ಲಿ ರೋಮಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸು"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "<b>Authentication</b>"
-msgstr "<b>ದೃಢೀಕರಣ</b>"
+#, fuzzy
+msgid "Authentication"
+msgstr "ದೃಢೀಕರಣ(_A):"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
 msgid "Allowed methods:"
 msgstr "ಅನುಮತಿ ಇರುವ ವಿಧಾನಗಳು:"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:3
-msgid "Configure _Methods&#x2026;"
+#, fuzzy
+msgid "Configure _Methods…"
 msgstr "ಸಂರಚನಾ ವಿಧಾನಗಳು (_M)&#x2026;"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "<b>Compression</b>"
+#, fuzzy
+msgid "Compression"
 msgstr "<b>ಸಂಕುಚನೆ</b>"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:5
@@ -1580,423 +1963,761 @@ msgid "Use TCP _header compression"
 msgstr "TCP ಹೆಡರ್ ಸಂಕುಚನೆಯನ್ನು ಬಳಸು(_h)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "<b>Echo</b>"
-msgstr "<b>ಪ್ರತಿಧ್ವನಿ</b>"
+msgid "Echo"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
 msgid "Send PPP _echo packets"
 msgstr "PPP ಪ್ರತಿಧ್ವನಿ ಪ್ಯಾಕೆಟ್‌ಗಳನ್ನು ಕಳುಹಿಸು(_e)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:13
-msgid "<b>Allowed Authentication Methods</b>"
-msgstr "<b>ಅನುಮತಿಯಿರುವ ದೃಢೀಕರಣ ವಿಧಾನಗಳು</b>"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:14
-msgid "_EAP"
-msgstr "_EAP"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:15
-msgid "Extensible Authentication Protocol"
-msgstr "ಎಕ್ಸ್‌ಟೆನ್ಸಿಬಲ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:16
-msgid "_PAP"
-msgstr "_PAP"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:17
-msgid "Password Authentication Protocol"
-msgstr "ಗುಪ್ತಪದ ದೃಢೀಕರಣ ಪ್ರೊಟೊಕಾಲ್"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:18
-msgid "C_HAP"
-msgstr "C_HAP"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:19
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "ಚಾಲೆಂಜ್ ಹ್ಯಾಂಡ್‌ಶೇಕ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:20
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:21
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "ಮೈಕ್ರೊಸಾಫ್ಟ್ ಚಾಲೆಂಜ್ ಹ್ಯಾಂಡ್‌ಶೇಕ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:22
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+msgid "_Import team configuration from a file..."
+msgstr "ಉಳಿಸಲಾದ VPN ಸಂರಚನೆಯನ್ನು ರಫ್ತು ಮಾಡಿ..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:23
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "ಮೈಕ್ರೊಸಾಫ್ಟ್ ಚಾಲೆಂಜ್ ಹ್ಯಾಂಡ್‌ಶೇಕ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್ ಆವೃತ್ತಿ 2"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "ಬಾಂಡ್ ಮಾಡಿದ ಸಂಪರ್ಕಗಳು:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:24
-msgid ""
-"<i>In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods.</i>"
-msgstr ""
-"<i>ಹೆಚ್ಚಿನ ಸಂದರ್ಭಗಳಲ್ಲಿ, ಒದಗಿಸುವವರ PPP ಪರಿಚಾರಕಗಳು ಎಲ್ಲಾ ದೃಢೀಕರಣ ವಿಧಾನಗಳನ್ನು "
-"ಬೆಂಬಲಿಸುತ್ತವೆ.  ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಲ್ಲಿ, ಕೆಲವು ದೃಢೀಕರಣಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸಿ ನಂತರ "
-"ಪ್ರಯತ್ನಿಸಿ.</i>"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "ಉಳಿಸಲಾದ VPN ಸಂರಚನೆಯನ್ನು ರಫ್ತು ಮಾಡಿ..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "ಮೂಲ ಸಂಪರ್ಕಸಾಧನ (_P):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN ಸಂಪರ್ಕಸಾಧನದ ಹೆಸರು (_n):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "ತದ್ರೂಪುಗೊಳಿಸಲಾದ _MAC ವಿಳಾಸ:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN _id:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
-msgid "Device name + number"
-msgstr "ಸಾಧನದ ಹೆಸರು + ಸಂಖ್ಯೆ"
-
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
-msgid "\"vlan\" + number"
-msgstr "\"vlan\" + ಸಂಖ್ಯೆ"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "ಟ್ವಿಸ್ಟೆಡ್ ಪೇರ್ (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "ಅಟ್ಯಾಚ್‌ಮೆಂಟ್ ಯುನಿಟ್ ಇಂಟರ್ಫೇಸ್ (AUI)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "ಮೀಡಿಯಾ ಇಂಡಿಪೆಂಡೆಂಟ್ ಇಂಟರ್ಫೇಸ್ (MII)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "ಸಂಪರ್ಕಸ್ಥಾನ(_P):"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "ವೇಗ(_S):"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "ಸಂಪೂರ್ಣ ಡ್ಯೂಪ್ಲೆಕ್ಸ್(_x)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "ಸ್ವಯಂಪರಿಹರಿಸು(ಆಟೊನೆಗೋಶಿಯೇಟ್)(_o)"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
+msgstr "ಸಾಧನದ ಹೆಸರು + ಸಂಖ್ಯೆ"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.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 ""
-"ಇಲ್ಲಿ ನಮೂದಿಸಲಾದ MAC ವಿಳಾಸವನ್ನು ಈ ಸಂಪರ್ಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾದ ಸಾಧನಕ್ಕಾಗಿನ "
-"ಯಂತ್ರಾಂಶ ವಿಳಾಸವಾಗಿ ಬಳಸಲಾಗುತ್ತದೆ.  ಈ ಸವಲತ್ತನ್ನು MAC ಕ್ಲೋನಿಂಗ್ ಅಥವ ಸ್ಪೂಫಿಂಗ್ "
-"ಎಂದು ಕರೆಯಲಾಗುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr "\"vlan\" + ಸಂಖ್ಯೆ"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "ಸುರಕ್ಷತೆ:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "Infrastructure"
-msgstr "ಮೂಲಭೂತ ವ್ಯವಸ್ಥೆ"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "ತಾತ್ಕಾಲಿಕ"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "ವರ್ಗಾವಣೆ ಸಾಮರ್ಥ್ಯ(_w):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "ದರ(_R):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"ಈ ಆಯ್ಕೆಯು ಇಲ್ಲಿ ನಮೂದಿಸಲಾದ BSSID ವಿಳಾಸದಿಂದ ಸೂಚಿಸಲಾದ ವೈರ್ಲೆಸ್ ಎಕ್ಸೆಸ್ "
-"ಪಾಯಿಂಟ್‌ಗೆ (AP) ಈ ಸಂಪರ್ಕವನ್ನು ಲಾಕ್ ಮಾಡುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "ಚಾನಲ್(_h):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "ಬ್ಯಾಂಡ್(_d):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "M_ode:"
-msgstr "ಕ್ರಮ(_o):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:21
-msgid "_SSID:"
-msgstr "_SSID:"
+#: ../src/connection-editor/ce-polkit-button.c:74
+msgid "No polkit authorization to perform the action"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
-msgstr "ಸುರಕ್ಷತೆ(_S):"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#, fuzzy
+msgid "Allowed Authentication Methods"
+msgstr "<b>ಅನುಮತಿಯಿರುವ ದೃಢೀಕರಣ ವಿಧಾನಗಳು</b>"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:504
-#: ../src/connection-editor/ip6-routes-dialog.c:462
-#: ../src/connection-editor/page-ip4.c:738
-#: ../src/connection-editor/page-ip6.c:723
-msgid "Address"
-msgstr "ವಿಳಾಸ"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr "_EAP"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:520
-#: ../src/connection-editor/page-ip4.c:755
-msgid "Netmask"
-msgstr "ನೆಟ್‍ಮಾಸ್ಕ್‍"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr "ಎಕ್ಸ್‌ಟೆನ್ಸಿಬಲ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:536
-#: ../src/connection-editor/ip6-routes-dialog.c:494
-#: ../src/connection-editor/page-ip4.c:772
-#: ../src/connection-editor/page-ip6.c:757
-msgid "Gateway"
-msgstr "ಗೇಟ್‌ವೇ"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr "_PAP"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:552
-#: ../src/connection-editor/ip6-routes-dialog.c:510
-msgid "Metric"
-msgstr "ಮೆಟ್ರಿಕ್"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr "ಗುಪ್ತಪದ ದೃಢೀಕರಣ ಪ್ರೊಟೊಕಾಲ್"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:478
-#: ../src/connection-editor/page-ip6.c:740
-msgid "Prefix"
-msgstr "ಪ್ತಿಫಿಕ್ಸ್"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr "C_HAP"
 
-#: ../src/connection-editor/new-connection.c:106
-#: ../src/connection-editor/page-wired.c:236
-msgid "Wired"
-msgstr "ತಂತಿಯುಕ್ತ"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "ಚಾಲೆಂಜ್ ಹ್ಯಾಂಡ್‌ಶೇಕ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "ಮೈಕ್ರೊಸಾಫ್ಟ್ ಚಾಲೆಂಜ್ ಹ್ಯಾಂಡ್‌ಶೇಕ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "ಮೈಕ್ರೊಸಾಫ್ಟ್ ಚಾಲೆಂಜ್ ಹ್ಯಾಂಡ್‌ಶೇಕ್ ಅತೆಂಟಿಕೇಶನ್ ಪ್ರೊಟೊಕಾಲ್ ಆವೃತ್ತಿ 2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#, 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 ""
+"<i>ಹೆಚ್ಚಿನ ಸಂದರ್ಭಗಳಲ್ಲಿ, ಒದಗಿಸುವವರ PPP ಪರಿಚಾರಕಗಳು ಎಲ್ಲಾ ದೃಢೀಕರಣ ವಿಧಾನಗಳನ್ನು "
+"ಬೆಂಬಲಿಸುತ್ತವೆ.  ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಲ್ಲಿ, ಕೆಲವು ದೃಢೀಕರಣಗಳನ್ನು ಅಶಕ್ತಗೊಳಿಸಿ ನಂತರ "
+"ಪ್ರಯತ್ನಿಸಿ.</i>"
 
-#: ../src/connection-editor/new-connection.c:112
-#: ../src/connection-editor/page-wireless.c:435
-msgid "Wireless"
-msgstr "ವೈರ್ಲೆಸ್"
+#: ../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 "ಸ್ವಯಂ ಎತರ್ನೆಟ್"
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../src/connection-editor/new-connection.c:124
-#: ../src/connection-editor/page-dsl.c:161
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../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/new-connection.c:130
-#: ../src/connection-editor/page-infiniband.c:157
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:136
-#: ../src/connection-editor/page-bond.c:798 ../src/utils/utils.c:216
+#: ../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
 msgid "Bond"
 msgstr "ಬಾಂಡ್"
 
-#: ../src/connection-editor/new-connection.c:142
-#: ../src/connection-editor/page-vlan.c:606 ../src/utils/utils.c:220
+#: ../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
+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
+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"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:155
-#: ../src/connection-editor/new-connection.c:295
-#: ../src/connection-editor/page-vpn.c:116
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:245
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "ಯಂತ್ರಾಂಶ"
 
-#: ../src/connection-editor/new-connection.c:265
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "ವರ್ಚುವಲ್"
 
-#: ../src/connection-editor/new-connection.c:333
-#: ../src/connection-editor/new-connection.c:335
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "ಉಳಿಸಲಾದ VPN ಸಂರಚನೆಯನ್ನು ರಫ್ತು ಮಾಡಿ..."
 
-#: ../src/connection-editor/new-connection.c:363
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "ಅಜ್ಞಾತ ದೋಷದಿಂದಾಗಿ ಸಂಪರ್ಕ ಸಂಪಾದಕ ಸಂವಾದವನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/new-connection.c:372
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "ಹೊಸ ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../src/connection-editor/new-connection.c:516
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "ಸಂಪರ್ಕವನ್ನು ಅಳಿಸುವುದು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/connection-editor/new-connection.c:596
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "ನೀವು ನಿಜವಾಗಲೂ ಸಂಪರ್ಕ %s ಅನ್ನು ಅಳಿಸಲು ಬಯಸುತ್ತೀರೆ?"
 
-#: ../src/connection-editor/page-bond.c:579
+#: ../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
+msgid "Address"
+msgstr "ವಿಳಾಸ"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "ನೆಟ್‍ಮಾಸ್ಕ್‍"
+
+#: ../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
+msgid "Gateway"
+msgstr "ಗೇಟ್‌ವೇ"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "ಮೆಟ್ರಿಕ್"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "ಪ್ತಿಫಿಕ್ಸ್"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
-msgid "%s slave %d"
-msgstr "%s ಸ್ಲೇವ್ %d"
+msgid "Editing %s"
+msgstr "%s ಅನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/connection-editor/page-bond.c:616
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "ಹೆಸರಿಲ್ಲದ ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "ಸಂಪರ್ಕದ ಹೆಸರು(_n):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "ಸಂಪಾದಕವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "ಸಂಪರ್ಕವನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲತೆ"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
-"Select the type of connection that will be used for the slaves of this bond."
-msgstr "ಈ ಬಾಂಡ್‌ನ ಸ್ಲೇವ್‌ಗಳಲ್ಲಿ ಬಳಸಲಾಗುವ ಸಂಪರ್ಕದ ಬಗೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ."
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr ""
+"ಸಂಪರ್ಕ ಸಂಪಾದಕಕ್ಕೆ ಅಗತ್ಯವಾದ ಕೆಲವು ಸಂಪನ್ಮೂಲಗಳು ಕಂಡುಬಂದಿಲ್ಲ (.ui ಕಡತವು ಕಂಡು ಬಂದಿಲ್ಲ)."
+
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "_Save"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "ಈ ಸಂಪರ್ಕ ಮಾಡಲಾದ ಯಾವುದೆ ಬದಲಾವಣೆಗಳಿದ್ದಲ್ಲಿ ಅದನ್ನು ಉಳಿಸು."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "ಈ ಗಣಕದಲ್ಲಿನ ಎಲ್ಲಾ ಬಳಕೆದಾರರಿಗಾಗಿ ಈ ಸಂಪರ್ಕವನ್ನು ಉಳಿಸಲು ದೃಢೀಕರಿಸಿ."
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not create connection"
+msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr "ಸಂಪರ್ಕ ಸಂವಾದವನ್ನು ರಚಿಸುವಲ್ಲಿ ಗೊತ್ತಿರದ ದೋಷ ಉಂಟಾಗಿದೆ."
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "ಸಂಪಾದಕವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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/page-bond.c:785
-#: ../src/connection-editor/page-bond.c:792
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+msgid "Connection _name:"
+msgstr "ಸಂಪರ್ಕದ ಹೆಸರು(_n):"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
+msgstr "ರಫ್ತು ಮಾಡು (_E)..."
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "ಎಂದಿಗೂ ಬೇಡ"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "ಈಗ"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d ವರ್ಷದ ಹಿಂದೆ"
+msgstr[1] "%d ವರ್ಷಗಳ ಹಿಂದೆ"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "ಹೆಸರು"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "ಕೊನೆಯ ಬಾರಿಗೆ ಬಳಸಲಾದ"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಿ"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಲು ದೃಢೀಕರಣವನ್ನು ಒದಗಿಸಿ"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಅಳಿಸಿ"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಅಳಿಸಲು ದೃಢೀಕರಣವನ್ನು ಒದಗಿಸಿ"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, fuzzy, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+#, fuzzy
+msgid "Error creating connection"
+msgstr "ಸಂಪರ್ಕವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "ಸಂಪರ್ಕವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "802.1x ಸುರಕ್ಷತೆ"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "WiFi ಸುರಕ್ಷತಾ ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../src/connection-editor/page-8021x-security.c:125
+#, fuzzy
+msgid "Use 802.1_X security for this connection"
+msgstr "ಈ ಸಂಪರ್ಕಕ್ಕಾಗಿ 802.1X ಸುರಕ್ಷತೆಯನ್ನು ಬಳಸು"
+
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "ಬ್ಲೂಟೂತ್ ಸಾಧನವನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+#, fuzzy
+msgid "Select the type of the Bluetooth connection profile."
+msgstr "ರಚಿಸಲು ಸಂಪರ್ಕದ ಬಗೆಯನ್ನು ಆರಿಸಿ:"
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "ಜಾಲಬಂಧವನ್ನು ಶಕ್ತಗೊಳಿಸು(_N)"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-bond.c:960
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "ಪ್ರಾಥಮಿಕ DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-dsl.c:148
-#: ../src/connection-editor/page-dsl.c:155
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+#, fuzzy
+msgid "Bridge Port"
+msgstr "ಬ್ರಿಜ್"
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "DSL ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-dsl.c:252
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-infiniband.c:144
-#: ../src/connection-editor/page-infiniband.c:151
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"ಈ ಆಯ್ಕೆಯು ಇಲ್ಲಿ ನಮೂದಿಸಲಾದ ಶಾಶ್ವತ MAC ವಿಳಾಸದಿಂದ ಸೂಚಿಸಲಾದ ಜಾಲಬಂಧ ಸಾಧನಕ್ಕೆ ಈ "
+"ಸಂಪರ್ಕವನ್ನು ಲಾಕ್ ಮಾಡುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "ತಂತಿಯುಕ್ತ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "ಇತರ್ನೆಟ್ (%s)"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "ತದ್ರೂಪುಗೊಳಿಸಲಾದ _MAC ವಿಳಾಸ:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
+
+#: ../src/connection-editor/page-general.c:52
+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 ಚಾಲನೆಯಲ್ಲಿಲ್ಲ..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-infiniband.c:243
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:125
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:126
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (VPN) ವಿಳಾಸಗಳು ಮಾತ್ರ"
 
 #: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:129
-msgid "Automatic (PPP)"
-msgstr "ಸ್ವಯಂಚಾಲಿತ (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:130
-msgid "Automatic (PPP) addresses only"
-msgstr "ಸ್ವಯಂಚಾಲಿತ (PPP) ವಿಳಾಸಗಳು ಮಾತ್ರ"
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "ಸ್ವಯಂಚಾಲಿತ, ವಿಳಾಸಗಳು ಮಾತ್ರ"
 
-#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip4.c:132
 #: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip4.c:133
 #: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (PPPoE) ವಿಳಾಸಗಳು ಮಾತ್ರ"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "ಸ್ವಯಂಚಾಲಿತ (DHCP) ವಿಳಾಸಗಳು ಮಾತ್ರ"
 
-#: ../src/connection-editor/page-ip4.c:174
+#: ../src/connection-editor/page-ip4.c:179
 #: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "ಸ್ಥಳೀಯವಾಗಿ ಮಾತ್ರ ಜೋಡಿಸು"
 
-#: ../src/connection-editor/page-ip4.c:190
-msgid "Disabled"
-msgstr "ಅಶಕ್ತಗೊಂಡ"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "_DNS ಪರಿಚಾರಕಗಳು:"
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "ಹುಡುಕು ಡೊಮೈನ್‌ಗಳು(_S):"
 
-#: ../src/connection-editor/page-ip4.c:700
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s ಗಾಗಿ IPv4 ರೌಟ್‌ಗಳನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/connection-editor/page-ip4.c:827
-#: ../src/connection-editor/page-ip4.c:834
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr "IPv4 ಸಿದ್ಧತೆಗಳು"
+
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPV4 ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-ip4.c:840
-msgid "IPv4 Settings"
-msgstr "IPv4 ಸಿದ್ಧತೆಗಳು"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic, addresses only"
-msgstr "ಸ್ವಯಂಚಾಲಿತ, ವಿಳಾಸಗಳು ಮಾತ್ರ"
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
 #: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
@@ -2006,122 +2727,225 @@ msgstr "ಆಲಕ್ಷಿಸು"
 msgid "Automatic, DHCP only"
 msgstr "ಸ್ವಯಂಚಾಲಿತ, DHCP ಮಾತ್ರ"
 
-#: ../src/connection-editor/page-ip6.c:685
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s ಗಾಗಿ IPv6 ರೌಟ್‌ಗಳನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"
 
-#: ../src/connection-editor/page-ip6.c:810
-#: ../src/connection-editor/page-ip6.c:817
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr "IPV6 ಸಿದ್ಧತೆಗಳು"
+
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPV6 ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-ip6.c:823
-msgid "IPv6 Settings"
-msgstr "IPV6 ಸಿದ್ಧತೆಗಳು"
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:313
-#: ../src/connection-editor/page-mobile.c:320
-msgid "Could not load mobile broadband user interface."
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
 msgstr ""
-"ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-mobile.c:341
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr "%s ಸ್ಲೇವ್ %d"
+
+#: ../src/connection-editor/page-mobile.c:310
+msgid "Could not load mobile broadband user interface."
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "ಬೆಂಬಲವಿರದ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕದ ಬಗೆ."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:591
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸುವವರು ಬಗೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../src/connection-editor/page-mobile.c:618
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr ""
-"ನಿಮ್ಮ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸುವವರು ಬಳಸುವ ತಂತ್ರಜ್ಞಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ.  "
-"ನಿಮಗೆ ಖಚಿತ ಮಾಹಿತಿ ಇರದೆ ಹೋದಲ್ಲಿ, ನಿಮಗೆ ಒದಗಿಸಿದವರನ್ನು ಸಂಪರ್ಕಿಸಿ."
+"ನಿಮ್ಮ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸುವವರು ಬಳಸುವ ತಂತ್ರಜ್ಞಾನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ.  ನಿಮಗೆ ಖಚಿತ "
+"ಮಾಹಿತಿ ಇರದೆ ಹೋದಲ್ಲಿ, ನಿಮಗೆ ಒದಗಿಸಿದವರನ್ನು ಸಂಪರ್ಕಿಸಿ."
 
-#: ../src/connection-editor/page-mobile.c:623
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "ನನಗೆ ಒದಗಿಸುವವರು _GSM-ಆಧರಿತವಾದ ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (ಅಂದರೆ, GPRS, EDGE, "
 "UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:628
-msgid "My provider uses _CDMA-based technology (i.e. 1xRTT, EVDO)"
+#: ../src/connection-editor/page-mobile.c:568
+#, fuzzy
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
-"ನನಗೆ ಒದಗಿಸುವವರು _CDMA-ಆಧರಿತವಾದ ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (ಅಂದರೆ, 1xRTT, "
-"EVDO)"
+"ನನಗೆ ಒದಗಿಸುವವರು _CDMA-ಆಧರಿತವಾದ ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (ಅಂದರೆ, 1xRTT, EVDO)"
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:135
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:241
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-fast.c:276
-#: ../src/wireless-security/eap-method-peap.c:258
-#: ../src/wireless-security/eap-method-ttls.c:273
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:257
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:142
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ಯಾವುದೂ ಇಲ್ಲ"
 
-#: ../src/connection-editor/page-ppp.c:202
+#: ../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:294
-#: ../src/connection-editor/page-ppp.c:301
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr "PPP ಸಿದ್ಧತೆಗಳು"
+
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP ಬಳಕೆದಾರ ಸಂಪರ್ಕ ಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-ppp.c:307
-msgid "PPP Settings"
-msgstr "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 "ಆಮದು ಮಾಡಲು ಕಡತವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../src/connection-editor/page-vlan.c:593
-#: ../src/connection-editor/page-vlan.c:600
-msgid "Could not load VLAN user interface."
-msgstr "VLAN ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "ತಂತಿಯುಕ್ತ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "ಯಾವುದೆ ಜಾಲಬಂಧ ಸಂಪರ್ಕವಿಲ್ಲ"
 
-#: ../src/connection-editor/page-vlan.c:801
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "ಬಾಂಡ್ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-vpn.c:127
+#: ../src/connection-editor/page-vpn.c:103
+#, fuzzy
+msgid "Could not load VPN user interface."
+msgstr "VLAN ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' ಗಾಗಿ VPN ಪ್ಲಗ್‌ಇನ್ ಸೇವೆಯನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-vpn.c:242
-#: ../src/connection-editor/page-vpn.c:309
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN ಸಂಪರ್ಕ %d"
 
-#: ../src/connection-editor/page-vpn.c:268
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2131,305 +2955,118 @@ msgstr ""
 "\n"
 "ದೋಷ: ಯಾವುದೆ VPN ಸೇವೆಯ ಪ್ರಕಾರವಿಲ್ಲ."
 
-#: ../src/connection-editor/page-wired.c:223
-#: ../src/connection-editor/page-wired.c:230
-msgid "Could not load wired user interface."
-msgstr "ತಂತಿಯುಕ್ತ ಬಳಕೆದಾರ ಸಂಪರ್ಕವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
-
-#: ../src/connection-editor/page-wired.c:371
-#, c-format
-msgid "Wired connection %d"
-msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
+#: ../src/connection-editor/page-vpn.c:254
+#, fuzzy
+msgid "Choose a VPN Connection Type"
+msgstr "VPN ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
 
-#: ../src/connection-editor/page-wired-security.c:125
-msgid "802.1x Security"
-msgstr "802.1x ಸುರಕ್ಷತೆ"
+#: ../src/connection-editor/page-vpn.c:255
+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-wired-security.c:133
-msgid "Use 802.1X security for this connection"
-msgstr "ಈ ಸಂಪರ್ಕಕ್ಕಾಗಿ 802.1X ಸುರಕ್ಷತೆಯನ್ನು ಬಳಸು"
+#: ../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 ವಿಳಾಸದಿಂದ ಸೂಚಿಸಲಾದ ವೈರ್ಲೆಸ್ ಎಕ್ಸೆಸ್ ಪಾಯಿಂಟ್‌ಗೆ (AP) "
+"ಈ ಸಂಪರ್ಕವನ್ನು ಲಾಕ್ ಮಾಡುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:146
-#: ../src/connection-editor/page-wireless.c:150
-#: ../src/connection-editor/page-wireless.c:171
-#, c-format
-msgid "default"
-msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
+#: ../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)\""
+msgstr ""
+"ಈ ಆಯ್ಕೆಯು ಇಲ್ಲಿ ನಮೂದಿಸಲಾದ ಶಾಶ್ವತ MAC ವಿಳಾಸದಿಂದ ಸೂಚಿಸಲಾದ ಜಾಲಬಂಧ ಸಾಧನಕ್ಕೆ ಈ "
+"ಸಂಪರ್ಕವನ್ನು ಲಾಕ್ ಮಾಡುತ್ತದೆ.  ಉದಾಹರಣೆ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:175
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:422
-#: ../src/connection-editor/page-wireless.c:429
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "WiFi ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/page-wireless.c:601
-#, c-format
-msgid "Wireless connection %d"
-msgstr "ವೈರ್ಲೆಸ್ ಸಂಪರ್ಕ %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/wireless-dialog.c:931
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "ಯಾವುದೆ ಸಾಧನ"
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "ತಂತಿಯುಕ್ತ ಸಂಪರ್ಕ %d"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:274
-#: ../src/wireless-dialog.c:940
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit ಗುಪ್ತವಾಕ್ಯ"
 
-#: ../src/connection-editor/page-wireless-security.c:300
-#: ../src/wireless-dialog.c:970
+#: ../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)"
 msgstr "ಡೈನಮಿಕ್ WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:314
-#: ../src/wireless-dialog.c:984
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ವೈಯಕ್ತಿಕ"
 
-#: ../src/connection-editor/page-wireless-security.c:328
-#: ../src/wireless-dialog.c:998
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ಎಂಟರ್ಪ್ರೈಸ್"
 
-#: ../src/connection-editor/page-wireless-security.c:374
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
-"WiFi ಸುರಕ್ಷತಾ ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ; WiFi "
-"ಸಿದ್ಧತೆಯು ಕಾಣೆಯಾಗಿದೆ."
+"WiFi ಸುರಕ್ಷತಾ ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ; WiFi ಸಿದ್ಧತೆಯು "
+"ಕಾಣೆಯಾಗಿದೆ."
 
-#: ../src/connection-editor/page-wireless-security.c:383
-#: ../src/connection-editor/page-wireless-security.c:390
-msgid "Could not load WiFi security user interface."
-msgstr "WiFi ಸುರಕ್ಷತಾ ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
-
-#: ../src/connection-editor/page-wireless-security.c:396
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "ವೈರ್ಲೆಸ್ ಸುರಕ್ಷತೆ"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
-#, c-format
-msgid "Editing %s"
-msgstr "%s ಅನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"
-
-#: ../src/connection-editor/nm-connection-editor.c:114
-msgid "Editing un-named connection"
-msgstr "ಹೆಸರಿಲ್ಲದ ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಲಾಗುತ್ತಿದೆ"
-
-#: ../src/connection-editor/nm-connection-editor.c:308
-msgid ""
-"The connection editor could not find some required resources (the "
-"NetworkManager applet .glade file was not found)."
-msgstr ""
-"ಸಂಪರ್ಕ ಸಂಪಾದಕಕ್ಕೆ ಕೆಲವು ಅಗತ್ಯ ಸಂಪನ್ಮೂಲಗಳು ಕಂಡುಬಂದಿಲ್ಲ (NetworkManager applet "
-".glade ಕಡತವು ಕಂಡುಬಂದಿಲ್ಲ)."
-
-#: ../src/connection-editor/nm-connection-editor.c:326
-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:482
-msgid ""
-"Support for bond, bridge, and VLAN interfaces must be enabled by setting the "
-"NM_BOND_BRIDGE_VLAN_ENABLED key to 'yes' in <tt>/etc/sysconfig/network</tt>:\n"
-"\n"
-"	<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
-"\n"
-"After making this modification, NetworkManager must be restarted to ensure "
-"the new functionality is enabled."
-msgstr ""
-"<tt>/etc/sysconfig/network</tt> ನಲ್ಲಿ NM_BOND_BRIDGE_VLAN_ENABLED ಕೀಲಿಯನ್ನು "
-"'yes'ಗೆ ಹೊಂದಿಸುವುದರ ಮೂಲಕ  ಬಾಂಡ್, ಬ್ರಿಜ್ ಮತ್ತು VLAN ಸಂಪರ್ಕಸಾಧನಗಳಿಗಾಗಿ "
-"ಬೆಂಬಲವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬೇಕು:\n"
-"\n"
-"	<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
-"\n"
-"ಈ ಮಾರ್ಪಾಡನ್ನು ಮಾಡಿದ ನಂತರ, ಹೊಸ ಬದಲಾವಣೆಯು ಸಕ್ರಿಯವಾಗಿದೆಯೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಲು "
-"NetworkManager ಅನ್ನು ಮರಳಿ ಆರಂಭಿಸಬೇಕಿರುತ್ತದೆ."
-
-#: ../src/connection-editor/nm-connection-editor.c:494
-msgid "Bridging, bonding, and VLAN functionality not enabled"
-msgstr "ಬ್ರಿಜಿಂಗ್, ಬಾಂಡಿಂಗ್, ಮತ್ತು VLAN ಸೌಲಭ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿಲ್ಲ"
-
-#: ../src/connection-editor/nm-connection-editor.c:541
-msgid "Apply"
-msgstr "ಅನ್ವಯಿಸಿ"
-
-#: ../src/connection-editor/nm-connection-editor.c:542
-msgid "Save any changes made to this connection."
-msgstr "ಈ ಸಂಪರ್ಕ ಮಾಡಲಾದ ಯಾವುದೆ ಬದಲಾವಣೆಗಳಿದ್ದಲ್ಲಿ ಅದನ್ನು ಉಳಿಸು."
-
-#: ../src/connection-editor/nm-connection-editor.c:543
-msgid "Apply..."
-msgstr "ಅನ್ವಯಿಸು..."
-
-#: ../src/connection-editor/nm-connection-editor.c:544
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "ಈ ಗಣಕದಲ್ಲಿನ ಎಲ್ಲಾ ಬಳಕೆದಾರರಿಗಾಗಿ ಈ ಸಂಪರ್ಕವನ್ನು ಉಳಿಸಲು ದೃಢೀಕರಿಸಿ."
-
-#: ../src/connection-editor/nm-connection-editor.c:560
-msgid "Could not create connection"
-msgstr "ಸಂಪರ್ಕವನ್ನು ರಚಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
-
-#: ../src/connection-editor/nm-connection-editor.c:560
-msgid "Could not edit connection"
-msgstr "ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
-
-#: ../src/connection-editor/nm-connection-editor.c:562
-msgid "Unknown error creating connection editor dialog."
-msgstr "ಸಂಪರ್ಕ ಸಂವಾದವನ್ನು ರಚಿಸುವಲ್ಲಿ ಗೊತ್ತಿರದ ದೋಷ ಉಂಟಾಗಿದೆ."
-
-#: ../src/connection-editor/nm-connection-editor.c:577
-msgid "Bonding, bridging, and VLANs are disabled in NetworkManager."
-msgstr ""
-"ಬಾಂಡಿಂಗ್, ಬ್ರಿಜಿಂಗ್,  ಮತ್ತು VLAN ಗಳನ್ನು NetworkManager ನಲ್ಲಿ "
-"ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿಲ್ಲ."
-
-#: ../src/connection-editor/nm-connection-editor.c:650
-msgid "Error saving connection"
-msgstr "ಸಂಪರ್ಕವನ್ನು ಉಳಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
-
-#: ../src/connection-editor/nm-connection-editor.c:651
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "ಗುಣ '%s' / '%s' ಅಮಾನ್ಯವಾಗಿದೆ: %d"
-
-#: ../src/connection-editor/nm-connection-editor.c:743
-msgid "Error initializing editor"
-msgstr "ಸಂಪಾದಕವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ"
-
-#: ../src/connection-editor/nm-connection-editor.c:1037
-msgid "Connection update failed"
-msgstr "ಸಂಪರ್ಕವನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡುವಲ್ಲಿ ವಿಫಲತೆ"
-
-#: ../src/connection-editor/nm-connection-editor.c:1097
-msgid "Connection add failed"
-msgstr "ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Create New Connection"
-msgstr "ಹೊಸ ಸಂಪರ್ಕವನ್ನು ರಚಿಸು"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Select the type of connection to create:"
-msgstr "ರಚಿಸಲು ಸಂಪರ್ಕದ ಬಗೆಯನ್ನು ಆರಿಸಿ:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-msgid "Connection _name:"
-msgstr "ಸಂಪರ್ಕದ ಹೆಸರು(_n):"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "Connect _automatically"
-msgstr "ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಪರ್ಕ ಜೋಡಿಸು(_a)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Available to all users"
-msgstr "ಲಭ್ಯವಿರುವ ಎಲ್ಲಾ ಬಳಕೆದಾರರು"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "_Export..."
-msgstr "ರಫ್ತು ಮಾಡು (_E)..."
-
-#: ../src/connection-editor/nm-connection-list.c:143
-msgid "never"
-msgstr "ಎಂದಿಗೂ ಬೇಡ"
-
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
-msgid "now"
-msgstr "ಈಗ"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d ನಿಮಿಷದ ಹಿಂದೆ"
-msgstr[1] "%d ನಿಮಿಷಗಳ ಹಿಂದೆ"
-
-#: ../src/connection-editor/nm-connection-list.c:176
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d ಗಂಟೆಯ ಹಿಂದೆ"
-msgstr[1] "%d ಗಂಟೆಗಳ ಹಿಂದೆ"
-
-#: ../src/connection-editor/nm-connection-list.c:188
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d ದಿನದ ಹಿಂದೆ"
-msgstr[1] "%d ದಿನಗಳ ಹಿಂದೆ"
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
+msgstr "WiFi ಸುರಕ್ಷತಾ ಬಳಕೆದಾರ ಸಂಪರ್ಕಸಾಧನವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d ತಿಂಗಳ ಹಿಂದೆ"
-msgstr[1] "%d ತಿಂಗಳುಗಳ ಹಿಂದೆ"
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d ವರ್ಷದ ಹಿಂದೆ"
-msgstr[1] "%d ವರ್ಷಗಳ ಹಿಂದೆ"
-
-#: ../src/connection-editor/nm-connection-list.c:629
-msgid "Name"
-msgstr "ಹೆಸರು"
-
-#: ../src/connection-editor/nm-connection-list.c:640
-msgid "Last Used"
-msgstr "ಕೊನೆಯ ಬಾರಿಗೆ ಬಳಸಲಾದ"
-
-#. Edit
-#: ../src/connection-editor/nm-connection-list.c:679
-msgid "Edit"
-msgstr "ಸಂಪಾದಿಸು"
-
-#: ../src/connection-editor/nm-connection-list.c:680
-msgid "Edit the selected connection"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಿ"
-
-#: ../src/connection-editor/nm-connection-list.c:681
-msgid "Edit..."
-msgstr "ಸಂಪಾದಿಸು..."
-
-#: ../src/connection-editor/nm-connection-list.c:682
-msgid "Authenticate to edit the selected connection"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಲು ದೃಢೀಕರಣವನ್ನು ಒದಗಿಸಿ"
-
-#. Delete
-#: ../src/connection-editor/nm-connection-list.c:695
-msgid "Delete"
-msgstr "ಅಳಿಸು"
-
-#: ../src/connection-editor/nm-connection-list.c:696
-msgid "Delete the selected connection"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಅಳಿಸಿ"
-
-#: ../src/connection-editor/nm-connection-list.c:697
-msgid "Delete..."
-msgstr "ಅಳಿಸಿ..."
-
-#: ../src/connection-editor/nm-connection-list.c:698
-msgid "Authenticate to delete the selected connection"
-msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕವನ್ನು ಅಳಿಸಲು ದೃಢೀಕರಣವನ್ನು ಒದಗಿಸಿ"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN ಸಂಪರ್ಕವನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2437,246 +3074,100 @@ msgid ""
 "\n"
 "Error: %s."
 msgstr ""
-"ಕಡತ '%s' ಅನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಅಥವ ಮಾನ್ಯವಾದ VPN ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು "
-"ಹೊಂದಿಲ್ಲ\n"
+"ಕಡತ '%s' ಅನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಅಥವ ಮಾನ್ಯವಾದ VPN ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ಹೊಂದಿಲ್ಲ\n"
 "\n"
 "ದೋಷ: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:240
-msgid "Select file to import"
-msgstr "ಆಮದು ಮಾಡಲು ಕಡತವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "ಅಜ್ಞಾತ"
 
-#: ../src/connection-editor/vpn-helpers.c:288
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" ಎಂಬ ಹೆಸರಿನ ಒಂದು ಕಡತವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ."
 
-#: ../src/connection-editor/vpn-helpers.c:290
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "ಬದಲಾಯಿಸು(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:328
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN ಸಂಪರ್ಕವನ್ನು ರಫ್ತು ಮಾಡಲಾಗಲಿಲ್ಲ"
 
-#: ../src/connection-editor/vpn-helpers.c:330
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
-msgid "The VPN connection '%s' could not be exported to %s.\n"
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
 "\n"
 "Error: %s."
-msgstr "VPN ಸಂಪರ್ಕ '%s' ಅನ್ನು %s ಗೆ ರಫ್ತು ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
+msgstr ""
+"VPN ಸಂಪರ್ಕ '%s' ಅನ್ನು %s ಗೆ ರಫ್ತು ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.\n"
 "\n"
 "ದೋಷ: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:364
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN ಸಂಪರ್ಕವನ್ನು ರಫ್ತು ಮಾಡಿ..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:213
-#, c-format
-msgid "%s Network"
-msgstr "%s ಜಾಲಬಂಧ"
-
-#: ../src/gnome-bluetooth/bt-widget.c:322
-#, c-format
-msgid "Error: %s"
-msgstr "ದೋಷ: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Mobile wizard was canceled"
-msgstr "ಮೊಬೈಲ್ ಗಾರುಡಿಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "ಗೊತ್ತಿರದ ದೂರವಾಣಿ ಸಾಧನದ ಬಗೆ (GSM ಅಥವ CDMA ಅಲ್ಲ)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:478
-msgid "Your phone is now ready to use!"
-msgstr "ನಿಮ್ಮ ದೂರವಾಣಿಯು ಈಗ ಬಳಸಲು ಯೋಗ್ಯವಾಗಿದೆ!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:648
-#: ../src/gnome-bluetooth/bt-widget.c:654
-msgid "failed to connect to the phone."
-msgstr "ದೂರವಾಣಿಯೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಾಧಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
-
-#: ../src/gnome-bluetooth/bt-widget.c:687
-msgid "unexpectedly disconnected from the phone."
-msgstr "ದೂರವಾಣಿಯಿಂದ ಅನಿರೀಕ್ಷಿತವಾಗಿ ಸಂಪರ್ಕವು ಕಡಿದುಹೋಗಿದೆ."
-
-#: ../src/gnome-bluetooth/bt-widget.c:696
-msgid "timed out detecting phone details."
-msgstr "ದೂರವಾಣಿಯ ವಿವರಗಳನ್ನು ಪಡೆಯು ಕಾಲಾವಧಿ ತೀರಿದೆ."
-
-#: ../src/gnome-bluetooth/bt-widget.c:711
-msgid "could not connect to the system bus."
-msgstr "ವ್ಯವಸ್ಥೆಯ ಬಸ್‌ನೊಂದಿಗೆ ಸಂಪರ್ಕಹೊಂದಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
-
-#: ../src/gnome-bluetooth/bt-widget.c:716
-msgid "Detecting phone configuration..."
-msgstr "ದೂರವಾಣಿ ಸಂರಚನೆಯನ್ನು ಪತ್ತೆಹಚ್ಚಲಾಗುತ್ತದೆ..."
-
-#: ../src/gnome-bluetooth/bt-widget.c:782
-msgid "could not find the Bluetooth device."
-msgstr "ಬ್ಲೂಟೂತ್ ಸಾಧನವನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
-
-#: ../src/gnome-bluetooth/bt-widget.c:912
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"ಒಂದು ಡಯಲ್-ಅಪ್-ಜಾಲಬಂಧ ಸಂಪರ್ಕವನ್ನು ಅಣಿಗೊಳಿಸುವ ಮೊದಲು ಪೂರ್ವನಿಯೋಜಿತವಾದ ಬ್ಲೂಟೂತ್ "
-"ಅಡಾಪ್ಟರ್ ಅನ್ನು ಶಕ್ತಗೊಳಿಸಬೇಕು."
-
-#: ../src/gnome-bluetooth/bt-widget.c:944
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr ""
-"ಬ್ಲೂಟೂತ್ ಸಂರಚನೆಯು ಸಾಧ್ಯವಿಲ್ಲ (D-Bus ನೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ:%s)."
-""
-
-#: ../src/gnome-bluetooth/bt-widget.c:954
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr ""
-"ಬ್ಲೂಟೂತ್ ಸಂರಚನೆಯು ಸಾಧ್ಯವಿಲ್ಲ (D-Bus ಪ್ರಾಕ್ಸಿಯನ್ನು ರಚಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:963
-#, c-format
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
+#, fuzzy
 msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"ಬ್ಲೂಟೂತ್ ಸಂರಚನೆಯು ಸಾಧ್ಯವಿಲ್ಲ (NetworkManager ಅನ್ನು ಪತ್ತೆ ಮಾಡುವಲ್ಲಿ ದೋಷ "
-"ಉಂಟಾಗಿದೆ: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1014
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ದೂರವಾಣಿಯನ್ನು ಒಂದು ಜಾಲಬಂಧ ಸಾಧನವಾಗಿ ಬಳಸಿ (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1023
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ದೂರವಾಣಿಯನ್ನು ಬಳಸಿಕೊಂಡು ಅಂತರ್ಜಾಲವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಿ(DUN)"
-
-#: ../src/main.c:70
-msgid "Usage:"
-msgstr "ಬಳಕೆ:"
+"NetworkManager ಆಪ್ಲೆಟ್‌ಗೆ ಕೆಲವು ಅಗತ್ಯ ಸಂಪನ್ಮೂಲಗಳು ಕಂಡುಬಂದಿಲ್ಲ (ಗ್ಲೇಡ್ ಕಡತವು "
+"ಕಂಡುಬಂದಿಲ್ಲ)."
 
-#: ../src/main.c:72
-msgid ""
-"This program is a component of NetworkManager (http://projects.gnome.org/"
-"NetworkManager)."
-msgstr ""
-"ಈ ಪ್ರೊಗ್ರಾಮ್ NetworkManager ನ ಒಂದು ಘಟಕವಾಗಿರುತ್ತದೆ (http://projects.gnome.org/"
-"NetworkManager)."
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "ಅನ್‌ಲಾಕ್ ಮಾಡು(_U)"
 
-#: ../src/main.c:73
-msgid ""
-"It is not intended for command-line interaction but instead runs in the "
-"GNOME desktop environment."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
 msgstr ""
-"ಇದು ಆಜ್ಞಾ ಸಾಲಿನ ಸಂವಾದಾತ್ಮಕ ಕ್ರಿಯೆಗೆ ಉದ್ಧೇಶಿಸಿಲ್ಲ ಬದಲಾಗಿ GNOME ಗಣಕತೆರೆ "
-"ಪರಿಣಾಮವಾಗಿ ಚಾಲನೆಗೊಳ್ಳುತ್ತದೆ."
-
-#: ../src/mb-menu-item.c:58
-msgid "EVDO"
-msgstr "EVDO"
-
-#: ../src/mb-menu-item.c:62
-msgid "GPRS"
-msgstr "GPRS"
-
-#: ../src/mb-menu-item.c:64
-msgid "EDGE"
-msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:66
-msgid "UMTS"
-msgstr "UMTS"
-
-#: ../src/mb-menu-item.c:68
-msgid "HSDPA"
-msgstr "HSDPA"
-
-#: ../src/mb-menu-item.c:70
-msgid "HSUPA"
-msgstr "HSUPA"
-
-#: ../src/mb-menu-item.c:72
-msgid "HSPA"
-msgstr "HSPA"
-
-#: ../src/mb-menu-item.c:104
-msgid "not enabled"
-msgstr "ಶಕ್ತಗೊಂಡಿಲ್ಲ"
-
-#: ../src/mb-menu-item.c:110
-msgid "not registered"
-msgstr "ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ"
-
-#: ../src/mb-menu-item.c:128
-#, c-format
-msgid "Home network (%s)"
-msgstr "ನೆಲೆ(ಹೋಮ್) ಜಾಲಬಂಧ (%s)"
-
-#: ../src/mb-menu-item.c:130
-#, c-format
-msgid "Home network"
-msgstr "ನೆಲೆ(ಹೋಮ್) ಜಾಲಬಂಧ"
-
-#: ../src/mb-menu-item.c:138
-msgid "searching"
-msgstr "ಹುಡುಕಲಾಗುತ್ತಿದೆ"
-
-#: ../src/mb-menu-item.c:141
-msgid "registration denied"
-msgstr "ನೋಂದಣಿಯನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ"
-
-#: ../src/mb-menu-item.c:146 ../src/mb-menu-item.c:152
-#, c-format
-msgid "%s (%s roaming)"
-msgstr "%s (%s ರೋಮಿಂಗ್)"
-
-#: ../src/mb-menu-item.c:148 ../src/mb-menu-item.c:154
-#, c-format
-msgid "%s (roaming)"
-msgstr "%s (ರೋಮಿಂಗ್)"
-
-#: ../src/mb-menu-item.c:157
-#, c-format
-msgid "Roaming network (%s)"
-msgstr "ರೋಮಿಂಗ್ ಜಾಲಬಂಧ (%s)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "ಸಂಪರ್ಕದ ಮಾಹಿತಿ"
 
-#: ../src/mb-menu-item.c:159
-#, c-format
-msgid "Roaming network"
-msgstr "ರೋಮಿಂಗ್ ಜಾಲಬಂಧ"
+#: ../src/info.ui.h:3
+#, fuzzy
+msgid "Active Network Connections"
+msgstr "ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು"
 
-#: ../src/utils/mobile-wizard.c:196
+#: ../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 ""
-"ನಿಮ್ಮ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನು ಈ ಕೆಳಗಿನ ಸಿದ್ಧತೆಗಳೊಂದಿಗೆ "
-"ಸಂರಚಿಸಲಾಗಿದೆ:"
+msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನು ಈ ಕೆಳಗಿನ ಸಿದ್ಧತೆಗಳೊಂದಿಗೆ ಸಂರಚಿಸಲಾಗಿದೆ:"
 
 #. Device
-#: ../src/utils/mobile-wizard.c:203
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "ನಿಮ್ಮ ಸಾಧನ:"
 
 #. Provider
-#: ../src/utils/mobile-wizard.c:214
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರು:"
 
 #. Plan and APN
-#: ../src/utils/mobile-wizard.c:225
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "ನಿಮ್ಮ ಯೋಜನೆ(ಪ್ಲಾನ್):"
 
-#: ../src/utils/mobile-wizard.c:246
+#: ../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 "
@@ -2684,280 +3175,637 @@ msgid ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 msgstr ""
-"ನೀವು ಆಯ್ಕೆ ಮಾಡಿದ ಸಿದ್ಧತೆಗಳನ್ನು ಬಳಸಿಕೊಂಡಿ ನಿಮ್ಮ ಮೊಬೈಲ್‌ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ "
-"ಒದಗಿಸುವವರೊಂದಿಗೆ ಒಂದು ಸಂಪರ್ಕವನ್ನು ಏರ್ಪಡಿಸಲಾಗುವುದು.  ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಲ್ಲಿ ಅಥವ "
-"ಜಾಲಬಂಧ ಸಂಪನ್ಮೂಲಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಾಗದೆ ಇದ್ದರೆ, ನಿಮ್ಮ ಸಿದ್ಧತೆಗಳ "
-"ಮೇಲೆ ಎರಡು ಬಾರಿ ಕ್ಲಿಕ್ಕಿಸಿ.  ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕದ ಸಿದ್ಧತೆಗಳನ್ನು "
-"ಮಾರ್ಪಡಿಸಲು, ವ್ಯವಸ್ಥೆ >> ಆದ್ಯತೆಗಳ ಮೆನುವಿನಿಂದ \"ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು\" ಅನ್ನು ಆಯ್ಕೆ "
-"ಮಾಡಿ."
-
-#: ../src/utils/mobile-wizard.c:258
+"ನೀವು ಆಯ್ಕೆ ಮಾಡಿದ ಸಿದ್ಧತೆಗಳನ್ನು ಬಳಸಿಕೊಂಡಿ ನಿಮ್ಮ ಮೊಬೈಲ್‌ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸುವವರೊಂದಿಗೆ "
+"ಒಂದು ಸಂಪರ್ಕವನ್ನು ಏರ್ಪಡಿಸಲಾಗುವುದು.  ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಲ್ಲಿ ಅಥವ ಜಾಲಬಂಧ ಸಂಪನ್ಮೂಲಗಳನ್ನು "
+"ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಾಗದೆ ಇದ್ದರೆ, ನಿಮ್ಮ ಸಿದ್ಧತೆಗಳ ಮೇಲೆ ಎರಡು ಬಾರಿ ಕ್ಲಿಕ್ಕಿಸಿ.  ನಿಮ್ಮ "
+"ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕದ ಸಿದ್ಧತೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು, ವ್ಯವಸ್ಥೆ >> ಆದ್ಯತೆಗಳ ಮೆನುವಿನಿಂದ "
+"\"ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು\" ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ."
+
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಿದ್ಧತೆಗಳನ್ನು ಖಚಿತಪಡಿಸಿ"
 
-#: ../src/utils/mobile-wizard.c:319
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "ಪಟ್ಟಿ ಮಾಡದೆ ಇರುವ"
 
-#: ../src/utils/mobile-wizard.c:437
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "ನಿಮ್ಮ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ಆಯ್ಕೆ ಮಾಡಿ(_S):"
 
-#: ../src/utils/mobile-wizard.c:461
+#: ../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/utils/mobile-wizard.c:480
+#: ../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"
 "\n"
 "ನಿಮ್ಮ ಯೋಜನೆಯ ಬಗೆಗೆ ನಿಮಗೆ ಮಾಹಿತಿ ಇಲ್ಲದೆ ಹೋದಲ್ಲಿ ನಿಮ್ಮ ಯೋಜನೆಯ APN ಗಾಗಿ "
 "ಒದಗಿಸುವವರನ್ನು ಕೇಳಿ."
 
-#: ../src/utils/mobile-wizard.c:487
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "ನಿಮ್ಮ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯನ್ನು(ಪ್ಲಾನ್) ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../src/utils/mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "ನನ್ನ ಯೋಜನೆ(ಪ್ಲಾನ್) ಅನ್ನು ಪಟ್ಟಿ ಮಾಡಲಾಗಿಲ್ಲ..."
 
-#: ../src/utils/mobile-wizard.c:688
+#: ../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/utils/mobile-wizard.c:701
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ಒದಗಿಸುವವರು"
 
-#: ../src/utils/mobile-wizard.c:726
+#: ../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/utils/mobile-wizard.c:737
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "ಒದಗಿಸುವವರು:"
 
-#: ../src/utils/mobile-wizard.c:753
+#: ../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)"
+msgstr "ನನಗೆ ಒದಗಿಸುವವರು GSM ತಂತ್ರಜ್ಞಾನವನ್ನು ಬಳಸುತ್ತಾರೆ (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/utils/mobile-wizard.c:755
+#: ../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/utils/mobile-wizard.c:766
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "ನಿಮಗೆ ಒದಗಿಸುವವರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: ../src/utils/mobile-wizard.c:1012
-msgid "Country List:"
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
+#, fuzzy
+msgid "Country or Region List:"
 msgstr "ದೇಶದ ಪಟ್ಟಿ:"
 
-#: ../src/utils/mobile-wizard.c:1024
-msgid "Country"
-msgstr "ದೇಶ"
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
+#, fuzzy
+msgid "Country or region"
+msgstr "ದೇಶದ ಪಟ್ಟಿ:"
 
-#: ../src/utils/mobile-wizard.c:1031
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "ನನ್ನ ದೇಶವನ್ನು ಪಟ್ಟಿ ಮಾಡಲಾಗಿಲ್ಲ"
 
-#: ../src/utils/mobile-wizard.c:1077
-msgid "Choose your Provider's Country"
+#: ../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/utils/mobile-wizard.c:1126
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ GSM ಸಾಧನ"
 
-#: ../src/utils/mobile-wizard.c:1129
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ಅನುಸ್ಥಾಪಿಸಲಾದ CDMA ಸಾಧನ"
 
-#: ../src/utils/mobile-wizard.c:1297
+#: ../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 ""
-"ಈ ಸಹಾಯಕವು ಒಂದು ಸೆಲ್ಯುಲಾರ್ (3G) ಜಾಲಬಂಧಕ್ಕಾಗಿ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ "
-"ಸಂಪರ್ಕವನ್ನು ಸಜ್ಜುಗೊಳಿಸಲು ನೆರವಾಗುತ್ತದೆ."
+"ಈ ಸಹಾಯಕವು ಒಂದು ಸೆಲ್ಯುಲಾರ್ (3G) ಜಾಲಬಂಧಕ್ಕಾಗಿ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನು "
+"ಸಜ್ಜುಗೊಳಿಸಲು ನೆರವಾಗುತ್ತದೆ."
 
-#: ../src/utils/mobile-wizard.c:1302
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "ನೀವು ಈ ಕೆಳಗಿನ ಮಾಹಿತಿಯನ್ನು ನೀಡಬೇಕಾಗುತ್ತದೆ:"
 
-#: ../src/utils/mobile-wizard.c:1313
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಒದಗಿಸಿದವರ ಹೆಸರು"
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯ(ಪ್ಲಾನ್) ಹೆಸರು"
 
-#: ../src/utils/mobile-wizard.c:1325
+#: ../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 (ಎಕ್ಸೆಸ್ "
-"ಪಾಯಿಂಟ್ ನೇಮ್)"
+"(ಕೆಲವು ಸಂದರ್ಭಗಳಲ್ಲಿ) ನಿಮ್ಮ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಬಿಲ್ಲಿಂಗ್ ಯೋಜನೆಯ APN (ಎಕ್ಸೆಸ್ ಪಾಯಿಂಟ್ ನೇಮ್)"
 
-#: ../src/utils/mobile-wizard.c:1352
+#: ../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 "ಈ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಕ್ಕಾಗಿ ಸಂಪರ್ಕವನ್ನು ರಚಿಸು(_t):"
 
-#: ../src/utils/mobile-wizard.c:1367
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "ಯಾವುದೆ ಸಾಧನ"
 
-#: ../src/utils/mobile-wizard.c:1380
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವನ್ನ ಸಜ್ಜುಗೊಳಿಸಿ"
 
-#: ../src/utils/mobile-wizard.c:1554
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "ಹೊಸ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ"
 
-#: ../src/utils/nmn-mobile-providers.c:76
-msgid "United Kingdom"
-msgstr "ಯುನೈಟೆಡ್ ಕಿಂಗ್ಡಮ್"
+#: ../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/utils/nmn-mobile-providers.c:508
-msgid "Default"
-msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/utils/utils.c:218
-msgid "Bridge"
-msgstr "ಬ್ರಿಜ್"
+#: ../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/vpn-password-dialog.c:141 ../src/vpn-password-dialog.c:268
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "VPN ಸಂಪರ್ಕ '%s' ಅನ್ನು ಆರಂಭಿಸಲಾಗಲಿಲ್ಲ"
+#: ../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/vpn-password-dialog.c:144
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-"VPN ಸಂಪರ್ಕದ ಬಗೆ '%s' ಗಾಗಿನ ದೃಢೀಕರಣ ಸಂವಾದವು ಕಂಡು ಬಂದಿಲ್ಲ. ನಿಮ್ಮ ಗಣಕ "
-"ವ್ಯವಸ್ಥಾಪಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "ಗುಪ್ತಪದ(_P):"
 
-#: ../src/vpn-password-dialog.c:271
-#, c-format
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "ಗುಪ್ತಪದ(_P):"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "ಗುಪ್ತಪದಗಳನ್ನು ತೋರಿಸು(_w)"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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 ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
+"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 ""
-"VPN ಸಂಪರ್ಕದ ಬಗೆ '%s' ಗಾಗಿನ ದೃಢೀಕರಣ ಸಂವಾದವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ. "
-"ನಿಮ್ಮ ಗಣಕ ವ್ಯವಸ್ಥಾಪಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."
 
-#: ../src/wired-dialog.c:100
-msgid "Wired 802.1X authentication"
-msgstr "ತಂತಿಸಹಿತ 802.1X ದೃಢೀಕರಣ"
-
-#: ../src/wireless-dialog.c:469
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "ಹೊಸತು..."
 
-#: ../src/wireless-dialog.c:1089
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ಯಾವುದೂ ಇಲ್ಲ"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "ರಚಿಸು(_r)"
 
-#: ../src/wireless-dialog.c:1170
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ '%s' ಅನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ಗುಪ್ತಪದ ಅಥವ ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಯ "
 "ಅಗತ್ಯವಿರುತ್ತದೆ."
 
-#: ../src/wireless-dialog.c:1172
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
 
-#: ../src/wireless-dialog.c:1174
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕಾಗಿ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
 
-#: ../src/wireless-dialog.c:1179
-msgid "Create New Ad-Hoc Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧವನ್ನು ರಚಿಸಿ"
 
-#: ../src/wireless-dialog.c:1181
-msgid "New ad-hoc wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "ಹೊಸ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
 
-#: ../src/wireless-dialog.c:1182
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ನೀವು ನಿರ್ಮಿಸಲು ಬಯಸುವ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧದ ಹೆಸರನ್ನು ನಮೂದಿಸಿ."
 
-#: ../src/wireless-dialog.c:1184
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ"
 
-#: ../src/wireless-dialog.c:1186
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ"
 
-#: ../src/wireless-dialog.c:1187
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, 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:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ಸುರಕ್ಷತೆ(_S):"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#, fuzzy
+msgid "C_onnection:"
+msgstr "ಸಂಪರ್ಕ(_n):"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "ವೈರ್ಲೆಸ್ ಅಡಾಪ್ಟರ್(_a):"
+
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr "ಬಳಕೆ:"
+
+#: ../src/main.c:44
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
 msgstr ""
-"ನೀವು ಸಂಪರ್ಕ ಹೊಂದಲು ಬಯಸುವ ಅಡಗಿಸಲಾದ ವೈರ್ಲೆಸ್ ಸಂಪರ್ಕದ ಸುರಕ್ಷತಾ ವಿವರಗಳನ್ನು "
-"ನಮೂದಿಸಿ."
+"ಈ ಪ್ರೊಗ್ರಾಮ್ NetworkManager ನ ಒಂದು ಘಟಕವಾಗಿರುತ್ತದೆ (http://projects.gnome.org/"
+"NetworkManager)."
 
-#: ../src/wireless-security/eap-method.c:440
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../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
+msgid "EVDO"
+msgstr "EVDO"
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr "GPRS"
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr "EDGE"
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr "UMTS"
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr "HSDPA"
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr "HSUPA"
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr "ಶಕ್ತಗೊಂಡಿಲ್ಲ"
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr "ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ"
+
+#: ../src/mb-menu-item.c:141
+#, c-format
+msgid "Home network (%s)"
+msgstr "ನೆಲೆ(ಹೋಮ್) ಜಾಲಬಂಧ (%s)"
+
+#: ../src/mb-menu-item.c:143
+#, c-format
+msgid "Home network"
+msgstr "ನೆಲೆ(ಹೋಮ್) ಜಾಲಬಂಧ"
+
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr "ಹುಡುಕಲಾಗುತ್ತಿದೆ"
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr "ನೋಂದಣಿಯನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ"
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr "%s (ರೋಮಿಂಗ್)"
+
+#: ../src/mb-menu-item.c:170
+#, c-format
+msgid "Roaming network (%s)"
+msgstr "ರೋಮಿಂಗ್ ಜಾಲಬಂಧ (%s)"
+
+#: ../src/mb-menu-item.c:172
+#, c-format
+msgid "Roaming network"
+msgstr "ರೋಮಿಂಗ್ ಜಾಲಬಂಧ"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "PIN ಕೋಡ್‌ನ ಅಗತ್ಯವಿದೆ"
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಕ್ಕಾಗಿ PIN ಕೋಡ್‌ನ ಅಗತ್ಯವಿರುತ್ತದೆ"
+
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "'%s' ಎಂಬ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕವು ಸಕ್ರಿಯವಾಗಿದೆ: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "ರೋಮಿಂಗ್"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "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/wireless-security/eap-method.c:452
+#, 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ಅಥವ PEM ಪ್ರಮಾಣಪತ್ರಗಳು (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:260
-#: ../src/wireless-security/eap-method-peap.c:290
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:398
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "ಒಂದು PAC ಕಡತವನ್ನು ಆರಿಸು..."
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC ಕಡತಗಳು (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:409
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "ಎಲ್ಲಾ ಕಡತಗಳು"
 
-#: ../src/wireless-security/eap-method-peap.c:274
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "ಅನಾಮಧೇಯ ಗುರುತು(_m):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "ದೃಢೀಕರಣ(_A):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
+msgstr "ಅನಾಮಧೇಯ ಗುರುತು(_m):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+#, fuzzy
+msgid "PAC _file:"
+msgstr "_PAC ಕಡತ:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
+#, fuzzy
+msgid "_Inner authentication:"
+msgstr "ಆಂತರಿಕ ದೃಢೀಕರಣ(_n):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+#, fuzzy
+msgid "Allow automatic PAC pro_visioning"
+msgstr "ಸ್ವಯಂಚಾಲಿತ P_AC ಪ್ರಾವಿಶನಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸು"
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:369
-#: ../src/wireless-security/eap-method-tls.c:456
-#: ../src/wireless-security/eap-method-ttls.c:368
+#: ../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 "ಪ್ರಮಾಣಪತ್ರ ಅಥಾರಿಟಿಯ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
 
-#: ../src/wireless-security/eap-method-tls.c:272
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr ""
+
+#: ../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 "C_A ಪ್ರಮಾಣಪತ್ರ:"
+
+#: ../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
+msgid "No CA certificate is _required"
+msgstr "ಯಾವುದೆ CA ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿಲ್ಲ:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#, fuzzy
+msgid "PEAP _version:"
+msgstr "_PEAP ಆವೃತ್ತಿ:"
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A ಪ್ರಮಾಣಪತ್ರ:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರುವ ಖಾಸಗಿ ಕೀಲಿಗಳು ಅಸುರಕ್ಷಿತ"
 
-#: ../src/wireless-security/eap-method-tls.c:275
+#: ../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 "
@@ -2965,41 +3813,542 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"ಆಯ್ಕೆ ಮಾಡಲಾದ ಖಾಸಗಿ ಕೀಲಿಯು ಒಂದು ಗುಪ್ತಪದದಿಂದ ಸಂರಕ್ಷಿತಗೊಂಡಿರುವಂತೆ ಕಾಣಿಸುತ್ತಿಲ್ಲ."
-"  ಇದರಿಂದಾಗಿ ನಿಮ್ಮ ಸುರಕ್ಷತಾ ರುಜುವಾತನ್ನು ರಾಜಿ ಮಾಡಿಕೊಂಡಂತಾಗುತ್ತದೆ.  ದಯವಿಟ್ಟು "
-"ಒಂದು ಗುಪ್ತಪದದಿಂದ ಸಂರಿಕ್ಷಿತಗೊಂಡಂತಹ ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಒದಗಿಸಿ.\n"
+"ಆಯ್ಕೆ ಮಾಡಲಾದ ಖಾಸಗಿ ಕೀಲಿಯು ಒಂದು ಗುಪ್ತಪದದಿಂದ ಸಂರಕ್ಷಿತಗೊಂಡಿರುವಂತೆ ಕಾಣಿಸುತ್ತಿಲ್ಲ.  "
+"ಇದರಿಂದಾಗಿ ನಿಮ್ಮ ಸುರಕ್ಷತಾ ರುಜುವಾತನ್ನು ರಾಜಿ ಮಾಡಿಕೊಂಡಂತಾಗುತ್ತದೆ.  ದಯವಿಟ್ಟು ಒಂದು "
+"ಗುಪ್ತಪದದಿಂದ ಸಂರಿಕ್ಷಿತಗೊಂಡಂತಹ ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಒದಗಿಸಿ.\n"
 "\n"
 "(ನೀವು ನಿಮ್ಮ ಖಾಸಗಿ ಕೀಲಿಯನ್ನು openssl ಬಳಸಿಕೊಂಡು ಸಂರಕ್ಷಿಸಿ)"
 
-#: ../src/wireless-security/eap-method-tls.c:450
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ..."
 
-#: ../src/wireless-security/eap-method-tls.c:462
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "ನಿಮ್ಮ ಖಾಸಗಿ ಕೀಲಿಯನ್ನು ಆರಿಸಿ..."
 
-#: ../src/wireless-security/wireless-security.c:406
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity:"
+msgstr "ಗುರುತು(_d):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "ಬಳಕೆದಾರ ಪ್ರಮಾಣಪತ್ರ(_U):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "Private _key:"
+msgstr "ಖಾಸಗಿ ಕೀಲಿ(_k):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_Private key password:"
+msgstr "ಖಾಸಗಿ ಕೀಲಿ ಗುಪ್ತಪದ(_P):"
+
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:441
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "ಟನಲ್‌ ಮಾಡಲಾದ TLS"
 
-#: ../src/wireless-security/wireless-security.c:452
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "ಸಂರಕ್ಷಿತ EAP (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:593
-msgid "WPA Only"
-msgstr "WPA  ಮಾತ್ರ"
+#: ../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
+#, fuzzy
+msgid "Au_thentication:"
+msgstr "ದೃಢೀಕರಣ(_A):"
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
+#, fuzzy
+msgid "Open System"
+msgstr ""
+"ಮುಕ್ತ ವ್ಯವಸ್ಥೆ\n"
+"ಹಂಚಲಾದ ಕೀಲಿ"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+#, fuzzy
+msgid "Shared Key"
+msgstr ""
+"ಮುಕ್ತ ವ್ಯವಸ್ಥೆ\n"
+"ಹಂಚಲಾದ ಕೀಲಿ"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "ಕೀಲಿ(_K):"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr "ಕೀಲಿಯನ್ನು ತೋರಿಸು(_w)"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x:"
+msgstr "WEP ಸೂಚಿ(_x):"
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "ಬಗೆ(_T):"
+
+#~ msgid "Show WPA protocol chooser widget"
+#~ msgstr "WPA ಪ್ರೊಟೊಕಾಲ್ ಆಯ್ಕೆಗಾರ ವಿಡ್ಗೆಟ್ ಅನ್ನು ತೋರಿಸು"
+
+#~ msgid ""
+#~ "Set to TRUE to show the WPA protocol chooser when editing connections."
+#~ msgstr ""
+#~ "ಸಂಪರ್ಕಗಳನ್ನು ಸಂಪಾದಿಸುವಾಗ WPA ಪ್ರೊಟೊಕಾಲ್ ಆಯ್ಕೆಗಾರವನ್ನು ತೋರಿಸಲು ಇದನ್ನು TRUE ಗೆ "
+#~ "ಹೊಂದಿಸಲಾಗುತ್ತದೆ."
+
+#~ msgid "An instance of nm-applet is already running.\n"
+#~ msgstr "nm-ಆಪ್ಲೆಟ್‌ನ ಒಂದು ಸನ್ನಿವೇಶವು ಈಗಾಗಲೆ ಚಾಲನೆಯಲ್ಲಿದೆ.\n"
+
+#~ msgid "Could not acquire the %s service. (%d)\n"
+#~ msgstr "%s ಸೇವೆಯನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ. (%d)\n"
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "ಬಾಂಡ್ ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "'%s' ಗಾಗಿ ಒಂದು ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "ಬ್ರಿಜ್ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "ಬ್ರಿಜ್‌ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "ಬ್ರಿಜ್ ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "ಹೊಸ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಂಪರ್ಕ (CDMA)..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "ನೀವು ಈಗ CDMA ಜಾಲಬಂಧದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "ಹೊಸ ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ (GSM) ಸಂಪರ್ಕ..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "ಈಗ ನೀವು GSM ಜಾಲಬಂಧದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
+
+#~ msgid "PUK code required"
+#~ msgstr "PUK ಕೋಡ್‌ನ ಅಗತ್ಯವಿದೆ"
+
+#~ msgid "PUK code is needed for the mobile broadband device"
+#~ msgstr "ಮೊಬೈಲ್ ಬ್ರಾಡ್‌ಬ್ಯಾಂಡ್ ಸಾಧನಕ್ಕಾಗಿ PUK ಕೋಡ್‌ನ ಅಗತ್ಯವಿರುತ್ತದೆ"
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "ಸ್ವಯಂ InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand ಜಾಲಬಂಧಗಳು (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand ಜಾಲಬಂಧ (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand ಜಾಲಬಂಧಗಳು"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand ಜಾಲಬಂಧ"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "ನೀವು ಈಗ InfiniBand ಜಾಲಬಂಧಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿದ್ದೀರಿ."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "ನೀವು ಈಗ VLAN ಜಾಲಬಂಧದೊಂದಿಗೆ ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದೀರಿ."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "VLAN ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಿದ್ಧಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "VLAN ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "VLAN ಸಂಪರ್ಕ '%s' ಕ್ಕಾಗಿ ಬಳಕೆದಾರ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ..."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧಗಳು (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ (%s)"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಜ್ಜುಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಅನ್ನು ಸಂರಚಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "'%s' ಗಾಗಿನ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ವಿಳಾಸಕ್ಕಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾಗುತ್ತಿದೆ..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ ಸಂಪರ್ಕ '%s' ಸಕ್ರಿಯವಾಗಿದೆ"
+
+#~ msgctxt "No wired security used"
+#~ msgid "None"
+#~ msgstr "ಯಾವುದೂ ಇಲ್ಲ"
+
+#~ msgctxt "Unknown/unrecognized wired or wifi security"
+#~ msgid "Unknown"
+#~ msgstr "ಅಜ್ಞಾತ"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "ದ್ವಿತೀಯ DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "ತೃತೀಯ DNS:"
+
+#~ msgid "translator-credits"
+#~ msgstr "ಶಂಕರ್ ಪ್ರಸಾದ್ ಎಂ. ವಿ. <svenkate@redhat.com>"
+
+#~ msgid "_Help"
+#~ msgstr "ನೆರವು(_H)"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "ಇತರೆ ವೈರ್ಲೆಸ್ ಜಾಲಬಂಧ..."
+
+#~ msgid "_Wireless security:"
+#~ msgstr "ವೈರ್ಲೆಸ್ ಸುರಕ್ಷತೆ(_W):"
+
+#~ msgid ""
+#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+#~ msgstr "<span size=\"larger\" weight=\"bold\">ಸಕ್ರಿಯ ಜಾಲಬಂಧ ಸಂಪರ್ಕಗಳು</span>"
+
+#~ msgid "WPA Protocol:"
+#~ msgstr "WPA ಪ್ರೊಟೊಕಾಲ್:"
+
+#~ msgid ""
+#~ "Anonymous\n"
+#~ "Authenticated\n"
+#~ "Both"
+#~ msgstr ""
+#~ "ಅಜ್ಞಾತ\n"
+#~ "ದೃಢೀಕೃತ\n"
+#~ "ಎರಡೂ"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Version 0\n"
+#~ "Version 1"
+#~ msgstr ""
+#~ "ಸ್ವಯಂಚಾಲಿತ\n"
+#~ "ಆವೃತ್ತಿ 0\n"
+#~ "ಆವೃತ್ತಿ 1"
+
+#~ msgid "label"
+#~ msgstr "ಲೇಬಲ್"
+
+#~ msgid "Show it"
+#~ msgstr "ಅದನ್ನು ತೋರಿಸು"
+
+#~ msgid "_Mode:"
+#~ msgstr "ಕ್ರಮ (_M):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "ಸಾಧನದ MAC ವಿಳಾಸ(_D):"
+
+#~ msgid "<b>Addresses</b>"
+#~ msgstr "<b>ವಿಳಾಸಗಳು</b>"
+
+#~ msgid "_Routes&#x2026;"
+#~ msgstr "ರೌಟ್‌ಗಳು (_R)&#x2026;"
+
+#~ msgid "Any"
+#~ msgstr "ಯಾವುದಾದರೂ"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "3G ಗೆ (UMTS/HSPA) ಆದ್ಯತೆ ನೀಡು"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "2Gಗೆ (GPRS/EDGE) ಆದ್ಯತೆ ನೀಡು"
+
+#~ msgid "<b>Basic</b>"
+#~ msgstr "<b>ಮೂಲಭೂತ</b>"
+
+#~ msgid "PI_N:"
+#~ msgstr "PI_N:"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>ದೃಢೀಕರಣ</b>"
+
+#~ msgid "<b>Echo</b>"
+#~ msgstr "<b>ಪ್ರತಿಧ್ವನಿ</b>"
+
+#~ msgid "MT_U:"
+#~ msgstr "MT_U:"
+
+#~ msgid "Infrastructure"
+#~ msgstr "ಮೂಲಭೂತ ವ್ಯವಸ್ಥೆ"
+
+#~ msgid "_SSID:"
+#~ msgstr "_SSID:"
+
+#~ msgid "Wireless"
+#~ msgstr "ವೈರ್ಲೆಸ್"
+
+#~ msgid ""
+#~ "Select the type of connection that will be used for the slaves of this "
+#~ "bond."
+#~ msgstr "ಈ ಬಾಂಡ್‌ನ ಸ್ಲೇವ್‌ಗಳಲ್ಲಿ ಬಳಸಲಾಗುವ ಸಂಪರ್ಕದ ಬಗೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ."
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "ಸ್ವಯಂಚಾಲಿತ (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "ಸ್ವಯಂಚಾಲಿತ (PPP) ವಿಳಾಸಗಳು ಮಾತ್ರ"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "ವೈರ್ಲೆಸ್ ಸಂಪರ್ಕ %d"
+
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the "
+#~ "NetworkManager applet .glade file was not found)."
+#~ msgstr ""
+#~ "ಸಂಪರ್ಕ ಸಂಪಾದಕಕ್ಕೆ ಕೆಲವು ಅಗತ್ಯ ಸಂಪನ್ಮೂಲಗಳು ಕಂಡುಬಂದಿಲ್ಲ (NetworkManager applet ."
+#~ "glade ಕಡತವು ಕಂಡುಬಂದಿಲ್ಲ)."
+
+#~ msgid ""
+#~ "Support for bond, bridge, and VLAN interfaces must be enabled by setting "
+#~ "the NM_BOND_BRIDGE_VLAN_ENABLED key to 'yes' in <tt>/etc/sysconfig/"
+#~ "network</tt>:\n"
+#~ "\n"
+#~ "\t<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
+#~ "\n"
+#~ "After making this modification, NetworkManager must be restarted to "
+#~ "ensure the new functionality is enabled."
+#~ msgstr ""
+#~ "<tt>/etc/sysconfig/network</tt> ನಲ್ಲಿ NM_BOND_BRIDGE_VLAN_ENABLED ಕೀಲಿಯನ್ನು "
+#~ "'yes'ಗೆ ಹೊಂದಿಸುವುದರ ಮೂಲಕ  ಬಾಂಡ್, ಬ್ರಿಜ್ ಮತ್ತು VLAN ಸಂಪರ್ಕಸಾಧನಗಳಿಗಾಗಿ ಬೆಂಬಲವನ್ನು "
+#~ "ಸಕ್ರಿಯಗೊಳಿಸಬೇಕು:\n"
+#~ "\n"
+#~ "\t<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
+#~ "\n"
+#~ "ಈ ಮಾರ್ಪಾಡನ್ನು ಮಾಡಿದ ನಂತರ, ಹೊಸ ಬದಲಾವಣೆಯು ಸಕ್ರಿಯವಾಗಿದೆಯೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಲು "
+#~ "NetworkManager ಅನ್ನು ಮರಳಿ ಆರಂಭಿಸಬೇಕಿರುತ್ತದೆ."
+
+#~ msgid "Bridging, bonding, and VLAN functionality not enabled"
+#~ msgstr "ಬ್ರಿಜಿಂಗ್, ಬಾಂಡಿಂಗ್, ಮತ್ತು VLAN ಸೌಲಭ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿಲ್ಲ"
+
+#~ msgid "Apply"
+#~ msgstr "ಅನ್ವಯಿಸಿ"
+
+#~ msgid "Apply..."
+#~ msgstr "ಅನ್ವಯಿಸು..."
+
+#~ msgid "Bonding, bridging, and VLANs are disabled in NetworkManager."
+#~ msgstr ""
+#~ "ಬಾಂಡಿಂಗ್, ಬ್ರಿಜಿಂಗ್,  ಮತ್ತು VLAN ಗಳನ್ನು NetworkManager ನಲ್ಲಿ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿಲ್ಲ."
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "ಗುಣ '%s' / '%s' ಅಮಾನ್ಯವಾಗಿದೆ: %d"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಪರ್ಕ ಜೋಡಿಸು(_a)"
+
+#~ msgid "Available to all users"
+#~ msgstr "ಲಭ್ಯವಿರುವ ಎಲ್ಲಾ ಬಳಕೆದಾರರು"
+
+#~ msgid "Edit"
+#~ msgstr "ಸಂಪಾದಿಸು"
+
+#~ msgid "Edit..."
+#~ msgstr "ಸಂಪಾದಿಸು..."
+
+#~ msgid "Delete"
+#~ msgstr "ಅಳಿಸು"
+
+#~ msgid "Delete..."
+#~ msgstr "ಅಳಿಸಿ..."
+
+#~ msgid "Error: %s"
+#~ msgstr "ದೋಷ: %s"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "ಮೊಬೈಲ್ ಗಾರುಡಿಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "ಗೊತ್ತಿರದ ದೂರವಾಣಿ ಸಾಧನದ ಬಗೆ (GSM ಅಥವ CDMA ಅಲ್ಲ)"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "ನಿಮ್ಮ ದೂರವಾಣಿಯು ಈಗ ಬಳಸಲು ಯೋಗ್ಯವಾಗಿದೆ!"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "ದೂರವಾಣಿಯೊಂದಿಗೆ ಸಂಪರ್ಕ ಸಾಧಿಸುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ದೂರವಾಣಿಯಿಂದ ಅನಿರೀಕ್ಷಿತವಾಗಿ ಸಂಪರ್ಕವು ಕಡಿದುಹೋಗಿದೆ."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "ದೂರವಾಣಿಯ ವಿವರಗಳನ್ನು ಪಡೆಯು ಕಾಲಾವಧಿ ತೀರಿದೆ."
+
+#~ msgid "could not connect to the system bus."
+#~ msgstr "ವ್ಯವಸ್ಥೆಯ ಬಸ್‌ನೊಂದಿಗೆ ಸಂಪರ್ಕಹೊಂದಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "ದೂರವಾಣಿ ಸಂರಚನೆಯನ್ನು ಪತ್ತೆಹಚ್ಚಲಾಗುತ್ತದೆ..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "ಒಂದು ಡಯಲ್-ಅಪ್-ಜಾಲಬಂಧ ಸಂಪರ್ಕವನ್ನು ಅಣಿಗೊಳಿಸುವ ಮೊದಲು ಪೂರ್ವನಿಯೋಜಿತವಾದ ಬ್ಲೂಟೂತ್ "
+#~ "ಅಡಾಪ್ಟರ್ ಅನ್ನು ಶಕ್ತಗೊಳಿಸಬೇಕು."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr ""
+#~ "ಬ್ಲೂಟೂತ್ ಸಂರಚನೆಯು ಸಾಧ್ಯವಿಲ್ಲ (D-Bus ನೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ:%s)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "ಬ್ಲೂಟೂತ್ ಸಂರಚನೆಯು ಸಾಧ್ಯವಿಲ್ಲ (D-Bus ಪ್ರಾಕ್ಸಿಯನ್ನು ರಚಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr ""
+#~ "ಬ್ಲೂಟೂತ್ ಸಂರಚನೆಯು ಸಾಧ್ಯವಿಲ್ಲ (NetworkManager ಅನ್ನು ಪತ್ತೆ ಮಾಡುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ: "
+#~ "%s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ದೂರವಾಣಿಯನ್ನು ಒಂದು ಜಾಲಬಂಧ ಸಾಧನವಾಗಿ ಬಳಸಿ (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ದೂರವಾಣಿಯನ್ನು ಬಳಸಿಕೊಂಡು ಅಂತರ್ಜಾಲವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಿ(DUN)"
+
+#~ msgid "Country"
+#~ msgstr "ದೇಶ"
+
+#~ msgid "United Kingdom"
+#~ msgstr "ಯುನೈಟೆಡ್ ಕಿಂಗ್ಡಮ್"
+
+#~ msgid "Cannot start VPN connection '%s'"
+#~ msgstr "VPN ಸಂಪರ್ಕ '%s' ಅನ್ನು ಆರಂಭಿಸಲಾಗಲಿಲ್ಲ"
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "VPN ಸಂಪರ್ಕದ ಬಗೆ '%s' ಗಾಗಿನ ದೃಢೀಕರಣ ಸಂವಾದವು ಕಂಡು ಬಂದಿಲ್ಲ. ನಿಮ್ಮ ಗಣಕ "
+#~ "ವ್ಯವಸ್ಥಾಪಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."
+
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "VPN ಸಂಪರ್ಕದ ಬಗೆ '%s' ಗಾಗಿನ ದೃಢೀಕರಣ ಸಂವಾದವನ್ನು ಆರಂಭಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ. "
+#~ "ನಿಮ್ಮ ಗಣಕ ವ್ಯವಸ್ಥಾಪಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."
 
-#: ../src/wireless-security/wireless-security.c:602
-msgid "WPA2/RSN Only"
-msgstr "WPA2/RSN ಮಾತ್ರ"
+#~ msgid "WPA Only"
+#~ msgstr "WPA  ಮಾತ್ರ"
 
+#~ msgid "WPA2/RSN Only"
+#~ msgstr "WPA2/RSN ಮಾತ್ರ"
diff --git a/po/ko.po b/po/ko.po
index 8c4df3df..67367c62 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -21,9 +21,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-09-05 18:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-09-06 18:12+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
@@ -33,7 +32,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "네트워크"
 
@@ -127,46 +126,90 @@ msgid ""
 "authentication."
 msgstr "참이면 CA 인증서가 EAP 2차 인증이 되었는지 경고를 하지 않습니다."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "네트워크 관리 애플릿"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "네트워크 관리 애플릿"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X 인증"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "연결(_O)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "네트워크 이름(_N):"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "애드혹"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "연결 추가/활성화하는 데 실패"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "알 수 없는 오류"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "연결에 실패"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "장치 연결 끊는 데 실패"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "연결 끊는 데 실패"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "연결 활성화 실패"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "다시 보지 않기"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -176,7 +219,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 네트워크 연결이 중단되었습니다."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -186,7 +229,7 @@ msgstr ""
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 예기치 못하게 중단"
 "되었습니다."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -197,7 +240,7 @@ msgstr ""
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 잘못된 설정을 반환"
 "했습니다."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -206,7 +249,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 연결 시도가 제한 시간을 초과했습니다."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -216,7 +259,7 @@ msgstr ""
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 제 시간에 시작하"
 "지 못했습니다."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -226,7 +269,7 @@ msgstr ""
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스를 시작하는데 실패했"
 "습니다."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -235,7 +278,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 올바른 가상 사설망 비밀정보가 없습니다."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -244,7 +287,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 비밀 정보가 잘못되었습니다."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -253,7 +296,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -263,7 +306,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 네트워크 연결이 중단되었습니다."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -272,7 +315,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 실패했습니다. 가상 사설망 서비스가 중단되었습니다."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -281,7 +324,7 @@ msgstr ""
 "\n"
 "'%s' 가상 사설망 연결이 끊어졌습니다."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -292,19 +335,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "가상 사설망에 성공적으로 연결했습니다.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "가상 사설망 로그인 메시지"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "가상 사설망 연결 실패"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -318,7 +361,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -331,798 +374,544 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "장치가 준비되지 않음(펌웨어 없음)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "장치가 준비되지 않음"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "연결 끊김"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "연결 끊김"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "장치가 관리되지 않음"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "네트워크 장치를 찾을 수 없습니다"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "가상 사설망 연결(_V)"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "가상 사설망 설정(_C)..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "가상 사설망 연결 끊기(_D)..."
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "네트워크 관리가 실행 중이 아닙니다..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "네트워크를 사용할 수 없습니다"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "네트워크 사용(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "와이파이 사용(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "모바일 광대역 사용(_M)"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "와이맥스 모바일 광대역 사용(_X)"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "통지기능 사용(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "연결 정보(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "연결 편집..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "도움말(_H)"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "정보(_A)"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "'%s'에 연결되었습니다."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "연결 끊김"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "네트워크 연결이 끊겼습니다."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "네트워크 연결 '%s' 준비 중..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "네트워크 연결 '%s'에는 사용자 인증이 필요합니다..."
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s'에 네트워크 주소 요청중..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "'%s' 네트워크 연결 사용 중"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "가상 사설망 연결 '%s' 시작 중..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "가상 사설망 연결 '%s'에는 사용자 인증이 필요합니다..."
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s'에 가상 사설망 주소 요청 중..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "가상 사설망 연결 '%s' 사용 중"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "네트워크 연결 없음"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "네트워크 관리 애플릿"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "사용 가능"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "연결됨"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "본딩 네트워크에 연결되었습니다."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "본딩 네트워크 연결 '%s' 준비 중..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "본딩 연결 '%s' 설정 중..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "본딩 연결 '%s'에는 사용자 인증이 필요합니다..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "'%s'에 주소 요청 중..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "본딩 연결 '%s' 사용 중"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "브릿지 네트워크에 연결되었습니다."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "브릿지 연결 '%s' 준비 중..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "브릿지 연결 '%s' 설정 중..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "브릿지 연결 '%s'에는 사용자 인증이 필요합니다..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "브릿지 연결 '%s' 사용 중"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "잘못된 PUK 코드. 서비스 업체에 문의하십시오."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "언락 코드를 보내는 중..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "모바일 광대역(%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "모바일 광대역"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "사용 가능"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "새 모바일 광대역 연결..."
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "연결됨"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "모바일 광대역 네트워크에 연결되었습니다."
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "모바일 광대역 네트워크."
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "홈 네트워크에 등록되었습니다."
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "로밍 네트워크에 등록되었습니다."
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "모바일 광대역 네트워크에 연결되었습니다."
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "모바일 광대역 연결 '%s' 준비 중..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "모바일 광대역 연결 '%s' 설정 중..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "모바일 광대역 연결 '%s'에는 사용자 인증이 필요합니다..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "모바일 광대역 연결 '%s' 사용 중"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "새 모바일 광대역(CDMA) 연결..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "CDMA 네트워크에 연결되었습니다."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "CDMA 네트워크."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "자동 이더넷"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "이더넷 네트워크(%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "이더넷 네트워크(%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "이더넷 네트워크"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "이더넷 네트워크"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "이더넷 네트워크에 연결되었습니다."
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "이더넷 네트워크 '%s' 연결 준비 중..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "이더넷 네트워크 '%s' 연결 설정 중..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "이더넷 네트워크 연결 '%s'에 사용자 인증이 필요합니다..."
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "이더넷 네트워크 '%s'에 네트워크 주소 요청 중..."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "이더넷 네트워크 연결 '%s' 사용 중"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL 인증"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "새 모바일 광대역(GSM) 연결..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "GSM 네트워크에 연결되었습니다."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "GSM 네트워크."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "자동 인피니밴드"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "인피니밴드 네트워크(%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "인피니밴드 네트워크(%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "인피니밴드 네트워크"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "인피니밴드 네트워크"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "인피니밴드 네트워크에 연결되었습니다."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "인피니밴드 연결 '%s' 준비 중..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "인피니밴드 연결 '%s' 설정 중..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "인피니밴드 연결 '%s'에는 사용자 인증이 필요합니다..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "인피니밴드 연결 '%s' 사용 중"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "팀 네트워크에 연결되었습니다."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "팀 연결 '%s' 준비 중..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "팀 연결 '%s' 설정 중..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "팀 연결 '%s'에는 사용자 인증이 필요합니다..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "팀 연결 '%s' 사용 중"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "VLAN에 연결되었습니다."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "VLAN 연결 '%s' 준비 중..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "VLAN '%s' 설정 중..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "VLAN 연결 '%s'에는 사용자 인증이 필요합니다..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VLAN 연결 '%s' 사용 중"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "숨겨진 와이파이 네트워크에 연결(_C)..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "새 와이파이 네트워크 만들기(_N)..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(없음)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "와이파이 네트워크(%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "와이파이 네트워크(%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "와이파이 네트워크"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "와이파이를 사용하지 않습니다"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "와이파이가 하드웨어 스위치를 통해 사용하지 않습니다"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "다른 네트워크"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "와이파이 네트워크가 사용 가능합니다"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "네트워크 메뉴에서 와이파이 네트워크에 연결할 수 있습니다"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "와이파이 네트워크 '%s'에 연결되었습니다."
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "와이파이 네트워크 '%s' 연결 준비 중..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "와이파이 네트워크 '%s' 연결 설정 중..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "와이파이 네트워크 연결 '%s'에 사용자 인증이 필요합니다..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "'%s'에 대한 와이파이 네트워크 주소 요청 중..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "와이파이 네트워크 연결 '%s' 사용 중: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "와이파이 네트워크 연결 '%s' 사용 중"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "연결 활성화하는 데 실패"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "새로운 연결을 추가하는데 실패"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "와이맥스 모바일 광대역(%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "와이맥스 모바일 광대역"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "와이맥스를 사용하지 않습니다"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "와이맥스가 하드웨어 스위치를 통해 사용하지 않습니다"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "와이맥스 네트워크에 연결되었습니다."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "모바일 광대역 연결 '%s' 사용 중: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "로밍"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "연결 정보 보이기 오류:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "동적 WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "주소"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "없음"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (기본값)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "알 수 없음"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "알 수 없음"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP 주소:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP 주소:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "브로드캐스트 주소:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "서브넷 마스크:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "기본 경로:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "서브넷 마스크:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "이더넷(%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 와이파이(%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "일반"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "인터페이스:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "하드웨어 주소:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "드라이버:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "속도:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "보안:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "기본 경로:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "무시함"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "가상 사설망 형식:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "가상 사설망 게이트웨이:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "가상 사설망 사용자 이름:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "가상 사설망 추방자:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "기반 연결:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "알 수 없음"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "활성된 연결을 찾을 수 없습니다!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1130,42 +919,42 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "네트워크 장치와 연결을 관리하는 알림 영역 애플릿."
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "네트워크 관리 웹사이트"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "빠진 자료"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "모바일 광대역 네트워크 암호"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s'에 연결하려면 암호가 필요합니다."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "암호:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN 잠금해제가 필요합니다"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN 잠금해제가 필요합니다"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1173,25 +962,25 @@ msgid ""
 msgstr "'%s' 모바일 광대역 장치를 사용하려면 SIM PIN 코드가 필요합니다."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN 코드:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "PIN 코드 표시"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK 잠금 해제가 필요합니다"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK 잠금 해제가 필요합니다"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1199,27 +988,34 @@ msgid ""
 msgstr "'%s' 모바일 광대역 장치를 사용하려면 SIM PUK 코드가 필요합니다."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK 코드:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "새 PIN 코드:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "새 PIN 코드 다시 입력:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK 코드 표시"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1229,26 +1025,48 @@ msgstr ""
 "네트워크에서 컴퓨터를 식별하는 IP 주소. \"추가\" 단추를 눌러 IP 주소를 추가하"
 "십시오."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "삭제(_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "자동으로 얻은 라우팅 정보 무시(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "이 네트워크에 있는 자원을 위해서만 연결 사용(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "참이면 이 연결은 기본 네트워크 연결로 결코 사용되지 않습니다."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1256,15 +1074,15 @@ msgstr "참이면 이 연결은 기본 네트워크 연결로 결코 사용되�
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "만들기…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "연결 종류 선택"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1316,67 +1134,60 @@ msgid "Bonded _connections:"
 msgstr "본딩 연결(_C):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "모드(_M):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "모드(_O):"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "편집(_E)"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "삭제(_D)"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "편집(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "감시 주기(_F):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "밀리초"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "인터페이스 이름(_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "연결 감시(_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP 대상(_T):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "연결 지연 시간(_U):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "해제 지연 시간(_D):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "기본(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1384,12 +1195,30 @@ msgstr ""
 "주요 장치로 사용할 인터페이스 이름. 설정하면 이 장치가 있으면 항상 액티브 슬"
 "레이브 상태로 만듭니다."
 
+#: ../src/connection-editor/ce-page-bond.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:17
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "바이트"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "경로 비용(_C):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "우선 순위(_P):"
 
@@ -1401,44 +1230,89 @@ msgstr "헤어핀 모드(_H):"
 msgid "Bridged _connections:"
 msgstr "브릿지 연결(_C):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "앞으로 지연 시간(_F):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "최초 통신 시간(_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "초"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "네트워크 사용(_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "STP(Spanning Tree Protocol) 사용(_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "최대 기간(_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "유지 시간(_A):"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "자동"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "기본"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "주소"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "주소"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "모든 장치"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "알려지지 않은 오류로 비밀 정보를 업데이트하는 데 실패했습니다."
 
@@ -1537,75 +1411,75 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "우선순위 흐름 제어"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "우선순위마다 우선순위 일시중지를 전송할지 지정합니다."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "우선 순위:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "트래픽 클래스:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "엄격한 대역폭:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "우선 순위 대역폭:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "모음 대역폭:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "그룹 아이디:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr "사용자 우선 순위마다 우선순위 그룹 아이디를 입력합니다."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1614,22 +1488,22 @@ msgstr ""
 "각 우선순위 그룹마다 사용을 허용할 링크 대역폭 퍼센트를 지정합니다. 그룹의 총"
 "합은 100%여야 합니다."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 "각 사용자 우선순위가 사용하는 우선순위 그룹 대역폭의 퍼센트를 지정합니다."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "사용자 우선순위마다 엄격한 대역폭을 사용할지 지정합니다."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1642,7 +1516,7 @@ 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:4
+#: ../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
@@ -1650,8 +1524,9 @@ msgid "Sho_w password"
 msgstr "암호 표시(_W)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1663,7 +1538,8 @@ msgstr "암호(_P):"
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "자동"
@@ -1718,18 +1594,18 @@ msgstr "자동 협상(_O)"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "장치 MAC 주소(_D):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "서비스(_S):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "복제한 MAC 주소(_L):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1738,19 +1614,54 @@ msgstr ""
 "여기에 입력한 MAC 주소를 이 연결의 네트워크 장치의 하드웨어 주소로 사용합니"
 "다. 이 기능을 MAC 클로닝 혹은 스푸핑이라고 합니다. 예: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "MTU(_M):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "바이트"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "기본"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "무시"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "브로드캐스트"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "비밀키 암호(_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1789,8 +1700,8 @@ msgstr "자동, DNS 설정은 수동"
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "수동"
 
@@ -1801,8 +1712,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "다른 컴퓨터와 공유"
 
@@ -1816,7 +1727,7 @@ msgstr "방식(_M):"
 msgid "Addresses"
 msgstr "주소"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1825,8 +1736,8 @@ msgstr ""
 "DHCP 클라이언트 ID를 이용해 네트워크 관리에서 컴퓨터 설정을 개별적으로 지정"
 "할 수 있습니다. DHCP 클라이언트 ID를 사용하고 싶다면, 여기 입력하십시오."
 
-#: ../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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1834,25 +1745,25 @@ msgstr ""
 "호스트 이름에서 주소를 찾을 때 사용할 도메인. 여러 도메인을 사용할 경우 쉼표"
 "로 구분하십시오."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "DNS 서버(_V):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1860,11 +1771,11 @@ msgstr ""
 "호스트 이름에서 주소를 검색하는 데 사용할 도메인 네임 서버의 IP 주소. 여러 도"
 "메인 서버를 사용하려면 쉼표로 구분하십시오."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1872,13 +1783,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "라우팅(_R)…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "사용안함"
 
@@ -1890,7 +1801,7 @@ msgstr "사용(공용 주소 선호)"
 msgid "Enabled (prefer temporary address)"
 msgstr "사용(임시 주소 선호)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 "
@@ -1900,15 +1811,15 @@ msgstr ""
 "메인 서버를 사용하려면 쉼표로 구분하십시오. 링크 로컬 주소는 자동으로 연결된 "
 "인터페이스로 취급합니다."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 개인 보안 확장(_P):"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1917,71 +1828,38 @@ msgstr ""
 "은 성공한 경우라도 연결을 마무리합니다."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "모두"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G(UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G(GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3G 선호(UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2G 선호(GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "4G 선호(LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "4G만 사용(LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "기본"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "번호(_M):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "고급"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "네트워크 이름(_E):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "형식(_T):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "바꾸기..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "PIN(_I):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "홈 네트워크가 사용 불가능할 경우 로밍을 허용(_R)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "암호 보이기(_W)"
 
@@ -2047,32 +1925,55 @@ msgid "_Teamed connections:"
 msgstr "팀 연결(_T):"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "파일에서 팀 설정 가져오기(_M)..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "파일에서 팀 설정 가져오기(_I)..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "상위 인터페이스(_P):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "가상 LAN 인터페이스 이름(_N):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "복제한 MAC 주소(_C):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "가상 LAN 아이디(_I):"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "장치 이름 + 번호"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + 번호"
 
@@ -2089,94 +1990,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "인프라스트럭처"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "애드혹"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "전송 출력(_W):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "레이트(_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "BSSID(_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "채널(_H):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "밴드(_D):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "모드(_O):"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SSID(_I):"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "허용된 인증 방식"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "암호 인증 프로토콜"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2184,302 +2089,361 @@ msgstr ""
 "대부분의 경우 서비스 업체의 PPP 서버는 모든 인증 방법을 지원합니다. 만약 연결"
 "이 실패하면, 몇몇 방법을 사용하지 않아 보십시오."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "주소"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "넷마스크"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "게이트웨이"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "매트릭"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "접두어"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "이더넷"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "와이파이"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "와이맥스"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "블루투스"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "인피니밴드"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "본딩"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "팀"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "브릿지"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "가상 LAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "가상 사설망"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "하드웨어"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "가상"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "저장한 가상 사설망 설정 가져오기..."
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "연결 에디터 창을 알려지지 않은 오류 때문에 열 수 없습니다."
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "새로운 연결을 만들 수 없음"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "연결 제거가 실패했습니다"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "%s 연결을 정말로 제거하시겠습니까?"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "주소"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "넷마스크"
+
+#: ../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
+msgid "Gateway"
+msgstr "게이트웨이"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "매트릭"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "접두어"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "%s 편집"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "이름 없는 연결을 편집"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "연결 이름(_N):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "에디터 초기화 중 오류"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "연결을 추가하는 데 실패했습니다"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "이 연결에 대해 바뀐 사항을 저장합니다."
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "이 컴퓨터의 모든 사용자에게 이 연결을 적용하도록 인증합니다."
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "연결을 만들 수 없음"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "연결을 변경할 수 없음"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "연결 편집 대화 창 만들기에 알 수 없는 오류."
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "에디터 초기화 중 오류"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "연결을 추가하는 데 실패했습니다"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "연결을 저장하는데 오류"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "속성 '%s' / '%s' 잘못됨: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "연결 이름(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "내보내기(_E)..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "하지 않음"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "지금"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d분 전"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d시간 전"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d일 전"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d달 전"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d년 전"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "이름"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "마지막 사용"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "선택한 연결을 고칩니다"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "선택된 연결을 변경하도록 인증합니다"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "선택한 연결 삭제"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "선택한 연결을 삭제하도록 인증"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "VPN 플러그인을 하나도 설치하지 않았습니다."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "'%s' 연결을 만드는 방법을 알지 못합니다"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "연결을 만드는데 오류"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "연결을 편집하는데 오류"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID가 '%s'인 연결을 찾을 수 없습니다"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x 보안"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "802.1x 보안 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "이 연결에 802.1x 보안을 사용(_X)"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "DCB 사용자 인터페이스를 읽어들일 수 없습니다."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "본딩 네트워크 연결 %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "블루투스"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "이더넷 네트워크"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "와이파이 네트워크"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "본딩 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "기본(_P):"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "본딩 네트워크 연결 %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "브릿지 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "브릿지 네트워크 연결 %d"
@@ -2487,58 +2451,74 @@ msgstr "브릿지 네트워크 연결 %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "브릿지 포트"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "브릿지 네트워크 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "DCB 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 연결 %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 주소로 지정한 네트워크 장치에만 "
 "해당됩니다. 예: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "이더넷 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "이더넷"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "복제한 MAC 주소(_L):"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "기본"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2548,125 +2528,168 @@ msgstr ""
 "방화벽 안의 기본 구역을 사용합니다. firewalld를 사용할 때만 사용할 수 있습니"
 "다."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD가 실행 중이 아닙니다."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "일반 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "인피니밴드 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "인피니밴드 네트워크 연결 %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "자동(가상 사설망)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "자동(가상 사설망), 주소만"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "자동(PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "주소만 자동(PPP)"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "주소만 자동"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "자동(PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "주소만 자동(PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "자동(DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "주소만 자동(DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "연결-로컬 연결만"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "추가 DNS 서버(_V):"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "추가 검색 도메인(_E):"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s의 IPv4 경로 편집 중"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 설정"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "주소만 자동"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "무시"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "자동, DHCP만 사용"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s의 IPv6 경로 편집"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 설정"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "슬레이브 중복"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "'%s' 및 '%s' 슬레이브가 모두 '%s' 장치에 적용됩니다"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2675,25 +2698,25 @@ msgstr ""
 "'%s' 및 '%s' 슬레이브가 같은 물리적 장치의 다른 가상 포트('%s' 및 '%s')에 적"
 "용됩니다."
 
-#: ../src/connection-editor/page-master.c:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s 슬레이브 %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "모바일 광대역 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "지원하지 않는 모바일 광대역 연결 종류."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "모바일 광대역 통신사 종류를 선택하십시오"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2701,84 +2724,84 @@ msgstr ""
 "모바일 광대역 통신사가 사용하는 기술을 선택하십시오. 확실하지 않은 경우 통신"
 "사에 문의하십시오."
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "통신사가 _GSM 기반의 기술을 사용합니다(예: GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "통신사가 C_DMA 기반의 기술을 사용합니다(예: 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "없음"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP 설정"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "가져올 파일"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "오류: 파일에 올바른 JSON 설정이 들어 있지 않습니다"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "팀 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "팀 연결 %d"
@@ -2786,47 +2809,56 @@ msgstr "팀 연결 %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "팀 포트"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (\"%s\" 통해)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "네트워크 연결 없음"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "가상 LAN 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "가상 LAN 연결 %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "가상 사설망 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s'에 대한 가상 사설망 플러그인 서비스를 찾을 수 없습니다."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "가상 사설망 연결 %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2837,11 +2869,11 @@ msgstr ""
 "\n"
 "오류: 가상 사설망 서비스 유형이 없음"
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "가상 사설망 연결 종류 선택"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2851,7 +2883,7 @@ msgstr ""
 "연결 종류가 목록에 없으면, 가상 사설망 플러그인이 제대로 설치되지 않았을 수"
 "도 있습니다."
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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"
@@ -2859,73 +2891,93 @@ msgstr ""
 "이 선택 사항은 이 연결이 여기 입력한 BSSID로 지정되는 와이파이 억세스 포인트"
 "(AP)에만 국한되도록 고정합니다. 예: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"이 옵션을 사용하면 이 연결은 여기 입력한 MAC 주소로 지정한 네트워크 장치에만 "
+"해당됩니다. 예: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "와이파이 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "모든 장치"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "와이파이 연결 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128비트 열쇠글"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "동적 WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "개인용 WPA 또는 WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "기업용 WPA 또는 WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "와이파이 보안 사용자 인터페이스를 읽어들일 수 없습니다. 와이파이 설정이 없습"
 "니다."
 
-#: ../src/connection-editor/page-wifi-security.c:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "와이파이 보안"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "와이파이 보안 사용자 인터페이스를 읽어들일 수 없습니다."
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "와이맥스 사용자 인터페이스를 읽어들일 수 없습니다."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "와이맥스 연결 %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "가상 사설망 연결을 가져올 수 없음"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2938,25 +2990,30 @@ msgstr ""
 "\n"
 "오류: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "알 수 없는 오류"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "이름이 \"%s\"인 파일이 이미 있습니다."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "바꾸기(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "%s 파일을 저장하려는 가상 사설망 연결로 바꾸시겠습니까?"
 
-#: ../src/connection-editor/vpn-helpers.c:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN 연결을 내보낼 수 없음"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2967,11 +3024,11 @@ msgstr ""
 "\n"
 "오류: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "가상 사설망 연결 내보내기..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -2979,98 +3036,11 @@ msgstr ""
 "네트워크 관리 애플릿이 필요한 리소스를 찾을 수 없습니다. (.ui 파일이 없습니"
 "다.)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "블루투스 설정이 불가능합니다. (D-Bus에 연결 실패: (%s) %s)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"블루투스 설정이 불가능합니다. (네트워크 관리를 찾을 수 없습니다: (%s) %s)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "휴대 전화를 네트워크 장치로 사용(PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "휴대 전화를 사용해 인터넷에 연결(DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "오류: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "DUN 연결을 만들 수 없습니다: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "휴대전화를 사용할 수 있습니다!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "모바일 마법사가 취소되었습니다"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "알려지지 않은 휴대전화 유형(GSM이나 CDMA가 아님)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "알 수 없는 모뎀 종류."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "휴대전화에 연결하는 데 실패했습니다."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "버스 연결을 가져오는데 오류"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "휴대전화 연결이 예기치 못하게 끊어졌습니다."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "휴대전화 상세 정보를 감지하는 시간이 초과되었습니다."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "휴대전화 설정을 감지하는 중..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"기본 블루투스 어댑터에 전화접속 네트워크 연결을 설정하려면 사용 가능하도록 설"
-"정해야 합니다."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "PAN 연결을 만들 수 없습니다: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "%s 네트워크"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "잠금 해제(_U)"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "이 장치 자동으로 잠금 해제"
 
@@ -3078,31 +3048,36 @@ msgstr "이 장치 자동으로 잠금 해제"
 msgid "Connection Information"
 msgstr "연결 정보"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "사용 중인 네트워크 연결"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "장치:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "통신사:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "요금제:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3115,23 +3090,28 @@ msgstr ""
 "역 연결 설정을 변경하려면, 시스템 >> 기본 설정 메뉴에서 \"네트워크 연결\"을 "
 "선택하십시오."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "모바일 광대역 설정 확인"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "목록에없음"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "요금제 선택(_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3143,67 +3123,83 @@ msgstr ""
 "\n"
 "만약 요금제가 확실하지 않다면, 통신사에 요금제의 APN에 대해 문의하십시오."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "요금제를 선택하십시오"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "내 요금제가 목록에 없습니다..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "통신사"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "통신사:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "통신사를 선택하십시오"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "국가 혹은 지역 목록:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "국가 혹은 지역"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "내 나라가 목록에 없습니다"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "설치된 GSM 장치"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "설치된 CDMA 장치"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3211,153 +3207,196 @@ msgstr ""
 "이 도우미를 이용해 휴대전화(3G) 네트워크를 사용하는 모바일 광대역 연결을 손쉽"
 "게 설정할 수 있습니다."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "다음 정보가 필요합니다:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "통신사의 이름"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "통신사의 요금제 이름"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 (AP 이름)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "이 모바일 광대역 장치에 대한 연결 만들기(_T):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "모든 장치"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "모바일 광대역 연결을 설정"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "새 모바일 광대역 연결"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "유선"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "블루투스"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC 메쉬"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "보조 암호(_S):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "보조 암호(_S):"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %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/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "새로 만들기..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "없음"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "만들기(_R)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "와이파이 네트워크 '%s'에 연결하려면 암호 또는 암호화 키가 있어야 합니다."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "와이파이 네트워크 인증이 필요합니다"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "와이파이 네트워크에 인증이 필요합니다"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "새 와이파이 네트워크 만들기"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "새 와이파이 네트워크"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "연결하려는 와이파이 네트워크의 이름을 입력하십시오."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "감춰진 와이파이 네트워크에 연결"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "숨겨진 와이파이 네트워크"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "연결하려는 숨겨진 와이파이 네트워크의 이름과 보안 설정을 입력하십시오."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "보조 암호(_S):"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "암호 보이기(_O)"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "와이파이 보안(_S):"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "연결 이름(_O):"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "와이파이 어댑터(_A):"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC 메쉬"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "사용법:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3365,7 +3404,7 @@ msgstr ""
 "이 프로그램은 네트워크 관리(https://wiki.gnome.org/Projects/NetworkManager/)"
 "의 일부분입니다."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3373,138 +3412,151 @@ msgstr ""
 "이 프로그램은 명령행에서 실행되는 프로그램이 아니라, 그놈 데스크톱 환경에서 "
 "실행하는 프로그램입니다."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "사용하지 않음"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "등록되지 않음"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "가정 네트워크(%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "가정 네트워크"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "검색중"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "등록이 거부되었습니다"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (로밍)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "로밍 네트워크(%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "로밍 네트워크"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "'%2$s'의 SIM 카드 '%1$s'에 대한 PIM 코드"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN 코드가 필요합니다"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN 코드가 모바일 광대역 장치를 위해 필요합니다"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "모바일 광대역 연결 '%s' 사용 중: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "로밍"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s 연결"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "이 사용자에 대해서만 암호 저장(_U)"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "모든 사용자에 대해 암호 저장(_A)"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DEP 혹은 PEM 인증서(*.det, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "PAC 파일 선택..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC 파일(*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "모든 파일"
 
@@ -3540,15 +3592,32 @@ msgstr "내부 인증(_I):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "자동 PAC 인증 허용(_V)"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "인증 기관 인증서 선택..."
 
@@ -3576,15 +3645,46 @@ msgstr "CA 인증서 불필요(_R)"
 msgid "PEAP _version:"
 msgstr "PEAP 버전(_V):"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "접속할 때마다 암호 물어보기(_K)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "CA 인증서(_A):"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "암호화되지 않은 비밀 키는 안전하지 않습니다"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3597,11 +3697,11 @@ msgstr ""
 "\n"
 "(openssl로 비밀 키를 보호할 수 있습니다)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "개인 인증서 선택..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "비밀키 선택..."
 
@@ -3621,24 +3721,37 @@ msgstr "비밀키(_K):"
 msgid "_Private key password:"
 msgstr "비밀키 암호(_P):"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
 # NOTE: 무선랜 인증방식. '빠르게' 라고 번역하지 말것.
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "터널링을 사용하는 TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "보호되는 EAP (PEAP)"
 
@@ -3648,6 +3761,44 @@ msgstr "보호되는 EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "인증(_T):"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (기본값)"
@@ -3672,6 +3823,290 @@ msgstr "키 표시(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP 인덱스(_X):"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "형식(_T):"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "와이맥스 모바일 광대역 사용(_X)"
+
+#~ msgid "_Help"
+#~ msgstr "도움말(_H)"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "본딩 네트워크에 연결되었습니다."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "본딩 네트워크 연결 '%s' 준비 중..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "본딩 연결 '%s' 설정 중..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "본딩 연결 '%s'에는 사용자 인증이 필요합니다..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "'%s'에 주소 요청 중..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "본딩 연결 '%s' 사용 중"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "브릿지 네트워크에 연결되었습니다."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "브릿지 연결 '%s' 준비 중..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "브릿지 연결 '%s' 설정 중..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "브릿지 연결 '%s'에는 사용자 인증이 필요합니다..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "브릿지 연결 '%s' 사용 중"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "새 모바일 광대역(CDMA) 연결..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "CDMA 네트워크에 연결되었습니다."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA 네트워크."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "새 모바일 광대역(GSM) 연결..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "GSM 네트워크에 연결되었습니다."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM 네트워크."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "자동 인피니밴드"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "인피니밴드 네트워크(%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "인피니밴드 네트워크(%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "인피니밴드 네트워크"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "인피니밴드 네트워크"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "인피니밴드 네트워크에 연결되었습니다."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "인피니밴드 연결 '%s' 준비 중..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "인피니밴드 연결 '%s' 설정 중..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "인피니밴드 연결 '%s'에는 사용자 인증이 필요합니다..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "인피니밴드 연결 '%s' 사용 중"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "팀 네트워크에 연결되었습니다."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "팀 연결 '%s' 준비 중..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "팀 연결 '%s' 설정 중..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "팀 연결 '%s'에는 사용자 인증이 필요합니다..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "팀 연결 '%s' 사용 중"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "VLAN에 연결되었습니다."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "VLAN 연결 '%s' 준비 중..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "VLAN '%s' 설정 중..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "VLAN 연결 '%s'에는 사용자 인증이 필요합니다..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN 연결 '%s' 사용 중"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "와이맥스 모바일 광대역(%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "와이맥스 모바일 광대역"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "와이맥스를 사용하지 않습니다"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "와이맥스가 하드웨어 스위치를 통해 사용하지 않습니다"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "와이맥스 네트워크에 연결되었습니다."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "알 수 없음"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "알 수 없음"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "모드(_M):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "장치 MAC 주소(_D):"
+
+#~ msgid "Any"
+#~ msgstr "모두"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G(UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G(GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "3G 선호(UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "2G 선호(GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "4G 선호(LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "4G만 사용(LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "파일에서 팀 설정 가져오기(_M)..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "인프라스트럭처"
+
+#~ msgid "WiMAX"
+#~ msgstr "와이맥스"
+
+#~ msgid "Error saving connection"
+#~ msgstr "연결을 저장하는데 오류"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "속성 '%s' / '%s' 잘못됨: %d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "자동(PPP)"
+
+#~ 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)."
+#~ msgstr "블루투스 설정이 불가능합니다. (D-Bus에 연결 실패: (%s) %s)"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "블루투스 설정이 불가능합니다. (네트워크 관리를 찾을 수 없습니다: (%s) %s)"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "휴대 전화를 네트워크 장치로 사용(PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "휴대 전화를 사용해 인터넷에 연결(DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "오류: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "DUN 연결을 만들 수 없습니다: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "휴대전화를 사용할 수 있습니다!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "모바일 마법사가 취소되었습니다"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "알려지지 않은 휴대전화 유형(GSM이나 CDMA가 아님)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "알 수 없는 모뎀 종류."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "휴대전화에 연결하는 데 실패했습니다."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "버스 연결을 가져오는데 오류"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "휴대전화 연결이 예기치 못하게 끊어졌습니다."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "휴대전화 상세 정보를 감지하는 시간이 초과되었습니다."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "휴대전화 설정을 감지하는 중..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "기본 블루투스 어댑터에 전화접속 네트워크 연결을 설정하려면 사용 가능하도"
+#~ "록 설정해야 합니다."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "PAN 연결을 만들 수 없습니다: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s 네트워크"
+
 #~ msgid "Primary DNS:"
 #~ msgstr "기본 DNS:"
 
diff --git a/po/ku.po b/po/ku.po
index 752bd31e..94b77b10 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-18 14:17+0200\n"
+"POT-Creation-Date: 2016-04-05 14:02+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,2032 +19,2919 @@ 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
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+msgid "Network"
+msgstr "Tor"
+
+#: ../nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr "Girêdanên torê yên xwe birêve bike"
 
-#: ../nm-applet.desktop.in.h:2
-msgid "Network"
-msgstr "Tor"
+#: ../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.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr ""
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "Girêdanên torê yên xwe birêve û sererast bike"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr ""
 
-#: ../nm-applet.schemas.in.h:3
-msgid "Disable disconnected notifications"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 
-#: ../nm-applet.schemas.in.h:4
-msgid "Set this to TRUE to disable notifications when connecting to a network."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+msgid "Disable disconnected notifications"
 msgstr ""
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+msgid "Disable VPN notifications"
 msgstr ""
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
+"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
+msgid "Suppress networks available notifications"
 msgstr ""
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 
-#: ../nm-applet.schemas.in.h:8
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "Damxe"
 
-#: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 
-#: ../nm-applet.schemas.in.h:10
-msgid "Used to determine whether settings should be migrated to a new version."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
+msgid "Disable WiFi Create"
 msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:1
-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:12
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "Network Connections"
-msgstr "Girêdanên torê"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:875 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "Amade"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "Niha bi '%s' re girêdayî yî."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Sertîfikaya _bikarhêner:"
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1280 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "Girêdan pêkhat"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
 
-#: ../src/applet-device-bt.c:205
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
 #, fuzzy
-msgid "You are now connected to the mobile broadband network."
-msgstr "Niha bi tora biqablo re girêdayî yî."
+msgid "NetworkManager"
+msgstr "Sepanoka NetworkManager"
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
-#, c-format
-msgid "Preparing mobile broadband connection '%s'..."
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Sepanoka NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
 msgstr ""
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
-#, c-format
-msgid "Configuring mobile broadband connection '%s'..."
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+msgid "802.1X authentication"
 msgstr ""
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_Girêdan"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "_Navê torê:"
+
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr ""
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "Bila girêdana VPN \"%s\" were rakirin?"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr ""
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "Lêzêdekirina girêdanê biserneket"
+
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "negirêdayî"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "Negirêdayî"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "Lêzêdekirina girêdanê biserneket"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr ""
+
+#: ../src/applet.c:844
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
+"holê"
+
+#: ../src/applet.c:847
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
 msgstr ""
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2479
+#: ../src/applet.c:850
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "Ji bo '%s' navnîşana torê tê xwestin..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+
+#: ../src/applet.c:853
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
+"holê"
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet.c:856
 #, c-format
-msgid "Mobile broadband connection '%s' active"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
 msgstr ""
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:859
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
-#: ../src/applet-dialogs.c:430
+#: ../src/applet.c:862
 #, c-format
-msgid "Mobile Broadband (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
 msgstr ""
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1474
-msgid "Mobile Broadband"
+#: ../src/applet.c:865
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
 msgstr ""
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
+#: ../src/applet.c:872
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr "Girêdana VPN bi '%s' re"
+
+#: ../src/applet.c:888
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
 msgstr ""
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "Niha bi tora CDMA re girêdayî yî."
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:897
 #, fuzzy, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr "Girêdana torê qut bu."
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
 msgstr ""
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-msgid "CDMA network."
-msgstr "Tora CDMA."
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
-msgid "You are now registered on the home network."
-msgstr "Niha di tora malê de qeyd bûyî."
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "Peyaman têketina VPN"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 #, fuzzy
-msgid "You are now registered on a roaming network."
-msgstr "Niha bi tora biqablo re girêdayî yî."
+msgid "VPN Connection Failed"
+msgstr "Girêdana VPN biserneket"
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:459
-msgid "New Mobile Broadband (GSM) connection..."
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../src/applet-device-gsm.c:493
-msgid "You are now connected to the GSM network."
-msgstr "Niha bi tora GSM re girêdayî yî."
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr ""
 
-#: ../src/applet-device-gsm.c:654
-msgid "PIN code required"
-msgstr "Koda PIN pêwîst e"
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr ""
 
-#: ../src/applet-device-gsm.c:662
-msgid "PIN code is needed for the mobile broadband device"
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "negirêdayî"
+
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "Veqetîne"
+
+#: ../src/applet.c:1322
+msgid "device not managed"
 msgstr ""
 
-#: ../src/applet-device-gsm.c:783
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "Amûrên torê ne amade ne"
+
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "Girêdanên _VPN"
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "VPN _veava bike..."
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "Girêdana VPN _qut bike"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager naxebite..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "Tor hate neçalakkirin"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "_Torê çalak bike"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "_Bêqablo çalak bike"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr ""
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "_Agahiya girêdanê"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "Girêdanan sererast bike"
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_Der barê de"
+
+#: ../src/applet.c:2179
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
+msgid "You are now connected to '%s'."
+msgstr "Niha bi '%s' re girêdayî yî."
+
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "Negirêdayî"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "Girêdana torê qut bu."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Girêdana torê '%s' tê amadekirin..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
 msgstr ""
 
-#: ../src/applet-device-gsm.c:875
-msgid "Wrong PIN code; please contact your provider."
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Ji bo '%s' navnîşana torê tê xwestin..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "Girêdana torê '%s' çalak e"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Dest bi girêdana VPN ya '%s' dike"
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
 msgstr ""
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Ji bo '%s' navnîşana VPN tê xwestin..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "Girêdana VPN '%s' çalak e"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "Girêdana torê tune"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "Sepanoka NetworkManager"
+
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr ""
 
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr ""
+
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:925
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr ""
 
-#: ../src/applet-device-gsm.c:988
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr ""
+
+#: ../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
+msgid "Mobile Broadband"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Amade"
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
 #, fuzzy
-msgid "SIM PIN unlock required"
-msgstr "Koda PIN pêwîst e"
+msgid "New Mobile Broadband connection..."
+msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
 
-#: ../src/applet-device-gsm.c:989
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Girêdan pêkhat"
+
+#: ../src/applet-device-broadband.c:816
 #, fuzzy
-msgid "SIM PIN Unlock Required"
-msgstr "Koda PIN pêwîst e"
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "Niha bi tora biqablo re girêdayî yî."
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
 msgstr ""
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
-msgid "PIN code:"
-msgstr "Koda PIN:"
-
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
-msgid "Show PIN code"
-msgstr "Koda PIN nîşan bide"
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "Niha di tora malê de qeyd bûyî."
 
-#: ../src/applet-device-gsm.c:1000
-msgid "SIM PUK unlock required"
-msgstr "Vekirina SIM bi koda PUK pêwîst e"
+#: ../src/applet-device-broadband.c:963
+#, fuzzy
+msgid "You are now registered on a roaming network."
+msgstr "Niha bi tora biqablo re girêdayî yî."
 
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK Unlock Required"
-msgstr ""
+#: ../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î."
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
-msgid "PUK code:"
+msgid "Preparing mobile broadband connection '%s'..."
 msgstr ""
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "New PIN code:"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
 msgstr ""
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
-msgid "Re-enter new PIN code:"
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
-msgid "Show PIN/PUK codes"
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
 msgstr ""
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
-msgid "GSM network."
-msgstr "Tora GSM"
-
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr ""
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "Torên biqablo (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "Tora biqablo (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "Torên biqablo"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "Tora biqablo"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1485
-msgid "disconnected"
-msgstr "negirêdayî"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../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-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../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-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../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-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
-msgstr ""
+#: ../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-wired.c:309
+#: ../src/applet-device-ethernet.c:170
 #, fuzzy, c-format
-msgid "Requesting a wired network address for '%s'..."
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Ji tora bêqablo '%s' navnîşana torê tê xwestin..."
 
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../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-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:97
+#: ../src/applet-device-wifi.c:230
 #, fuzzy
-msgid "_Connect to Hidden Wireless Network..."
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Li tora bêqablo ya din girê bide..."
 
-#: ../src/applet-device-wifi.c:150
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "Tora bêqablo ya nû biafirîne..."
 
-#: ../src/applet-device-wifi.c:294
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(tune)"
 
-#: ../src/applet-device-wifi.c:803
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "Torên Bêqablo (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Torên biqablo (%s)"
 
-#: ../src/applet-device-wifi.c:805
+#: ../src/applet-device-wifi.c:903
 #, fuzzy, c-format
-msgid "Wireless Network (%s)"
-msgstr "Tora bêqablo (%s)"
+msgid "Wi-Fi Network (%s)"
+msgstr "Tora biqablo (%s)"
 
-#: ../src/applet-device-wifi.c:807
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Tora bêqablo (%s)"
-msgstr[1] "Torên bêqablo (%s)"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Tora biqablo"
+msgstr[1] "Tora biqablo"
 
-#: ../src/applet-device-wifi.c:840
+#: ../src/applet-device-wifi.c:934
 #, fuzzy
-msgid "wireless is disabled"
+msgid "Wi-Fi is disabled"
 msgstr "Tor hate neçalakkirin"
 
-#: ../src/applet-device-wifi.c:841
-msgid "wireless is disabled by hardware switch"
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: ../src/applet-device-wifi.c:902
+#: ../src/applet-device-wifi.c:996
 #, fuzzy
 msgid "More networks"
 msgstr "Tora biqablo"
 
-#: ../src/applet-device-wifi.c:1081
+#: ../src/applet-device-wifi.c:1180
 #, fuzzy
-msgid "Wireless Networks Available"
+msgid "Wi-Fi Networks Available"
 msgstr "Tora bêqablo (%s)"
 
-#: ../src/applet-device-wifi.c:1083
+#: ../src/applet-device-wifi.c:1181
 #, fuzzy
-msgid "Click on this icon to connect to a wireless network"
+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:1084
-#, fuzzy
-msgid "Use the network menu to connect to a wireless network"
-msgstr "Dema girêdana bi tora bêqablo re çewtî derket"
-
-#: ../src/applet-device-wifi.c:1087 ../src/applet.c:901
-msgid "Don't show this message again"
-msgstr ""
-
-#: ../src/applet-device-wifi.c:1279
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, 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:1310
+#: ../src/applet-device-wifi.c:1399
 #, fuzzy, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Girêdana torê '%s' tê amadekirin..."
 
-#: ../src/applet-device-wifi.c:1313
+#: ../src/applet-device-wifi.c:1402
 #, fuzzy, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Girêdana tora biqablo '%s' tê veavakirin..."
 
-#: ../src/applet-device-wifi.c:1316
+#: ../src/applet-device-wifi.c:1405
 #, fuzzy, c-format
-msgid "User authentication required for wireless network '%s'..."
+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:1319
+#: ../src/applet-device-wifi.c:1408
 #, fuzzy, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Ji tora bêqablo '%s' navnîşana torê tê xwestin..."
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "Ji bo '%s' navnîşana torê tê xwestin..."
 
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet-device-wifi.c:1419
 #, fuzzy, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1423
 #, fuzzy, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
-
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr ""
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr ""
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr ""
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Girêdana tora biqablo '%s' çalak e"
 
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr ""
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "Bila girêdana VPN \"%s\" were rakirin?"
 
-#: ../src/applet-device-wimax.c:428
+#: ../src/applet-device-wifi.c:1465
 #, fuzzy
-msgid "You are now connected to the WiMAX network."
-msgstr "Niha bi tora biqablo re girêdayî yî."
+msgid "Failed to add new connection"
+msgstr "Girêdana torê tune"
 
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr ""
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/libnm-gtk/nm-wireless-dialog.c:949
-#: ../src/wireless-security/wireless-security.c:396
+#: ../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
 msgid "LEAP"
 msgstr ""
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP a dînamîk"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
-#: ../src/applet-dialogs.c:248
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:244
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Navnîşan"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/libnm-gtk/nm-wireless-dialog.c:906
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Tune"
 
-#: ../src/applet-dialogs.c:352 ../src/applet-dialogs.c:490
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "1 (Standard)"
+
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr ""
 
-#: ../src/applet-dialogs.c:354 ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:367
-#, c-format
-msgid "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
 msgstr ""
 
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Navnîşana IP:"
+
 #: ../src/applet-dialogs.c:369
-msgctxt "WiMAX CINR"
-msgid "unknown"
+msgid "Broadcast Address:"
 msgstr ""
 
+#. Prefix
 #: ../src/applet-dialogs.c:381
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
+msgctxt "Subnet Mask"
+msgid "Unknown"
 msgstr ""
 
-#: ../src/applet-dialogs.c:416
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Rûpoşa Bintorê:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Tora biqablo (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:426
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:428
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:432
-#, fuzzy, c-format
-msgid "WiMAX (%s)"
-msgstr "CDMA (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:438 ../src/applet-dialogs.c:797
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr ""
 
-#: ../src/applet-dialogs.c:442
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Navrû:"
 
-#: ../src/applet-dialogs.c:458
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr ""
 
 #. Driver
-#: ../src/applet-dialogs.c:466
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Ajoger:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Lez:"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Ewlehî:"
 
-#: ../src/applet-dialogs.c:518
-msgid "CINR:"
-msgstr ""
-
-#: ../src/applet-dialogs.c:531
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr ""
 
-#. Address
-#: ../src/applet-dialogs.c:559 ../src/applet-dialogs.c:666
-msgid "IP Address:"
-msgstr "Navnîşana IP:"
-
-#: ../src/applet-dialogs.c:561 ../src/applet-dialogs.c:577
-msgctxt "Address"
-msgid "Unknown"
-msgstr ""
-
-#: ../src/applet-dialogs.c:575
-msgid "Broadcast Address:"
-msgstr ""
-
-#. Prefix
-#: ../src/applet-dialogs.c:584
-msgid "Subnet Mask:"
-msgstr "Rûpoşa Bintorê:"
-
-#: ../src/applet-dialogs.c:586
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr ""
-
-#: ../src/applet-dialogs.c:594 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr ""
 
-#: ../src/applet-dialogs.c:606
-msgid "Primary DNS:"
-msgstr "DNS ya Yekemîn:"
-
-#: ../src/applet-dialogs.c:615
-msgid "Secondary DNS:"
-msgstr "DNS ya Duyemîn:"
-
-#: ../src/applet-dialogs.c:625
-#, fuzzy
-msgid "Ternary DNS:"
-msgstr "DNS ya Duyemîn:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr ""
 
-#: ../src/applet-dialogs.c:649
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr ""
 
-#: ../src/applet-dialogs.c:802
+#: ../src/applet-dialogs.c:815
 #, fuzzy
 msgid "VPN Type:"
 msgstr "Cure:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr ""
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:828
 #, fuzzy
 msgid "VPN Username:"
 msgstr "Navê bikarhêner:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr ""
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:840
 #, fuzzy
 msgid "Base Connection:"
 msgstr "Girêdanên VPN"
 
-#: ../src/applet-dialogs.c:829
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr ""
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:892
+#: ../src/applet-dialogs.c:957
 #, fuzzy
 msgid "No valid active connections found!"
 msgstr "Girêdanên çalak tune!"
 
-#: ../src/applet-dialogs.c:945
+#: ../src/applet-dialogs.c:985
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
 
-#: ../src/applet-dialogs.c:948
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 
-#: ../src/applet-dialogs.c:950
+#: ../src/applet-dialogs.c:990
 #, fuzzy
 msgid "NetworkManager Website"
 msgstr "Sepanoka NetworkManager"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr ""
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr ""
 
-#: ../src/applet-dialogs.c:999
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr ""
 
-#: ../src/applet-dialogs.c:1018
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Şîfre:"
 
-#: ../src/applet.c:990
-#, fuzzy, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
-msgstr ""
-"Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
-"holê"
+#: ../src/applet-dialogs.c:1336
+#, fuzzy
+msgid "SIM PIN unlock required"
+msgstr "Koda PIN pêwîst e"
 
-#: ../src/applet.c:993
+#: ../src/applet-dialogs.c:1337
+#, 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:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "Koda PIN:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "Koda PIN nîşan bide"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "Vekirina SIM bi koda PUK pêwîst e"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
 msgstr ""
 
-#: ../src/applet.c:996
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
 
-#: ../src/applet.c:999
-#, fuzzy, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
 msgstr ""
-"Nikarî dest bi girêdana VPN ya '%s' bike ji ber ku çewtiya girêdanê derket "
-"holê"
 
-#: ../src/applet.c:1002
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
 msgstr ""
 
-#: ../src/applet.c:1005
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
 msgstr ""
 
-#: ../src/applet.c:1008
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+msgid "Show PIN/PUK codes"
 msgstr ""
 
-#: ../src/applet.c:1011
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+#: ../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 ""
 
-#: ../src/applet.c:1018
-#, fuzzy, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed."
-msgstr "Girêdana VPN bi '%s' re"
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
+msgstr ""
 
-#: ../src/applet.c:1036
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+#: ../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
+msgid "_Add"
 msgstr ""
 
-#: ../src/applet.c:1039
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+#. 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
+msgid "_Delete"
 msgstr ""
 
-#: ../src/applet.c:1045
-#, fuzzy, c-format
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
 msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
-msgstr "Girêdana torê qut bu."
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr ""
 
-#: ../src/applet.c:1079
-msgid "VPN Login Message"
-msgstr "Peyaman têketina VPN"
+#: ../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/applet.c:1085 ../src/applet.c:1093 ../src/applet.c:1143
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+msgid "Create…"
+msgstr "Biafirîne..."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 #, fuzzy
-msgid "VPN Connection Failed"
-msgstr "Girêdana VPN biserneket"
+msgid "Choose a Connection Type"
+msgstr "Cureyê girêdana VPN hilbijêre"
 
-#: ../src/applet.c:1150
-#, c-format
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+"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."
 msgstr ""
 
-#: ../src/applet.c:1153
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
 msgstr ""
 
-#: ../src/applet.c:1473
-msgid "device not ready (firmware missing)"
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
 msgstr ""
 
-#: ../src/applet.c:1475
-msgid "device not ready"
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
 msgstr ""
 
-#: ../src/applet.c:1501
-msgid "Disconnect"
-msgstr "Veqetîne"
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr ""
 
-#: ../src/applet.c:1515
-msgid "device not managed"
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
 msgstr ""
 
-#: ../src/applet.c:1559
-msgid "No network devices available"
-msgstr "Amûrên torê ne amade ne"
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
 
-#: ../src/applet.c:1647
-msgid "_VPN Connections"
-msgstr "Girêdanên _VPN"
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
 
-#: ../src/applet.c:1704
-msgid "_Configure VPN..."
-msgstr "VPN _veava bike..."
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
 
-#: ../src/applet.c:1708
-msgid "_Disconnect VPN"
-msgstr "Girêdana VPN _qut bike"
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
 
-#: ../src/applet.c:1806
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager naxebite..."
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Girêdanên VPN"
 
-#: ../src/applet.c:1811 ../src/applet.c:2604
-msgid "Networking disabled"
-msgstr "Tor hate neçalakkirin"
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2032
-msgid "Enable _Networking"
-msgstr "_Torê çalak bike"
+#. 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
+msgid "_Edit"
+msgstr "_Sererastkirin"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2041
-msgid "Enable _Wireless"
-msgstr "_Bêqablo çalak bike"
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2050
-msgid "Enable _Mobile Broadband"
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+msgid "ms"
 msgstr ""
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2059
-msgid "Enable WiMA_X Mobile Broadband"
+#: ../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
+#, fuzzy
+msgid "_Interface name:"
+msgstr "Navrû:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
 msgstr ""
 
-#. Toggle notifications item
-#: ../src/applet.c:2070
-msgid "Enable N_otifications"
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
 msgstr ""
 
-#. 'Connection Information' item
-#: ../src/applet.c:2081
-msgid "Connection _Information"
-msgstr "_Agahiya girêdanê"
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid ""
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2091
-msgid "Edit Connections..."
-msgstr "Girêdanan sererast bike"
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2105
-msgid "_Help"
-msgstr "_Alîkarî"
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2114
-msgid "_About"
-msgstr "_Der barê de"
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "DNS ya Yekemîn:"
 
-#: ../src/applet.c:2291
-msgid "Disconnected"
-msgstr "Negirêdayî"
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr ""
 
-#: ../src/applet.c:2292
-msgid "The network connection has been disconnected."
-msgstr "Girêdana torê qut bu."
+#: ../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:"
+msgstr ""
 
-#: ../src/applet.c:2473
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "Girêdana torê '%s' tê amadekirin..."
+#: ../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
+msgid "bytes"
+msgstr "bayt"
 
-#: ../src/applet.c:2476
-#, c-format
-msgid "User authentication required for network connection '%s'..."
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "_Ewlehî:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Girêdanên VPN"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "_Torê çalak bike"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
 msgstr ""
 
-#: ../src/applet.c:2482
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "bixweber"
+
+#: ../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
-msgid "Network connection '%s' active"
-msgstr "Girêdana torê '%s' çalak e"
+msgid "default"
+msgstr "standard"
 
-#: ../src/applet.c:2560
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Navnîşan"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Navnîşan"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "Dest bi girêdana VPN ya '%s' dike"
+msgid "invalid %s for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2563
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid "User authentication required for VPN connection '%s'..."
+msgid "invalid %s (%s)"
 msgstr ""
 
-#: ../src/applet.c:2566
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Ji bo '%s' navnîşana VPN tê xwestin..."
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2569
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "Girêdana VPN '%s' çalak e"
+msgid "invalid interface-name (%s)"
+msgstr ""
 
-#: ../src/applet.c:2608
-msgid "No network connection"
-msgstr "Girêdana torê tune"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "_Servîs:"
 
-#: ../src/applet.c:3258
-msgid "NetworkManager Applet"
-msgstr "Sepanoka NetworkManager"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+msgid "Use Data Center Bridging (DCB) for this connection"
 msgstr ""
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "_Kîlît rake"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Active Network Connections"
-msgstr "Girêdanên torê yên çalak"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Connection Information"
-msgstr "Agahiya girêdanê"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
 msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:4
-msgid "_Network name:"
-msgstr "_Navê torê:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:67
-msgid "automatic"
-msgstr "bixweber"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:305
-msgid "Failed to update connection secrets due to an unknown error."
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 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:46
 msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+"Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "Ig_nore automatically obtained routes"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "Use this c_onnection only for resources on its network"
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:2
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "Sho_w password"
-msgstr "Şîfreyê _nîşan bide"
+msgid "_Username:"
+msgstr "_Navê Bikarhêner:"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Password:"
-msgstr "Şî_fre:"
-
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "_Servîs:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../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:4
+#: ../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
-msgid "_Username:"
-msgstr "_Navê Bikarhêner:"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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
-msgid "Addresses"
-msgstr "Navnîşan"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
+#: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Bixweber"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-msgid "Automatic with manual DNS settings"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-msgid "D_HCP client ID:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_Lez:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "_Servîs:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+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 ""
-"Domains used when resolving host names. Use commas to separate multiple "
-"domains."
+"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-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Standard"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+msgid "_Broadcast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Şî_freya mifteya taybet:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
-"IP addresses of domain name servers used to resolve host names. Use commas "
-"to separate multiple domain name server addresses."
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "Link-Local"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:191
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "_Girêdan"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr ""
+
+#: ../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 ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-msgid "Require IPv4 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/page-ip4.c:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../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
 msgid "Shared to other computers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "_Method:"
+msgstr "_Rêbaz:"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Addresses"
+msgstr "Navnîşan"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 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:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
-"When connecting to IPv6-capable networks, allows the connection to complete "
-"if IPv4 configuration fails but IPv6 configuration succeeds."
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-msgid "DNS ser_vers:"
-msgstr "Pêşkêşkarên _DNS:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
+msgid "S_earch domains:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "_Method:"
-msgstr "_Rêbaz:"
+#: ../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:"
+msgstr "Pêşkêşkarên _DNS:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
-msgid "_Routes…"
+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:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "_Search domains:"
+msgid "Require IPv_4 addressing for this connection to complete"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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-ip6.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Bêbandorkirî"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 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
-msgid "2G (GPRS/EDGE)"
+msgid "Basic"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
+msgid "Nu_mber:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Pêşketî"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Allow roaming if home network is not available"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Any"
-msgstr ""
-
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Basic"
-msgstr ""
+msgid "_APN:"
+msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "Guhartin..."
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "N_etwork ID:"
 msgstr "_ID ya torê:"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr "Guhartin..."
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "Nu_mber:"
+msgid "P_IN:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "PI_N:"
-msgstr "PI_N:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-msgid "Prefer 2G (GPRS/EDGE)"
+msgid "Allow _roaming if home network is not available"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA) tercîh bike"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "Şîfreyan _nîşan bide"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
-msgstr "_APN:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "_Type:"
-msgstr "_Cure:"
-
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
+msgid "Authentication"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
+msgid "Allowed methods:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:3
-msgid "Allowed methods:"
+msgid "Configure _Methods…"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "Authentication"
+msgid "Compression"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:5
-msgid "Compression"
+msgid "_Use point-to-point encryption (MPPE)"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:6
-msgid "Configure _Methods…"
+msgid "_Require 128-bit encryption"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:7
-msgid "Echo"
+msgid "Use _stateful MPPE"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:8
-msgid "Send PPP _echo packets"
+msgid "Allow _BSD data compression"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Use TCP _header compression"
+msgid "Allow _Deflate data compression"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Use _stateful MPPE"
+msgid "Use TCP _header compression"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "_Require 128-bit encryption"
+msgid "Echo"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
-msgid "_Use point-to-point encryption (MPPE)"
+msgid "Send PPP _echo packets"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-msgid "1 Gb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "10 Mb/s"
-msgstr ""
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Girêdanên VPN"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "100 Mb/s"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
-msgstr ""
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "Navrû:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+msgid "Cloned MAC _address:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "Full duple_x"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "MT_U:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-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"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Twisted Pair (TP)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid "_Cloned MAC address:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-msgid "_Device MAC address:"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-msgid "_Port:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Speed:"
-msgstr "_Lez:"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "bytes"
-msgstr "bayt"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "Ewlehî:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
-msgid "Ad-hoc"
-msgstr ""
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
-msgid "Ban_d:"
-msgstr "Ban_t:"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "C_hannel:"
-msgstr "_Kanal:"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "Infrastructure"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "M_ode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "Mb/s"
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
-msgid "_BSSID:"
-msgstr "_BSSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_SSID:"
-msgstr "_SSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "mW"
-msgstr "mW"
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr "_Kanal:"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
-msgstr "_Ewlehî:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr "Ban_t:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-msgid "Allowed Authentication Methods"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
 msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-msgid "C_HAP"
+#: ../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
-msgid "Challenge Handshake Authentication Protocol"
+msgid "Allowed Authentication Methods"
 msgstr ""
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
-msgid "Extensible Authentication Protocol"
-msgstr ""
+msgid "_EAP"
+msgstr "_EAP"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
-msgid ""
-"In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods."
+msgid "Extensible Authentication Protocol"
 msgstr ""
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+msgid "_PAP"
+msgstr "_PAP"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
-msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgid "Password Authentication Protocol"
 msgstr ""
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgid "C_HAP"
 msgstr ""
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-msgid "Password Authentication Protocol"
+msgid "Challenge Handshake Authentication Protocol"
 msgstr ""
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "_EAP"
-msgstr "_EAP"
-
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr ""
+
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid "_PAP"
-msgstr "_PAP"
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:1 ../src/libnm-gtk/wifi.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-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "Cureyê girêdana VPN hilbijêre"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Create…"
-msgstr "Biafirîne..."
+#: ../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 "Tora biqablo (%s)"
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "DSL"
+
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/connection-helpers.c:196
+msgid "Hardware"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "Girêdana VPN sererast bike"
+
+#: ../src/connection-editor/connection-helpers.c:323
 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."
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:332
+#, fuzzy
+msgid "Could not create new connection"
+msgstr "Girêdanên torê yên xwe kontrol bike"
+
+#: ../src/connection-editor/connection-helpers.c:469
+#, fuzzy
+msgid "Connection delete failed"
+msgstr "Girêdan pêkhat"
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:901
-#: ../src/connection-editor/page-ip6.c:867
+#: ../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
 msgid "Address"
 msgstr "Navnîşan"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:918
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Rûpûşa torê"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:935
-#: ../src/connection-editor/page-ip6.c:901
+#: ../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
 msgid "Gateway"
 msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr ""
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:884
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1482
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:141
-msgid "Could not load DSL user interface."
+#: ../src/connection-editor/nm-connection-editor.c:104
+#, fuzzy
+msgid "Editing un-named connection"
+msgstr "Girêdana VPN sererast bike"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Navê _girêdanê:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+msgid "Editor initializing..."
 msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Lêzêdekirina girêdanê biserneket"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
-msgid "DSL connection %d"
-msgstr "Girêdana DSL %d"
+msgid "Invalid setting %s: %s"
+msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
-msgid "Automatic (VPN)"
-msgstr "Bixweber (VPN)"
+#: ../src/connection-editor/nm-connection-editor.c:283
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
-msgid "Automatic (VPN) addresses only"
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "_Save"
+msgstr "_Tomarkirin"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Bixweber (PPP)"
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "Girêdanên torê yên xwe kontrol bike"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not edit connection"
+msgstr "Girêdana torê tune"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+msgid "Unknown error creating connection editor dialog."
+msgstr "Nikarî girêdana VPN ya '%s' bibîne"
 
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
-msgid "Automatic (PPPoE)"
-msgstr "Bixweber (PPPoE)"
+#: ../src/connection-editor/nm-connection-editor.c:921
+msgid "Connection add failed"
+msgstr "Lêzêdekirina girêdanê biserneket"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
-msgid "Automatic (PPPoE) addresses only"
+#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
+msgid "_Close"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:143
-msgid "Automatic (DHCP)"
-msgstr "Bixweber (DHCP)"
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+msgid "Connection _name:"
+msgstr "Navê _girêdanê:"
 
-#: ../src/connection-editor/page-ip4.c:144
-msgid "Automatic (DHCP) addresses only"
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "Î_xracat"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "tu car"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "niha"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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:623
+msgid "Name"
+msgstr "Nav"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
-msgid "Link-Local Only"
+#: ../src/connection-editor/nm-connection-list.c:684
+#, fuzzy
+msgid "Edit the selected connection"
+msgstr "Girêdana VPN ya hilbijartî sererast bike"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+#, fuzzy
+msgid "Authenticate to edit the selected connection"
+msgstr "Girêdana VPN ya hilbijartî jê bibe"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+#, fuzzy
+msgid "Delete the selected connection"
+msgstr "Girêdana VPN ya hilbijartî jê bibe"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+#, fuzzy
+msgid "Authenticate to delete the selected connection"
+msgstr "Girêdana VPN ya hilbijartî jê bibe"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Bêbandorkirî"
+#: ../src/connection-editor/nm-connection-list.c:931
+#, 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:933
+#, fuzzy
+msgid "Error creating connection"
+msgstr "Nikarî girêdana VPN ya '%s' bibîne"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "Nikarî girêdana VPN ya '%s' bibîne"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
-msgid "Editing IPv4 routes for %s"
+msgid "Did not find a connection with UUID '%s'"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:982
-msgid "IPv4 Settings"
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:984
-msgid "Could not load IPv4 user interface."
+#: ../src/connection-editor/page-8021x-security.c:111
+msgid "Could not load 802.1x Security user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:285
-msgid "Ignore"
+#: ../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-ip6.c:179
-msgid "Automatic, DHCP only"
+#: ../src/connection-editor/page-bluetooth.c:125
+msgid "Could not load Bluetooth user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
-msgid "Editing IPv6 routes for %s"
+msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:946
-msgid "IPv6 Settings"
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Girêdana torê biqablo %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:948
-msgid "Could not load IPv6 user interface."
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:381
-msgid "Could not load mobile broadband user interface."
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Tê_keve torê"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Tora bêqablo (%s)"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:398
-msgid "Unsupported mobile broadband connection type."
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "DNS ya Yekemîn:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "Girêdana torê biqablo %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+msgid "Could not load bridge user interface."
 msgstr ""
 
-#. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:639
-msgid "Select Mobile Broadband Provider Type"
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+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
+msgid "Bridge Port"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:674
-msgid ""
-"Select the technology your mobile broadband provider uses.  If you are "
-"unsure, ask your provider."
+#: ../src/connection-editor/page-bridge-port.c:110
+msgid "Could not load bridge port user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:679
-msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:686
-msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+#: ../src/connection-editor/page-dcb.c:605
+msgid "Could not load DCB user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:134
-msgid "EAP"
-msgstr "EAP"
+#: ../src/connection-editor/page-dsl.c:129
+msgid "Could not load DSL user interface."
+msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
-msgid "PAP"
-msgstr "PAP"
+#: ../src/connection-editor/page-dsl.c:214
+#, c-format
+msgid "DSL connection %d"
+msgstr "Girêdana DSL %d"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
-msgid "CHAP"
-msgstr "CHAP"
+#: ../src/connection-editor/page-ethernet.c:74
+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-ppp.c:137
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
-msgid "MSCHAPv2"
-msgstr "MSCHAPv2"
+#: ../src/connection-editor/page-ethernet.c:328
+msgid "Could not load ethernet user interface."
+msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
-msgid "MSCHAP"
-msgstr "MSCHAP"
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Tora biqablo (%s)"
 
-#. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
-msgid "none"
-msgstr "tune"
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+msgid "cloned MAC"
+msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:201
-#, c-format
-msgid "Editing PPP authentication methods for %s"
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ppp.c:283
-msgid "PPP Settings"
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "Standard"
+
+#: ../src/connection-editor/page-general.c:52
+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-ppp.c:285
-msgid "Could not load PPP user interface."
+#: ../src/connection-editor/page-general.c:53
+#, fuzzy
+msgid "FirewallD is not running."
+msgstr "NetworkManager naxebite..."
+
+#: ../src/connection-editor/page-general.c:350
+msgid "Could not load General user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1478
-msgid "VPN"
-msgstr "VPN"
+#: ../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 ""
 
-#: ../src/connection-editor/page-vpn.c:111
-msgid "Could not load VPN user interface."
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:126
-#, c-format
-msgid "Could not find VPN plugin service for '%s'."
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
 msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:884
-#, c-format
-msgid "VPN connection %d"
-msgstr "Girêdana VPN %d"
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "Girêdana torê biqablo %d"
 
-#: ../src/connection-editor/page-wired.c:88
-#: ../src/connection-editor/page-wireless.c:93
-msgid ""
-"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-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
+msgid "Automatic (VPN)"
+msgstr "Bixweber (VPN)"
+
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
+msgid "Automatic (VPN) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-wired.c:267
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1466
-msgid "Wired"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-wired.c:269
-msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
+msgid "Automatic (PPPoE)"
+msgstr "Bixweber (PPPoE)"
+
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
+msgid "Automatic (PPPoE) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-wired.c:444
-#, c-format
-msgid "Wired connection %d"
-msgstr "Girêdana torê biqablo %d"
+#: ../src/connection-editor/page-ip4.c:135
+msgid "Automatic (DHCP)"
+msgstr "Bixweber (DHCP)"
 
-#: ../src/connection-editor/page-wired-security.c:116
-msgid "802.1x Security"
+#: ../src/connection-editor/page-ip4.c:136
+msgid "Automatic (DHCP) addresses only"
 msgstr ""
 
-#: ../src/connection-editor/page-wired-security.c:118
-msgid "Could not load Wired Security security user interface."
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
+msgid "Link-Local Only"
 msgstr ""
 
-#: ../src/connection-editor/page-wired-security.c:136
-msgid "Use 802.1X security for this connection"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "Pêşkêşkarên _DNS:"
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+msgid "Additional s_earch domains:"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:166
-#: ../src/connection-editor/page-wireless.c:170
-#: ../src/connection-editor/page-wireless.c:191
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
-msgid "default"
-msgstr "standard"
+msgid "Editing IPv4 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1160
+msgid "Could not load IPv4 user interface."
+msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:195
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
-msgid "%u (%u MHz)"
+msgid "IPv4 address \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:452
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1470
-msgid "Wireless"
-msgstr "Bêqablo"
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:454
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:658
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
-msgid "Wireless connection %d"
-msgstr "Girêdana bêqablo %d"
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/libnm-gtk/nm-wireless-dialog.c:923
-msgid "WEP 40/128-bit Key (Hex or ASCII)"
-msgstr "Mifteya WEP a 40/128-bit (Hex an ASCII)"
+#: ../src/connection-editor/page-ip6.c:148
+msgid "Ignore"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:272
-#: ../src/libnm-gtk/nm-wireless-dialog.c:932
-msgid "WEP 128-bit Passphrase"
-msgstr "Şîfreya WEP a 128-bit"
+#: ../src/connection-editor/page-ip6.c:172
+msgid "Automatic, DHCP only"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/libnm-gtk/nm-wireless-dialog.c:962
-msgid "Dynamic WEP (802.1x)"
-msgstr "WEP a dînamîk (802.1x)"
+#: ../src/connection-editor/page-ip6.c:964
+#, c-format
+msgid "Editing IPv6 routes for %s"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/libnm-gtk/nm-wireless-dialog.c:976
-msgid "WPA & WPA2 Personal"
-msgstr "WPA & WPA2 Personal"
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:990
-msgid "WPA & WPA2 Enterprise"
-msgstr "WPA & WPA2 Enterprise"
+#: ../src/connection-editor/page-ip6.c:1157
+msgid "Could not load IPv6 user interface."
+msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:360
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Wireless Security"
-msgstr "Ewlehiya bêqablo:"
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:372
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
-msgid "Editing %s"
+msgid "IPv6 DNS server \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:105
-#, fuzzy
-msgid "Editing un-named connection"
-msgstr "Girêdana VPN sererast bike"
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:288
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, c-format
 msgid ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:391
-#, fuzzy
-msgid "Error creating connection editor dialog."
-msgstr "Nikarî girêdana VPN ya '%s' bibîne"
+#: ../src/connection-editor/page-master.c:385
+#, c-format
+msgid "%s slave %d"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:403
-msgid "_Save"
-msgstr "_Tomarkirin"
+#: ../src/connection-editor/page-mobile.c:310
+msgid "Could not load mobile broadband user interface."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:404
-msgid "Save any changes made to this connection."
+#: ../src/connection-editor/page-mobile.c:327
+msgid "Unsupported mobile broadband connection type."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:405
-msgid "_Save..."
-msgstr "_Tomar bike..."
+#. Fall back to just asking for GSM vs. CDMA
+#: ../src/connection-editor/page-mobile.c:529
+msgid "Select Mobile Broadband Provider Type"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:406
-msgid "Authenticate to save this connection for all users of this machine."
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "A_vailable to all users"
+#: ../src/connection-editor/page-mobile.c:561
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "Bixweber _girêbide"
+#: ../src/connection-editor/page-mobile.c:568
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
-msgstr "Navê _girêdanê:"
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "E_xport"
-msgstr "Î_xracat"
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-#, fuzzy
-msgid "_Import"
-msgstr "Î_dhalat"
+#: ../src/connection-editor/page-ppp.c:129
+msgid "EAP"
+msgstr "EAP"
 
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "tu car"
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
+msgid "PAP"
+msgstr "PAP"
 
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "niha"
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
+msgid "CHAP"
+msgstr "CHAP"
 
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d xulek berê"
-msgstr[1] "%d xulek berê"
+#: ../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
+msgid "MSCHAPv2"
+msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d saet berê"
-msgstr[1] "%d saet berê"
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
+msgid "MSCHAP"
+msgstr "MSCHAP"
 
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d roj berê"
-msgstr[1] "%d roj berê"
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:136
+msgid "none"
+msgstr "tune"
 
-#: ../src/connection-editor/nm-connection-list.c:267
+#: ../src/connection-editor/page-ppp.c:196
 #, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d meh berê"
-msgstr[1] "%d meh berê"
+msgid "Editing PPP authentication methods for %s"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d sal berê"
-msgstr[1] "%d sal berê"
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "Lêzêdekirina girêdanê biserneket"
+#: ../src/connection-editor/page-ppp.c:281
+msgid "Could not load PPP user interface."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "Nikarî girêdanê tomar bike"
+#: ../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 ""
 
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
+#: ../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"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
-msgid "An unknown error occurred."
+#: ../src/connection-editor/page-team.c:270
+msgid "Could not load team user interface."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "Error initializing editor"
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+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:151
+msgid "Team Port"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:703
-#: ../src/connection-editor/nm-connection-list.c:870
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
+#: ../src/connection-editor/page-team-port.c:153
+msgid "Could not load team port user interface."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:557
-#, fuzzy
-msgid "Could not create new connection"
-msgstr "Girêdanên torê yên xwe kontrol bike"
+#. 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
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:569
-#, fuzzy
-msgid "Could not edit new connection"
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
 msgstr "Girêdana torê tune"
 
-#: ../src/connection-editor/nm-connection-list.c:717
-#, fuzzy
-msgid "Could not edit connection"
-msgstr "Girêdana torê tune"
+#: ../src/connection-editor/page-vlan.c:596
+msgid "Could not load vlan user interface."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:747
-#, fuzzy
-msgid "Connection delete failed"
-msgstr "Girêdan pêkhat"
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:779
-#, c-format
-msgid "Are you sure you wish to delete the connection %s?"
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "Girêdana VPN %d"
+
+#: ../src/connection-editor/page-vpn.c:103
+msgid "Could not load VPN user interface."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:914
-#: ../src/connection-editor/vpn-helpers.c:227
-msgid "Cannot import VPN connection"
+#: ../src/connection-editor/page-vpn.c:118
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:916
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
+#, c-format
+msgid "VPN connection %d"
+msgstr "Girêdana VPN %d"
+
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
 "Error: no VPN service type."
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:929
-#, fuzzy
-msgid "Could not edit imported connection"
-msgstr "Girêdana torê tune"
-
-#: ../src/connection-editor/nm-connection-list.c:1099
-msgid "Name"
-msgstr "Nav"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "Cureyê girêdana VPN hilbijêre"
 
-#: ../src/connection-editor/nm-connection-list.c:1111
-msgid "Last Used"
+#: ../src/connection-editor/page-vpn.c:255
+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/nm-connection-list.c:1227
-msgid "No VPN plugin available. Please install one to enable this button."
+#: ../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/nm-connection-list.c:1238
-msgid "_Edit"
-msgstr "_Sererastkirin"
+#: ../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/nm-connection-list.c:1239
-#, fuzzy
-msgid "Edit the selected connection"
-msgstr "Girêdana VPN ya hilbijartî sererast bike"
+#: ../src/connection-editor/page-wifi.c:197
+#, c-format
+msgid "%u (%u MHz)"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1240
-msgid "_Edit..."
-msgstr "_Sererastkirin..."
+#: ../src/connection-editor/page-wifi.c:450
+msgid "Could not load Wi-Fi user interface."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1241
-#, fuzzy
-msgid "Authenticate to edit the selected connection"
-msgstr "Girêdana VPN ya hilbijartî jê bibe"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1256
-msgid "_Delete"
+#: ../src/connection-editor/page-wifi.c:577
+msgid "Wi-Fi device"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1257
-#, fuzzy
-msgid "Delete the selected connection"
-msgstr "Girêdana VPN ya hilbijartî jê bibe"
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Girêdana torê biqablo %d"
 
-#: ../src/connection-editor/nm-connection-list.c:1258
-msgid "_Delete..."
-msgstr ""
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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/nm-connection-list.c:1259
-#, fuzzy
-msgid "Authenticate to delete the selected connection"
-msgstr "Girêdana VPN ya hilbijartî jê bibe"
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+msgid "WEP 128-bit Passphrase"
+msgstr "Şîfreya WEP a 128-bit"
 
-#: ../src/connection-editor/nm-connection-list.c:1538
-#, fuzzy
-msgid "Error creating connection"
-msgstr "Nikarî girêdana VPN ya '%s' bibîne"
+#: ../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)"
+msgstr "WEP a dînamîk (802.1x)"
 
-#: ../src/connection-editor/nm-connection-list.c:1539
-#, 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/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+msgid "WPA & WPA2 Personal"
+msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/nm-connection-list.c:1594
-#: ../src/connection-editor/nm-connection-list.c:1606
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA & WPA2 Enterprise"
+
+#: ../src/connection-editor/page-wifi-security.c:413
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:424
 #, fuzzy
-msgid "Error editing connection"
-msgstr "Nikarî girêdana VPN ya '%s' bibîne"
+msgid "Wi-Fi Security"
+msgstr "Ewlehiya bêqablo:"
+
+#: ../src/connection-editor/page-wifi-security.c:426
+msgid "Could not load Wi-Fi security user interface."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1595
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Don't know how to edit '%s' connections"
+msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:1607
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "Did not find a connection with UUID '%s'"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:138
+msgid "Cannot import VPN connection"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2053,30 +2940,30 @@ msgid ""
 "Error: %s."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:262
-msgid "Select file to import"
+#: ../src/connection-editor/vpn-helpers.c:141
+msgid "unknown error"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:315
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:317
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:353
+#: ../src/connection-editor/vpn-helpers.c:255
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "Nikarî girêdana VPN lê zêde bike"
 
-#: ../src/connection-editor/vpn-helpers.c:355
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2084,116 +2971,59 @@ msgid ""
 "Error: %s."
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:390
+#: ../src/connection-editor/vpn-helpers.c:292
 #, fuzzy
 msgid "Export VPN connection..."
 msgstr "Girêdana VPN sererast bike"
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, fuzzy, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Bila girêdana VPN \"%s\" were rakirin?"
-
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr ""
-
-#: ../src/gnome-bluetooth/bt-widget.c:249
-#, c-format
-msgid "%s Network"
-msgstr "Tora %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:375
-#, c-format
-msgid "Error: %s"
-msgstr "Çewtiya %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:488
-#, fuzzy, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Bila girêdana VPN \"%s\" were rakirin?"
-
-#: ../src/gnome-bluetooth/bt-widget.c:511
-msgid "Mobile wizard was canceled"
-msgstr ""
-
-#: ../src/gnome-bluetooth/bt-widget.c:520
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr ""
-
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
-#, fuzzy
-msgid "failed to connect to the phone."
-msgstr "Niha bi tora biqablo re girêdayî yî."
-
-#: ../src/gnome-bluetooth/bt-widget.c:753
-msgid "unexpectedly disconnected from the phone."
-msgstr ""
-
-#: ../src/gnome-bluetooth/bt-widget.c:762
-msgid "timed out detecting phone details."
-msgstr ""
-
-#: ../src/gnome-bluetooth/bt-widget.c:774
-msgid "Detecting phone configuration..."
-msgstr ""
-
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr ""
-
-#: ../src/gnome-bluetooth/bt-widget.c:975
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-
-#: ../src/gnome-bluetooth/bt-widget.c:1007
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1017
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr ""
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "_Kîlît rake"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1026
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
 msgstr ""
 
-#: ../src/gnome-bluetooth/bt-widget.c:1093
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr ""
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Agahiya girêdanê"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1102
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr ""
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "Girêdanên torê yên çalak"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
+#: ../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/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr ""
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr ""
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
+#: ../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 "
@@ -2202,23 +3032,28 @@ msgid ""
 "Preferences menu."
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:264
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:528
+#: ../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"
@@ -2226,348 +3061,569 @@ msgid ""
 "If you are unsure of your plan please ask your provider for your plan's APN."
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../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/libnm-gtk/nm-mobile-wizard.c:789
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../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/libnm-gtk/nm-mobile-wizard.c:819
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:830
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1092
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1099
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1145
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1199
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1202
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1374
+#: ../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 ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1379
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1394
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1400
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1406
+#: ../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 ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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 ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1625
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+msgid "The password is not required"
+msgstr ""
+
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "Şî_fre:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "Şî_fre:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "Şîfreyan _nîşan bide"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nû..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1077
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Tune"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Afirandin"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1161
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"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/libnm-gtk/nm-wireless-dialog.c:1163
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 #, fuzzy
-msgid "Wireless Network Authentication Required"
+msgid "Wi-Fi Network Authentication Required"
 msgstr "Mifteya tora bêqablo pêwîst e"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1165
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 #, fuzzy
-msgid "Authentication required by wireless network"
+msgid "Authentication required by Wi-Fi network"
 msgstr "Tora bêqablo ya nû biafirîne"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1170
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "Tora bêqablo ya nû biafirîne"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "Tora bêqablo ya nû"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1173
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr ""
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1175
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Li tora bêqablo ya veşartî girê bide..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "Tora bêqablo ya veşartî"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Ewlehiya bêqablo:"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "_Girêdan:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+msgid "Wi-Fi _adapter:"
 msgstr ""
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _security:"
-msgstr "_Ewlehiya bêqablo:"
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
 
-#: ../src/main.c:73
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Bikaranîn:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"Ev bername beşeke NetworkManager'ê ye "
-"(https://wiki.gnome.org/Projects/NetworkManager/)."
+"Ev bername beşeke NetworkManager'ê ye (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../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:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "neçalakkirî"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ne tomarkirî"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Tora malê (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Tora malê"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "lê digere"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr ""
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr ""
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:170
 #, fuzzy, c-format
 msgid "Roaming network (%s)"
 msgstr "Tora biqablo (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, fuzzy, c-format
 msgid "Roaming network"
 msgstr "Tora biqablo"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "Standard"
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "Koda PIN pêwîst e"
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
+#: ../src/mobile-helpers.c:619
+#, 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:622
+msgid "roaming"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:280
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Girêdanên VPN"
+
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:648
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:651
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:372
-msgid "MD5"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
-msgid "Choose a Certificate Authority certificate..."
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+msgid "Anonymous"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+msgid "Authenticated"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
 msgstr ""
 
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+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
+msgid "_Inner authentication:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+msgid "MD5"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+msgid "Version 1"
+msgstr ""
+
+#: ../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 ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../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
-msgid "I_nner authentication:"
+msgid "No CA certificate is _required"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "Version 0"
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+msgid "PEAP _version:"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-msgid "Version 1"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "_PEAP version:"
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-msgid "As_k for this password every time"
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../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 "
@@ -2576,63 +3632,110 @@ msgid ""
 "(You can password-protect your private key with openssl)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "_Nasname:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "Sertîfikaya _bikarhêner:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Mifteya _taybet:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "Şî_freya mifteya taybet:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_User certificate:"
-msgstr "Sertîfikaya _bikarhêner:"
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:384
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:408
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:419
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr ""
 
 #: ../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
-msgid "_Authentication:"
+msgid "Au_thentication:"
 msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Standard)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
 msgid "Open System"
@@ -2643,16 +3746,146 @@ msgid "Shared Key"
 msgstr "Mifteya parvekirî"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "_Mifte:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
 msgid "Sho_w key"
 msgstr "Mifteyê _nîşan bide"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "Ende_ksa WEP:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
-msgid "_Key:"
-msgstr "_Mifte:"
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Cure:"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Niha bi tora CDMA re girêdayî yî."
+
+#~ msgid "CDMA network."
+#~ msgstr "Tora CDMA."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Niha bi tora GSM re girêdayî yî."
+
+#~ msgid "GSM network."
+#~ msgstr "Tora GSM"
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Torên Bêqablo (%s)"
+
+#, fuzzy
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Tora bêqablo (%s)"
+
+#, fuzzy
+#~ msgid "Click on this icon to connect to a wireless network"
+#~ msgstr "Dema girêdana bi tora bêqablo re çewtî derket"
+
+#, fuzzy
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
+
+#, fuzzy
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
+
+#, fuzzy
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Ji tora bêqablo '%s' navnîşana torê tê xwestin..."
+
+#, fuzzy
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "Girêdana tora biqablo bi '%s' re (%d%%)"
+
+#, fuzzy
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Niha bi tora biqablo re girêdayî yî."
+
+#, fuzzy
+#~ msgid "WiMAX (%s)"
+#~ msgstr "CDMA (%s)"
+
+#~ 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î"
+
+#~ msgid "PI_N:"
+#~ msgstr "PI_N:"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA) tercîh bike"
+
+#~ msgid "_SSID:"
+#~ msgstr "_SSID:"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Bixweber (PPP)"
+
+#~ msgid "Wireless"
+#~ msgstr "Bêqablo"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "Girêdana bêqablo %d"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Could not edit imported connection"
+#~ msgstr "Girêdana torê tune"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Sererastkirin..."
+
+#~ msgid "%s Network"
+#~ msgstr "Tora %s"
+
+#~ msgid "Error: %s"
+#~ 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î."
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
 
 #~ msgid "Passphrase for wireless network %s"
 #~ msgstr "Şîfreya tora bêqablo (%s)"
@@ -2703,9 +3936,6 @@ msgstr "_Mifte:"
 #~ msgid " (invalid Unicode)"
 #~ msgstr " (Unicode a nederbasdar)"
 
-#~ msgid "C_onnect"
-#~ msgstr "_Girêdan"
-
 #~ msgid ""
 #~ "Open System\n"
 #~ "Shared Key"
@@ -2719,9 +3949,6 @@ msgstr "_Mifte:"
 #~ msgid "Passphrase:"
 #~ msgstr "Hevoka şîfre:"
 
-#~ msgid "_Login to Network"
-#~ msgstr "Tê_keve torê"
-
 #~ msgid "Unable to load"
 #~ msgstr "Nikarî bar bike"
 
diff --git a/po/lt.po b/po/lt.po
index ff07137c..43c6b2e5 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,9 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-01-24 15:44+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2016-01-08 19:31+0200\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
@@ -25,7 +24,7 @@ msgstr ""
 "X-Generator: Poedit 1.8.6\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3258
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Tinklas"
 
@@ -158,7 +157,7 @@ msgstr ""
 "nm-connection-editor programa dirba su NetworkManager ryšių profilių kūrimui "
 "bei redagavimui."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X tapatybės patvirtintimas"
 
@@ -180,45 +179,45 @@ msgstr "Prisi_jungti"
 msgid "_Network name:"
 msgstr "_Tinklo pavadinimas:"
 
-#: ../src/ap-menu-item.c:87
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "saugus."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Nepavyko pridėti / suaktyvinti ryšio"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Nežinoma klaida"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Ryšio problema"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Nepavyko atjungti įrenginio"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Nepavyko atsijungti"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Nepavyko suaktyvinti ryšio"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Daugiau nerodyti šio pranešimo"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -228,7 +227,7 @@ msgstr ""
 "\n"
 "VPN ryšio „%s“ klaida, buvo nutrauktas tinklo ryšys."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -237,7 +236,7 @@ msgstr ""
 "\n"
 "VPN ryšio „%s“ klaida, kadangi VPN tarnyba netikėtai sustojo."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -247,7 +246,7 @@ msgstr ""
 "\n"
 "VPN ryšio „%s“ klaida, VPN tarnyba grąžino netinkamą konfigūraciją."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -256,7 +255,7 @@ msgstr ""
 "\n"
 "VPN ryšio „%s“ klaida, baigėsi bandymo prisijungti laiko limitas."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -265,7 +264,7 @@ msgstr ""
 "\n"
 "VPN ryšio „%s“ klaida, VPN tarnyba nebuvo paleista laiku."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -274,7 +273,7 @@ msgstr ""
 "\n"
 "VPN ryšio „%s“ klaida, VPN tarnyba nebuvo paleista."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -283,7 +282,7 @@ msgstr ""
 "\n"
 "VPN ryšio „%s“ klaida, nebuvo tinkamų VPN paslapčių."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -292,7 +291,7 @@ msgstr ""
 "\n"
 "VPN ryšio „%s“ klaida, kadangi buvo netinkamų VPN paslapčių."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -301,7 +300,7 @@ msgstr ""
 "\n"
 "VPN ryšio „%s“ klaida."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -311,7 +310,7 @@ msgstr ""
 "\n"
 "VPN ryšio „%s“ klaida, kadangi nutrūko tinklo ryšys."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -320,7 +319,7 @@ msgstr ""
 "\n"
 "VPN ryšio „%s“ klaida, kadangi buvo sustabdyta VPN tarnyba."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -329,7 +328,7 @@ msgstr ""
 "\n"
 "VPN ryšis „%s“ nutrauktas."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -340,19 +339,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN ryšys sėkmingai užmegztas.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN ryšio pranešimas"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN ryšio klaida"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -365,7 +364,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -378,549 +377,543 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "įrenginys nepasiruošęs (trūksta aparatinės programinės įrangos)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "įrenginys nepasiruošęs"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "atjungta"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Atsijungti"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "įrenginys nevaldomas"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Tinklo įrenginių nerasta"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN ryšiai"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Konfigūruoti VPN…"
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Atjungti VPN"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager programa nepaleista…"
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Tinklo sąsajos atjungtos"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Įjungti _tinklą"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Įjungti _belaidį"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Įjungti _mobilųjį plačiajuostį ryšį"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Įjungti p_ranešimus"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Ryšio _informacija"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Taisyti ryšius…"
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "_Žinynas"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Apie"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Esate prisijungę prie „%s“."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Atjungta"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Atsijungta nuo tinklo."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Ruošiamas tinklo ryšys „%s“…"
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Tinklo ryšys „%s“ reikalauja nustatyti jūsų tapatybę…"
 
-#: ../src/applet.c:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "„%s“ prašoma tinklo adreso…"
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Tinklo ryšys „%s“ aktyvus"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Pradedamas VPN ryšys „%s“…"
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN ryšys „%s“ reikalauja nustatyti jūsų tapatybę…"
 
-#: ../src/applet.c:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "„%s“ prašoma VPN adreso…"
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN ryšys „%s“ aktyvus."
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Nėra tinklo ryšio"
 
-#: ../src/applet.c:3384
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager įtaisas"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Neteisingas PUK kodas, susisiekite su savo paslaugų tiekėju."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 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:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Siunčiamas atrakinimo kodas…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilusis plačiajuostis ryšys (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobilusis plačiajuostis ryšys"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Prieinama"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Naujas mobilusis plačiajuostis ryšys..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Prisijungta"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 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:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobilusis plačiajuostis tinklas."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Prisiregistravote namų tinkle."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Prisiregistravote kelionės tinkle."
 
-#: ../src/applet-device-bt.c:93
+#: ../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:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Ruošiamas mobilusis plačiajuostis ryšys „%s“…"
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Konfigūruojamas mobilusis plačiajuostis ryšys „%s“…"
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Mobilusis plačiajuostis ryšys „%s“ reikalauja nustatyti tapatybę…"
 
-#: ../src/applet-device-bt.c:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobilusis plačiajuostis ryšys „%s“ aktyvus"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatinis laidinis tinklas"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Laidiniai tinklai (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Laidinis tinklas (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Laidiniai tinklai"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Laidinis tinklas"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../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:163
+#: ../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:166
+#: ../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:169
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Laidinis tinklo ryšys „%s“ reikalauja patvirtinti jūsų tapatybę…"
 
-#: ../src/applet-device-ethernet.c:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "„%s“ prašoma laidinio tinklo adreso…"
 
-#: ../src/applet-device-ethernet.c:176
+#: ../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:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL tapatybės nustatymas"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Prisijungti prie paslėpto belaidžio tinklo…"
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Sukurti _naują belaidį tinklą..."
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(nėra)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Belaidžiai tinklai (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Belaidis tinklas (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 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:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Belaidis tinklas išjungtas"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Belaidis tinklas išjungtas aparatiškai"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Daugiau tinklų"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Yra belaidžių tinklų"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 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:1237
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Prisijungėte prie belaidžio tinklo „%s“."
 
-#: ../src/applet-device-wifi.c:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Ruošiamas belaidis tinklo ryšys „%s“..."
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Konfigūruojamas belaidis tinklo ryšys „%s“..."
 
-#: ../src/applet-device-wifi.c:1275
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Belaidis tinklas „%s“ reikalauja patvirtinti jūsų tapatybę..."
 
-#: ../src/applet-device-wifi.c:1278
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Prašoma belaidžio tinklo „%s“ adreso..."
 
-#: ../src/applet-device-wifi.c:1289
+#: ../src/applet-device-wifi.c:1419
 #, 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:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Belaidis tinklo ryšys „%s“ aktyvus"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Nepavyko suaktyvinti ryšio"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Nepavyko pridėti naujo ryšio"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Klaida rodant ryšio informaciją:"
 
-#: ../src/applet-dialogs.c:75 ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dinaminis WEP"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Daugiau adresų"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nėra"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (numatytasis)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nežinoma"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "IP adresas:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Transliacijos adresas:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Potinklio kaukė:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Laidinis tinklas (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Bendra"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Sąsaja:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Aparatinis adresas:"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Tvarkyklė:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Greitis:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Sauga:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Numatytasis maršrutas:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Nepaisoma"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN tipas:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN tinklų sietuvas:"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN naudotojo vardas:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN reklamjuostė:"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Bazinis ryšys:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nežinoma"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Nerasta tinkamų aktyvių ryšių!"
 
-#: ../src/applet-dialogs.c:977
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -930,42 +923,42 @@ msgstr ""
 "Autorių teisės priklauso © 2005-2008 Novell, Inc.\n"
 "ir daugeliui kitų bendruomenės pagalbininkų bei vertėjų"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 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:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager tinklalapis"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Trūkstami resursai"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Mobiliojo plačiajuosčio tinklo slaptažodis"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Norint prisijungti prie „%s“ reikalingas slaptažodis."
 
-#: ../src/applet-dialogs.c:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Reikalingas SIM PIN atrakinimas"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 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:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -975,25 +968,25 @@ msgstr ""
 "pradedant jį naudoti."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN kodas:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Rodyti PIN kodą"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Reikalingas SIM PUK atrakinimas"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 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:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1003,22 +996,22 @@ msgstr ""
 "pradedant jį naudoti."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK kodas:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Naujas PIN kodas:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Dar kartą įveskite naują PIN kodą:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Rodyti PIN/PUK kodus"
 
@@ -1059,7 +1052,7 @@ msgstr "_Pridėti"
 #: ../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:701
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "Pa_šalinti"
 
@@ -1160,7 +1153,7 @@ 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:5
-#: ../src/connection-editor/nm-connection-list.c:685
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "K_eisti"
 
@@ -1277,57 +1270,57 @@ msgstr "_Didžiausias amžius:"
 msgid "_Aging time:"
 msgstr "_Senėjimo laikas:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatinis"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "numatytasis"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "nenurodyta klaida"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "MAC adresas"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "HW adresas"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "netinkamas %s %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:486
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "netinkamas %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "netinkamas %s sąsajos pavadinimas (%s)"
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "netinkamas sąsajos pavadinimas (%s)"
 
-#: ../src/connection-editor/ce-page.c:487
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "įrenginys"
 
-#: ../src/connection-editor/ce-page.c:593
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Nepavyko atnaujinti ryšio paslapčių dėl nežinomos klaidos."
 
@@ -1544,8 +1537,8 @@ msgstr "R_odyti slaptažodį"
 
 #: ../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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1557,8 +1550,8 @@ msgstr "_Slaptažodis:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatinis"
@@ -1642,34 +1635,39 @@ msgid "De_fault"
 msgstr "_Numatytasis"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Nepaisyti"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "_Atsibusti su LAN slaptažodžiu:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1713,8 +1711,8 @@ msgstr "Automatinis su rankiniai DNS nustatymais"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Rankinis"
 
@@ -1725,8 +1723,8 @@ 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:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Bendrinamas kitiems kompiuteriams"
 
@@ -1765,15 +1763,15 @@ msgstr "D_HCP kliento ID:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "_Paieškos sritys:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS serveriai:"
 
@@ -1803,7 +1801,7 @@ msgid "_Routes…"
 msgstr "_Maršrutai…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Išjungtas"
 
@@ -2044,7 +2042,7 @@ msgstr "S_ritis:"
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Nėra polkit leidimo vykdyti veiksmą"
 
@@ -2100,190 +2098,190 @@ msgstr ""
 "Daugeliu atvejų tiekėjo PPP serveriai palaiko visus tapatybės nustatymo "
 "metodus. Jei nepavyksta prisijungti, pabandykite kai kurių metodų palaikymą."
 
-#: ../src/connection-editor/connection-helpers.c:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Laidinis tinklas"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Belaidis"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:126
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:597 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Aparatinė įranga"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtualus"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Importuoti VPN ryšio konfigūraciją..."
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Nepavyko inicijuoti ryšių rengyklės dialogo dėl nežinomos klaidos."
 
-#: ../src/connection-editor/connection-helpers.c:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Nepavyko sukurti naujo ryšio"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Nepavyko ištrinti ryšio"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Ar tikrai norite ištrinti ryšį %s?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Adresas"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Tinklo kaukė"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Šliuzas"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrika"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefiksas"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Taisomas %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Taisomas nepavadintas ryšys"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Trūksta ryšio pavadinimo"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Redaktorius inicijuojamas..."
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "Nepavyko pakeisti ryšio"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Netinkamas nustatymas %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
 msgstr ""
 "Ryšių rengyklė nerado kai kurių reikalingų išteklių (nerastas .ui failas)."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "Į_rašyti"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Išsaugoti visus šiam ryšiui daromus pakeitimus."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Nurodykite tapatybę, jei pageidaujate išsaugoti šį ryšį visiems šio "
 "kompiuterio naudotojams."
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Nepavyko sukurti ryšio"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Nepavyko taisyti ryšio"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Nežinoma klaida kuriant ryšio rengyklės dialogą."
 
-#: ../src/connection-editor/nm-connection-editor.c:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Klaida inicijuojant rengyklę"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Nepavyko pridėti ryšio"
 
@@ -2299,17 +2297,17 @@ msgstr "Ryšio _vardas"
 msgid "_Export..."
 msgstr "_Eksportuoti..."
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "niekada"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "dabar"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2317,7 +2315,7 @@ msgstr[0] "prieš %d minutę"
 msgstr[1] "prieš %d minutes"
 msgstr[2] "prieš %d minučių"
 
-#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2325,7 +2323,7 @@ msgstr[0] "prieš %d valandą"
 msgstr[1] "prieš %d valandas"
 msgstr[2] "prieš %d valandų"
 
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2333,7 +2331,7 @@ msgstr[0] "prieš %d dieną"
 msgstr[1] "prieš %d dienas"
 msgstr[2] "prieš %d dienų"
 
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2341,7 +2339,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:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2349,116 +2347,116 @@ msgstr[0] "prieš %d metus"
 msgstr[1] "prieš %d metus"
 msgstr[2] "prieš %d metų"
 
-#: ../src/connection-editor/nm-connection-list.c:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Vardas"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Paskutinįkart naudotas"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Keisti pasirinktą ryšį"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Norint keisti pasirinktą ryšį, reikia nustatyti tapatybę"
 
-#: ../src/connection-editor/nm-connection-list.c:702
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Pašalinti pasirinktą ryšį"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Norint pašalinti pasirinktą ryšį, reikia nustatyti tapatybę"
 
-#: ../src/connection-editor/nm-connection-list.c:931
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Nėra įdiegtų VPN įskiepių."
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:935
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Klaida kuriant ryšį"
 
-#: ../src/connection-editor/nm-connection-list.c:957
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Klaida taisant ryšio nustatymus"
 
-#: ../src/connection-editor/nm-connection-list.c:958
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Nepavyko rasti ryšio, kurio UUID „%s“"
 
-#: ../src/connection-editor/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x sauga"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 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:128
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Naudoti 802.1_X saugą šiam ryšiui"
 
-#: ../src/connection-editor/page-bluetooth.c:61
+#: ../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:128
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Nepavyko įkelti Bluetooth naudotojo sąsajos."
 
-#: ../src/connection-editor/page-bluetooth.c:178
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "neteisingas Bluetooth įrenginys (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:261
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth ryšys %d"
 
-#: ../src/connection-editor/page-bluetooth.c:305
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Bluetooth tipas"
 
-#: ../src/connection-editor/page-bluetooth.c:323
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Pasirinkite Bluetooth ryšio profilio tipą"
 
-#: ../src/connection-editor/page-bluetooth.c:328
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "_Asmeninės erdvės tinklas"
 
-#: ../src/connection-editor/page-bluetooth.c:333
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "_Telefoninis tinklas"
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Nepavyko įkelti bond naudotojo sąsajos."
 
-#: ../src/connection-editor/page-bond.c:568
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "pirminis"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bond ryšys %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Nepavyko įkelti bridge naudotojo sąsajos."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Bridge ryšys %d"
@@ -2466,32 +2464,32 @@ msgstr "Bridge ryšys %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Bridge prievadas"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Nepavyko įkelti bridge prievado naudotojo sąsajos."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Nepavyko įkelti DSB naudotojo sąsajos."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Nepavyko įkelti DSL naudotojo sąsajos."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL ryšys %d"
 
-#: ../src/connection-editor/page-ethernet.c:77
+#: ../src/connection-editor/page-ethernet.c:74
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"em1\", "
@@ -2501,39 +2499,37 @@ msgstr ""
 "pavadinimas arba nuolatinis MAC adresas. Pavyzdžiai: „em1“, "
 "„3C:97:0E:42:1A:19“, „em1 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-ethernet.c:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Nepavyko įkelti laidinio ryšio naudotojo sąsajos."
 
-#: ../src/connection-editor/page-ethernet.c:447
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Laidinis tinklas"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:744
-#: ../src/connection-editor/page-wifi.c:583
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "klonuotas MAC"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Atsibusti su LAN slaptažodžiu"
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Laidinis ryšys %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#. Check access method name, APN and type
-#: ../src/connection-editor/page-general.c:55
-#: ../src/libnma/nma-mobile-providers.c:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
-#: ../src/libnm-gtk/tests/test-mobile-providers.c:324
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Numatytasis"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2543,15 +2539,15 @@ msgstr ""
 "pasirinkus ugniasienėje naudojama numatytoji zona. Panaudojama tik jei "
 "firewalld yra aktyvi."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD nepaleista."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Nepavyko įkelti pagrindinės naudotojo sąsajos."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2563,152 +2559,152 @@ 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:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Nepavyko įkelti InfiniBand naudotojo sąsajos."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 msgid "infiniband device"
 msgstr "infiniband įrenginys"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand ryšys %d"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatinis (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatinis (VPN) tik adresai"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automatinis, tik adresai"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatinis (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatinis (PPPoE) tik adresai"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatinis (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatinis (DHCP) tik adresai"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Tik vietinis (link-local)"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Papildomi _DNS serveriai:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Papildomos pai_eškos sritys:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Keičiami IPv4 maršrutai „%s“"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 nustatymai"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Nepavyko įkelti IPv4 naudotojo sąsajos."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "IPv4 adresas „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "IPv4 adreso tinklo kaukė „%s“ yra netinkama"
 
-#: ../src/connection-editor/page-ip4.c:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "IPv4 šliuzas „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "IPv4 DNS serveris „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Nepaisyti"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatinis, tik DHCP"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Keičiami IPv6 maršrutai „%s“"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 nustatymai"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Nepavyko įkelti IPv6 naudotojo sąsajos."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "IPv6 adresas „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "IPv6 priešdėlis „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "IPv6 šliuzas „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "IPv6 DNS serveris „%s“ yra netinkamas"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Dubliuoti vaikai"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "Vaikai „%s“ ir „%s“ abu taikomi įrenginiui „%s“"
 
-#: ../src/connection-editor/page-master.c:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2717,25 +2713,25 @@ msgstr ""
 "Vaikai „%s“ ir „%s“ taikomi skirtingiems virtualiems prievadams („%s“ ir "
 "„%s“) tame pačiame įrenginyje."
 
-#: ../src/connection-editor/page-master.c:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s vaikas %d"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 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:330
+#: ../src/connection-editor/page-mobile.c:327
 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:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Pasirinkite mobiliojo plačiajuosčio ryšio tiekėjo tipą"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2743,86 +2739,86 @@ msgstr ""
 "Pasirinkite technologiją, naudojamą jūsų mobiliojo plačiajuosčio ryšio "
 "tiekėjo. Jei abejojate, klauskite tiekėjo."
 
-#: ../src/connection-editor/page-mobile.c:564
+#: ../src/connection-editor/page-mobile.c:561
 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, "
 "HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 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:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "joks"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../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:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP nustatymai"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Nepavyko įkelti PPP naudotojo sąsajos."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Pasirinkite importuotiną failą"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Klaida: failas neturi tinkamos JSON konfigūracijos"
 
-#: ../src/connection-editor/page-team.c:272
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Nepavyko įkelti team naudotojo sąsajos."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Komandinis ryšys %d"
@@ -2830,56 +2826,56 @@ 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:154
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Team prievadas"
 
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:153
 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:417
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (per „%s“)"
 
-#: ../src/connection-editor/page-vlan.c:429
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
 msgid "New connection..."
 msgstr "Naujas ryšys..."
 
-#: ../src/connection-editor/page-vlan.c:599
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Nepavyko įkelti vlan naudotojo sąsajos."
 
-#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr "vlan tėvas"
 
-#: ../src/connection-editor/page-vlan.c:800
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN ryšys %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Nepavyko įkelti VPN naudotojo sąsajos."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Nepavyko rasti „%s“ reikalingos VPN įskiepių tarnybos."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN ryšys %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2889,11 +2885,11 @@ msgstr ""
 "\n"
 "Klaida: nenurodytas VPN paslaugos tipas."
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Pasirinkite VPN ryšio tipą"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2902,7 +2898,7 @@ msgstr ""
 "Pasirinkite VPN tipą, kurį pageidaujate naudoti naujajam ryšiui. Jei norimo "
 "tipo nėra sąraše, gali būti neįdiegtas reikiamas VPN įskiepis."
 
-#: ../src/connection-editor/page-wifi.c:80
+#: ../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"
@@ -2910,7 +2906,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:91
+#: ../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\", "
@@ -2920,80 +2916,80 @@ msgstr ""
 "pavadinimas, nuolatinis MAC adresas aba abu. Pavyzdžiai: „wlan0“, "
 "„3C:97:0E:42:1A:19“, „wlan0 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Nepavyko įkelti Wi-Fi naudotojo sąsajos."
 
-#: ../src/connection-editor/page-wifi.c:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:579
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Wi-Fi įrenginys"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Belaidis ryšys %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 bitų slaptažodis"
 
-#: ../src/connection-editor/page-wifi-security.c:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "Dinaminis WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ir WPA2 asmeninis"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ir WPA2 industrinis"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 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:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Belaidžio ryšio sauga"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 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:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "trūksta SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Saugumas nesuderinamas su Ad-Hoc veiksena"
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Nepavyko importuoti VPN ryšio"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3006,29 +3002,29 @@ msgstr ""
 "\n"
 "Klaida: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "nežinoma klaida"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Failas pavadinimu „%s“ jau yra."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Pakeisti"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Nepavyko eksportuoti VPN ryšio"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3039,11 +3035,11 @@ msgstr ""
 "\n"
 "Klaida: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Eksportuoti VPN ryšį…"
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3067,33 +3063,33 @@ msgstr "Ryšio informacija"
 msgid "Active Network Connections"
 msgstr "Suaktyvinti tinklo ryšiai"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
 "Jūsų mobilusis plačiajuostis ryšys nustatytas, naudojant šiuos nustatymus:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.c:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Jūsų įrenginys:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.c:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Jūsų tiekėjas:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Jūsų planas:"
 
-#: ../src/libnma/nma-mobile-wizard.c:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3107,28 +3103,28 @@ 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.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../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-mobile-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nėra sąraše"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Pasirinkite savo planą:"
 
-#: ../src/libnma/nma-mobile-wizard.c:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../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.c:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3141,83 +3137,83 @@ msgstr ""
 "Jeigu nesate tikri dėl savo plano, savo tiekėjo paklauskite jūsų plano APN "
 "(prieigos taško vardo)."
 
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Pasirinkite savo mokėjimo planą"
 
-#: ../src/libnma/nma-mobile-wizard.c:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Mano plano nėra sąraše…"
 
-#: ../src/libnma/nma-mobile-wizard.c:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../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.c:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Tiekėjas"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Nerandu savo tiekėjo ir noriu nurodyti jį _rankiniu būdu:"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Tiekėjas:"
 
-#: ../src/libnma/nma-mobile-wizard.c:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 "Mano tiekėjas naudoja GSM technologiją (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../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.c:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Pasirinkite savo tiekėją"
 
-#: ../src/libnma/nma-mobile-wizard.c:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../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.c:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Šalis ar regionas"
 
-#: ../src/libnma/nma-mobile-wizard.c:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../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:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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.c:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Įdiegtas GSM įrenginys"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Įdiegtas CDMA įrenginys"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3225,84 +3221,84 @@ msgstr ""
 "Šis pagelbiklis leidžia lengvai nustatyti mobilųjį plačiajuostį ryšį su "
 "mobiliuoju (3G) tinklu."
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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.c:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../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.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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.c:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(kai kuriais atvejais) Jūsų plačiajuosčio ryšio mokėjimo plano APN (prieigos "
 "taško vardas)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Sukurti ryšį _šiam mobiliojo plačiajuosčio ryšio įrenginiui:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Bet koks įrenginys"
 
-#: ../src/libnma/nma-mobile-wizard.c:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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.c:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Naujas mobilusis plačiajuostis ryšys"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../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:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../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:55 ../src/libnm-gtk/nm-ui-utils.c:620
+#: ../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:56 ../src/libnm-gtk/nm-ui-utils.c:621
+#: ../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.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Antrinis slaptažodis:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "_Antrinis slaptažodis:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
 msgid "Sh_ow passwords"
 msgstr "R_odyti slaptažodžius"
 
-#: ../src/libnma/nma-wifi-dialog.c:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Spauskite prisijungimui"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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"
@@ -3310,20 +3306,20 @@ msgstr ""
 "Trūksta slaptažodžio arba ryšys yra netinkamas. Pastaruoju atveju reikia "
 "pirma paredaguoti ryšį naudojant nm-connection-editor"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Naujas…"
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nėra"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "Suku_rti"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3331,35 +3327,35 @@ msgstr ""
 "Norint prisijungti prie belaidžio tinklo „%s“ reikalingi slaptažodžiai ar "
 "šifravimo raktai."
 
-#: ../src/libnma/nma-wifi-dialog.c:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Reikia patvirtinti jūsų tapatybę belaidžiame tinkle"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Belaidis tinklas prašo patvirtinti jūsų tapatybę"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Sukurti naują belaidį tinklą"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Naujas belaidis tinklas"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Prisijungti prie paslėpto belaidžio tinklo"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Paslėptas belaidis tinklas"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3379,23 +3375,23 @@ msgstr "_Ryšys:"
 msgid "Wi-Fi _adapter:"
 msgstr "Belaidis _adapteris:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../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:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3405,17 +3401,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Naudojimas:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3423,158 +3419,158 @@ msgstr ""
 "Ši programa yra NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/) dalis."
 
-#: ../src/main.c:53
+#: ../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:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "neįjungta"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "neregistruotas"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Namų tinklas (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Namų tinklas"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ieškoma"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registracija atmesta"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Tarptinklinio ryšio tinklas (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Tarptinklinio ryšio tinklas"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN kodas SIM kortelei „%s“ įrenginyje „%s“"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Reikalingas PIN kodas"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 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:610
+#: ../src/mobile-helpers.c:619
 #, 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:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "tarptinklinis ryšys"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s ryšys"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr "neapibrėžta 802.1x saugumo klaida (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "nenurodyta klaida tikrinant eap-method failą"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:452
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM ar PKCS#12 privatūs raktai (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER arba PEM liudijimai (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "trūksta EAP-FAST PAC failo"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Pasirinkite PAC failą..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC failai (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Visi failai"
 
@@ -3610,32 +3606,32 @@ msgstr "_Vidinis tapatybės nustatymas:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Leisti automatinį PAC _teikimą"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr "trūksta EAP-LEAP naudotojo vardo"
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "trūksta EAP-LEAP slaptažodžio"
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "netinkamas EAP-PEAP LĮ liudijimas: %s"
 
-#: ../src/wireless-security/eap-method-peap.c:69
+#: ../src/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "netinkamas EAP-PEAP LĮ liudijimas: nenurodytas liudijimas"
 
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Pasirinkite liudijimų įstaigos liudijimą…"
 
@@ -3663,46 +3659,46 @@ msgstr "Ne_būtinas LĮ liudijimas"
 msgid "PEAP _version:"
 msgstr "PEAP _versija:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "trūksta EAP naudotojo vardo"
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "trūksta EAP slaptažodžio"
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "trūksta EAP-TLS identiteto"
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "netinkamas EAP-TLS LĮ liudijimas: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "netinkamas EAP-TSL LĮ liudijimas: nenurodytas liudijimas"
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "netinkamas EAP-TLS slaptažodis: trūksta"
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "netinkamas EAP-TLS privatusis raktas: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "netinkamas EAP-TLS naudotojo liudijimas: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Nešifruoti asmeniniai raktai yra nesaugūs"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3716,11 +3712,11 @@ msgstr ""
 "\n"
 "(Galite slaptažodžiu apsaugoti savo asmeninį raktą su openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Pasirinkite savo asmeninį liudijimą…"
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Pasirinkite savo asmeninį raktą…"
 
@@ -3740,36 +3736,36 @@ msgstr "Asmeninis _raktas:"
 msgid "_Private key password:"
 msgstr "_Asmeninio rakto slaptažodis:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "netinkamas EAP-TTLS LĮ liudijimas: %s"
 
-#: ../src/wireless-security/eap-method-ttls.c:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "netinkamas EAP-TTLS LĮ liudijimas: nenurodytas liudijimas"
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../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:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tuneliuojamas TLS"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Apsaugotas EAP (PEAP)"
 
@@ -3779,11 +3775,11 @@ msgstr "Apsaugotas EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Tapatybės nustatymas:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "trūksta leap-username"
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "trūksta leap-password"
 
@@ -3845,7 +3841,7 @@ msgstr "R_odyti raktą"
 msgid "WEP inde_x:"
 msgstr "WEP inde_ksas:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3854,7 +3850,7 @@ 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:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "netinkamas wpa-psk: negalima interpretuoti 64 baitų kaip šešioliktainio "
@@ -3864,6 +3860,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Tipas:"
 
+#~ msgid "_Help"
+#~ msgstr "_Žinynas"
+
 #~ msgid "Infrastructure"
 #~ msgstr "Infrastruktūra"
 
diff --git a/po/lv.po b/po/lv.po
index 7b6ca67f..ab25ab45 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -10,9 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD2\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-09-06 22:10+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-09-07 12:59+0300\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
@@ -24,7 +23,7 @@ msgstr ""
 "2);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Tīkls"
 
@@ -134,46 +133,90 @@ msgstr ""
 "Iestatiet šo kā “patiess”, lai deaktivētu brīdinājumus par CA sertifikātiem "
 "EAP 2. fāzes autentifikācijā."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Network Manager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Network Manager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X autentifikācija"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "Savien_oties"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "Tīkla _nosaukums:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ekspromta"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Neizdevās pievienot/aktivizēt savienojumu"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Nezināma kļūda"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Savienojums neizdevās"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Neizdevās ierīces atvienošana"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Atvienošanās neizdevās"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Savienojuma aktivēšana neizdevās"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Vairs nerādīt šo ziņojumu"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -183,7 +226,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo tika pārtraukts tīkla savienojums."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -192,7 +235,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo VPN serviss negaidīti apstājās."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -203,7 +246,7 @@ msgstr ""
 "VPN savienojums “%s” neizdevās, jo VPN serviss atgrieza nederīgu "
 "konfigurāciju."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -212,7 +255,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo savienošanās mēģinājumam iestājās noildze."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -221,7 +264,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo VPN serviss laicīgi nepalaidās."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -230,7 +273,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo VPN servisam neizdevās palaisties."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -239,7 +282,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās, jo nebija derīgu VPN noslēpumu (secrets)."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -248,7 +291,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās nederīgu VPN noslēpumu (secrets) dēļ."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -257,7 +300,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” neizdevās."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -267,7 +310,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” atvienojās, jo tika pārtraukts tīkla savienojums."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -276,7 +319,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” atvienojās, jo VPN serviss apstājās."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -285,7 +328,7 @@ msgstr ""
 "\n"
 "VPN savienojums “%s” atvienojās."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -296,19 +339,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN savienojums ir veiksmīgi izveidots.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN pieteikšanās ziņojums"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN savienojums neizdevās"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -321,7 +364,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -334,807 +377,550 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "ierīce nav gatava (trūkst aparātprogrammatūras)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "ierīce nav gatava"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "atvienots"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Atvienoties"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "ierīce nav pārvaldīta"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Nav pieejamu tīkla ierīču"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN savienojumi"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Konfigurēt VPN..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Atvienot VPN..."
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nav palaists..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Tīklošana deaktivēta"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Aktivēt tīkloša_nu"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Aktivēt bez_vadu tīklošanu"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Aktivēt _mobilo platjoslas tīklu"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Aktivēt WiMA_X mobilo platjoslas tīklu"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Aktivēt paziņ_ojumus"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Savienojuma _informācija"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Rediģēt savienojumu..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "_Palīdzība"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "P_ar"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Ir savienojums ar “%s”."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Atvienots"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Tīkla savienojums tika atvienots."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Gatavo tīkla savienojumu “%s”..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, 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:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Tiek pieprasīta “%s” tīkla adrese..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Tīkla savienojums “%s” ir aktīvs"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Startē VPN savienojumu “%s”..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Tiek pieprasīta “%s” VPN adrese..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN savienojums “%s” ir aktīvs"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Nav tīkla savienojuma"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager sīklietotne"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Pieejams"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Savienojums ir izveidots"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Ir savienojums ar saistītu tīklu."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Gatavo saistītu savienojumu “%s”..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Konfigurē saistītu savienojumu “%s”..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr ""
-"Saistītajam savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Tiek pieprasīta “%s” adrese..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Saistītais savienojums “%s” ir aktīvs"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Ir savienojums ar tilta tīklu."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Gatavo tilta savienojumu “%s”..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Konfigurē tilta savienojumu “%s”..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Tilta savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Tilta savienojums “%s” ir aktīvs"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Nepareizs PUK kods. Lūdzu, sazinieties ar operatoru."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Sūta atbloķēšanas kodu..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilais platjoslas tīkls (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobilā platjosla"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Pieejams"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Jauns mobilā platjoslas tīkla savienojums..."
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Savienojums ir izveidots"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Ir savienojums ar mobilo platjoslas tīklu."
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobilās platjoslas tīkls."
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 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:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 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:103
+#: ../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:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Gatavo mobilā platjoslas savienojumu “%s”..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Konfigurē mobilā platjoslas savienojumu “%s”..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
 "Mobilā platjoslas savienojumam “%s” ir nepieciešama lietotāja "
 "autentifikācija..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobilais platjoslas savienojums “%s” ir aktīvs"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Jauns mobilā platjoslas tīkla (CDMA) savienojums..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Ir savienojums ar CDMA tīklu."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "CDMA tīkls."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automātisks Ethernet"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Vadu tīkli (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Vadu tīkls (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Vadu tīkli"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Vadu tīkls"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../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:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Gatavo vadu tīkla savienojumu “%s”..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Konfigurē vadu tīkla savienojumu “%s”..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr ""
 "Vadu tīkla savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Tiek pieprasīta “%s” vadu tīkla adrese..."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Vadu tīkla savienojums “%s” ir aktīvs"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL autentifikācija"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Jauns mobilā platjoslas tīkla (GSM) savienojums..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Ir savienojums ar GSM tīklu."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "GSM tīkls."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "Automātisks InfiniBand"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand tīkli (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand tīkls (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "InfiniBand tīkli"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "InfiniBand tīkls"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Jūs esat savienojies ar InfiniBand tīklu."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Gatavo InfiniBand savienojumu “%s”..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Konfigurē InfiniBand savienojumu “%s”..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr ""
-"InfiniBand savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand savienojums “%s” ir aktīvs"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Ir savienojums ar iejūgtu tīklu."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Gatavo iejūgtu savienojumu “%s”..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Konfigurē iejūgtu savienojumu “%s”..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr ""
-"Iejūgtajam savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Iejūgtais savienojums “%s” ir aktīvs"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Ir savienojums ar VLAN."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Gatavo VLAN savienojumu “%s”..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Konfigurē VLAN savienojumu “%s”..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "VLAN savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VLAN savienojums “%s” ir aktīvs"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Savienoties ar slēptu bezvadu tīklu..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Izveidot jau_nu bezvadu tīklu..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(nav)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Bezvadu tīkli (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Bezvadu tīkls (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 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:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Bezvadu tīkls ir deaktivēts"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Bezvadu tīkls ir deaktivēts ar slēdzi datorā"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Vairāk tīklu"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Pieejamie bezvadu tīkli"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 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:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Ir savienojums ar bezvadu tīklu “%s”."
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Gatavo bezvadu tīkla savienojumu “%s”..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Konfigurē bezvadu tīklu savienojumu “%s”..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, 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:1282
+#: ../src/applet-device-wifi.c:1408
 #, 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:1303
+#: ../src/applet-device-wifi.c:1419
 #, 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:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Bezvadu tīkla savienojums “%s” ir aktīvs"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Neizdevās aktivizēt savienojumu"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Neizdevās pievienot jaunu savienojumu"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX mobilais platjoslas tīkls (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX mobilais platjoslas tīkls"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX ir deaktivēts"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX ir deaktivēts ar slēdzi datorā"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Jūs esat savienojies ar WiMAX tīklu."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Mobilā platjoslas tīkla savienojums “%s” ir aktīvs: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "viesabonēšana"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Kļūda, rādot informāciju par savienojumu:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dinamiskais WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adreses"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nekāda"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (noklusējuma)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "nezināms"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "nezināms"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP adrese:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nezināma"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP adrese:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Apraides adrese:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Apakštīkla maska:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nezināma"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Noklusējuma maršruts:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Apakštīkla maska:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Vispārējs"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Saskarne:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Aparatūras adrese:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Draiveris:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Ātrums:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Drošība:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Noklusējuma maršruts:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorēts"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN tips:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN vārteja:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN lietotājvārds:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN karogs:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Bāzes savienojums:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nezināms"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Nav atrastu aktīvu savienojumu!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1142,43 +928,43 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "un daudzi citu kopienas izstrādātāji un tulkotāji"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 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:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager tīmekļa vietne"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Trūkstošie resursi"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Mobilās platjoslas tīkla parole"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Lai savienotos ar “%s”, ir nepieciešama parole."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Ir nepieciešama SIM PIN atbloķēšana"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 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:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1188,25 +974,25 @@ msgstr ""
 "PIN kods."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN kods:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Rādīt PIN kodu"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Ir nepieciešama SIM PUK atbloķēšana"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 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:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1216,27 +1002,34 @@ msgstr ""
 "PUK kods."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK kods:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Jauns PIN kods:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Atkal ievadiet jauno PIN kodu:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Rādīt PIN/PUK kodus"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1246,18 +1039,41 @@ msgstr ""
 "IP adrese identificē datoru tīklā. Spiediet “Pievienot”, lai pievienotu IP "
 "adresi."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Dzēst"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_norēt automātiski saņemtos maršrutus"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1265,9 +1081,8 @@ msgstr ""
 "Ja aktivēts, šis savienojums nekad netiks izmantots kā noklusējuma tīkla "
 "savienojums."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1275,15 +1090,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Izveidot…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1336,48 +1151,41 @@ msgid "Bonded _connections:"
 msgstr "Saistītie _savienojumi:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "Režī_ms:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "R_ežīms:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "R_ediģēt"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "_Dzēst"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "R_ediģēt"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Novērošanas _biežums:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "_Saskarnes nosaukums:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "_Saites novērošana:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP _mērķi:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1385,19 +1193,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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Saites aktivēšanas aizt_ure:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Saites _deaktivēšanas aizture:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Primārais:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1405,12 +1213,30 @@ 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: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:"
+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
+msgid "bytes"
+msgstr "baiti"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 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:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Prioritāte:"
 
@@ -1422,44 +1248,89 @@ msgstr "_Matadatas režīms:"
 msgid "Bridged _connections:"
 msgstr "Ar _tiltu saistītie savienojumi:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "_Pārsūtīšanas aizture:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Sveiciena laiks:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Aktivēt tīkloša_nu"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Aktivēt _STP (savienotā koka protokols)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Maksimālais vecums:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "Novecoš_anas laiks:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automātiski"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "noklusējuma"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adrese"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adrese"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Jebkura ierīce"
+
+#: ../src/connection-editor/ce-page.c:591
 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)."
@@ -1559,77 +1430,77 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Prioritātes plūsmas kontrole"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 "Aktivēt vai deaktivēt prioritāšu pauzi pārsūtīšanai katrai lietotāja "
 "prioritātei."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Prioritāte:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Satiksmes klase:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Strikta platjosla:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Prioritātes platjosla:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Grupas platjosla:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "Grupas ID:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 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:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1638,23 +1509,23 @@ 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 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:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "Aktivēt vai deaktivēt striktu platjoslu katrai lietotāja prioritātei."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 msgid "Enter the traffic class for each user priority."
 msgstr "Ievadiet satiksmes klasi katrai lietotāja prioritātei."
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../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
@@ -1667,7 +1538,7 @@ msgstr "_Serviss:"
 
 #: ../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:4
+#: ../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
@@ -1675,8 +1546,9 @@ msgid "Sho_w password"
 msgstr "_Rādīt paroli"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1688,7 +1560,8 @@ msgstr "_Parole:"
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automātiski"
@@ -1743,18 +1616,18 @@ msgstr "Aut_omātiski vienoties"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "Ierīces _MAC adrese:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Serviss:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "K_lonēta MAC adrese:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1764,19 +1637,54 @@ msgstr ""
 "ierīcei, uz kuras ir aktīvs š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-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "baiti"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Noklusējuma"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorēt"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Apraide"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Privātās atslēgas parole:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1815,8 +1723,8 @@ msgstr "Automātiski ar pašrocīgiem DNS iestatījumiem"
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Pašrocīgi"
 
@@ -1827,8 +1735,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Koplietots ar citiem datoriem"
 
@@ -1842,7 +1750,7 @@ msgstr "_Metode:"
 msgid "Addresses"
 msgstr "Adreses"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1852,8 +1760,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:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1861,25 +1769,25 @@ 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
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:13
+#: ../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:321
+#: ../src/connection-editor/page-ip6.c:306
 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:14
+#: ../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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS serveri:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1887,11 +1795,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1900,13 +1808,13 @@ 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:19
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "Marš_ruti…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Deaktivēts"
 
@@ -1918,7 +1826,7 @@ msgstr "Ieslēgts (dot priekšroku publiskai adresei)"
 msgid "Enabled (prefer temporary address)"
 msgstr "Ieslēgts (dot priekšroku pagaidu adresei)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 "
@@ -1928,15 +1836,15 @@ 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:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 _privātuma paplašinājumi:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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:18
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1946,71 +1854,38 @@ msgstr ""
 "izdodas."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Jebkurš"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Dot priekšroku 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Dot priekšroku 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Dot priekšroku 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Izmantot tikai 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Vienkāršs"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Nu_murs:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Paplašināti"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "_Tīkla ID:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Tips:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Mainīt..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "PI_N:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "_Rādīt paroles"
 
@@ -2076,32 +1951,55 @@ msgid "_Teamed connections:"
 msgstr "Sajūg_tie savienojumi:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "I_mportēt sajūgtā savienojuma konfigurāciju no datnes..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Importēt saglabātu iejūgtu savienojumu no datnes..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Vecāka saskarne:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN saskarnes _nosaukums:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "Klonēta MA_C adrese:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN _id:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Ierīces nosaukums + numurs"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + numurs"
 
@@ -2118,94 +2016,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastruktūra"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ekspromta"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 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.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "Āt_rums:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Kanāls:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_Josla:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "R_ežīms:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "_SSID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Atļautās autentificēšanas metodes"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2214,107 +2116,78 @@ msgstr ""
 "autentifikācijas metodes. Ja neizdodas savienoties, pamēģiniet deaktivēt "
 "dažu metožu atbalstu."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "Adrese"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "Tīkla maska"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "Vārteja"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "Metrika"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "Prefikss"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Vadu"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Bezvadu"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Saistīts"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Sajūgts"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Tilts"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Aparatūra"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtuāls"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Importēt saglabātu VPN savienojumu..."
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2322,29 +2195,79 @@ msgstr ""
 "Nevarēja inicializēt savienojumu redaktora dialoglodziņu, jo gadījās "
 "nezināma kļūda."
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Nevarēja izveidot jaunu savienojumu"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Neizdevās izdzēst savienojumu"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "Adrese"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Tīkla maska"
+
+#: ../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
+msgid "Gateway"
+msgstr "Vārteja"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Metrika"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Prefikss"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Rediģē %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Rediģē nenosauktus savienojumus"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Savienojuma _nosaukums:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Kļūda, inicializējot redaktoru"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Neizdevās pievienot savienojumu"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2352,68 +2275,63 @@ msgstr ""
 "Savienojumu redaktors nevarēja atrast dažus vajadzīgos resursus (.ui datne "
 "netika atrasta)."
 
-#: ../src/connection-editor/nm-connection-editor.c:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Saglabāt"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 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:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Nevarēja izveidot savienojumu"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Nevarēja rediģēt savienojumu"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Nezināma kļūda, veidojot savienojuma redaktora dialoglodziņu."
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Kļūda, inicializējot redaktoru"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Neizdevās pievienot savienojumu"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "Kļūda, saglabājot savienojumu"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Īpašība “%s” / “%s” ir nederīga — %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "Savienojuma _nosaukums:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Eksportēt..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nekad"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "tagad"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2421,7 +2339,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:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2429,7 +2347,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:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2437,7 +2355,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:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2445,7 +2363,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:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2453,78 +2371,121 @@ msgstr[0] "Pirms %d gada"
 msgstr[1] "Pirms %d gadiem"
 msgstr[2] "Pirms %d gadiem"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nosaukums"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Iepriekš lietotās"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Rediģēt izvēlētos savienojumus"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentificējieties, lai rediģētu izvēlētos savienojumus"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Dzēst izvēlētos savienojumus"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentificējieties, lai dzēstu izvēlētos savienojumus"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Nav instalētu VPN spraudņu."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Nezina, kā izveidot “%s” savienojumus"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Kļūda, veidojot savienojumu"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Kļūda, rediģējot savienojumu"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Neatrada savienojumu ar UUID “%s”"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x drošība"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 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:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Šim savienojumam izmantot 802.1_X drošību"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Nevarēja ielādēt DCB lietotāja saskarni."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "neizdevās atrast Bluetooth ierīci."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Saistītais savienojums %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Vadu tīkls"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Bezvadu tīkls"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Nevarēja ielādēt saistīto lietotāja saskarni."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Primārais:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Saistītais savienojums %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Nevarēja ielādēt tilta lietotāja saskarni."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Tilta savienojums %d"
@@ -2532,58 +2493,74 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Tilta ports"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 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:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Nevarēja ielādēt DCB lietotāja saskarni."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Nevarēja ielādēt DSL lietotāja saskarni."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL savienojums %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 piesaista savienojumu noteiktai tīkla ierīcei, kuru raksturo "
 "pastāvīga MAC adrese, kuru ievada šeit. Piemērs: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 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:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Vadu"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "K_lonēta MAC adrese:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:55
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Noklusējuma"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2593,125 +2570,168 @@ 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD nav palaists."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 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:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Nevarēja ielādēt InfiniBand lietotāja saskarni."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand savienojums %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automātiski (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Automātiski (VPN) tikai adreses"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "Automātiski (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "Automātiski (PPP) tikai adreses"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "Automātiski, tikai adreses"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automātiski (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automātiski (PPPoE) tikai adreses"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automātiski (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automātiski (DHCP) tikai adreses"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Tikai lokālais tīkls"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Papildu _DNS serveri:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Papildu m_eklēšanas domēni:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Rediģē %s IPv4 maršrutus"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 iestatījumi"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Nevarēja ielādēt IPv4 lietotāja saskarni."
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "Automātiski, tikai adreses"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorēt"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automātiski, tikai DHCP"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Rediģē %s IPv6 maršrutus"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 iestatījumi"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Nevarēja ielādēt IPv6 lietotāja saskarni."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Dublēt sekotājus"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, 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:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2720,25 +2740,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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s sekotājs %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Nevarēja ielādēt mobilā platjoslas tīkla lietotāja saskarni."
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Neatbalstīts mobilā platjoslas tīkla savienojuma veids."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Izvēlieties mobilā savienojuma piegādātāja veidu"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2746,85 +2766,85 @@ msgstr ""
 "Izvēlieties tehnoloģiju, kuru izmanto mobilā platjoslas tīkla piegādātājs. "
 "Ja neesat pārliecināts, jautājiet piegādātājam."
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 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:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "neviena"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP iestatījumi"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Nevarēja ielādēt PPP lietotāja saskarni."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Izvēlieties datni, ko importēt"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Kļūda — datne nesatur derīgu JSON konfigurāciju"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Nevarēja ielādēt sajūgto lietotāja saskarni."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Sajūgts savienojums %d"
@@ -2832,47 +2852,56 @@ 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:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Sajūguma ports"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (caur \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Nav tīkla savienojuma"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Nevarēja ielādēt vlan lietotāja saskarni."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN savienojums %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Nevarēja ielādēt VPN lietotāja saskarni."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Nevarēja atrast VPN spraudņa servisu “%s”"
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN savienojums %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2882,11 +2911,11 @@ msgstr ""
 "\n"
 "Kļūda — nav VPN servisa tips."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Izvēlieties VPN savienojumu veidu"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2896,7 +2925,7 @@ msgstr ""
 "vajadzīgais VPN savienojuma veids, iespējams, ka nav uzstādīts vajadzīgais "
 "VPN spraudnis."
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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"
@@ -2904,75 +2933,95 @@ msgstr ""
 "Šī opcija piesaista savienojumu noteiktam 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:201
+#: ../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)\""
+msgstr ""
+"Šī opcija piesaista savienojumu noteiktai tīkla ierīcei, kuru raksturo "
+"pastāvīga MAC adrese, kuru ievada šeit. Piemērs: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Nevarēja ielādēt bezvadu lietotāja saskarni."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Jebkura ierīce"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Bezvadu tīkla savienojums %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Dinamiskais WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA un WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA un WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Bezvadu tīkla drošība"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 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-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "Nevarēja ielādēt WiMAX lietotāja saskarni."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX savienojums %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Nevar importēt VPN savienojumu"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2985,25 +3034,30 @@ msgstr ""
 "\n"
 "Kļūda — %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Nezināma kļūda"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Datne ar nosaukumu “%s” jau eksistē."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Aizvietot"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Nevar eksportēt VPN savienojumu"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3014,11 +3068,11 @@ msgstr ""
 "\n"
 "Kļūda — %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Eksportē VPN savienojumu..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -3026,99 +3080,11 @@ msgstr ""
 "Tīkla NetworkManager sīklietotne nevarēja atrast dažus pieprasītos resursus "
 "(.ui datne netika atrasta)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Neizdevās Bluetooth konfigurācija (neizdevās savienoties ar D-Bus — (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Neizdevās Bluetooth konfigurācija (kļūda, meklējot NetworkManager — (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Izmantojiet savu mobilo tālruni kā tīkla ierīci (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Piekļūstiet Internetam, izmantojot savu mobilo tālruni (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Kļūda — %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Neizdevās izveidot DUN savienojumu — %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "Tālrunis ir gatavs lietošanai!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Mobilā vednis tika atcelts"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Nezināms tālruņa ierīces veids (nav GSM vai CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "nezināms modema tips."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "neizdevās savienoties ar tālruni."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "kļūda, saņemot kopnes savienojumu"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "negaidīti atvienojies no tālruņa."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "iestājās noildze, nosakot tālruņa informāciju."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "Nosaka tālruņa konfigurāciju..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Noklusējuma Bluetooth iekārtai ir jābūt ieslēgtai, pirms Dial-Up-Networking "
-"savienojuma iestatīšanas."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Neizdevās izveidot PAN savienojumu — %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "%s tīkls"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Atbloķēt"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Automātiski atbloķēt šo ierīci"
 
@@ -3126,11 +3092,12 @@ msgstr "Automātiski atbloķēt šo ierīci"
 msgid "Connection Information"
 msgstr "Savienojuma informācija"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Aktīvi tīkla savienojumi"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
@@ -3138,21 +3105,25 @@ msgstr ""
 "iestatījumiem:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Jūsu ierīce:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Jūsu operators:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Jūsu plāns:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3166,23 +3137,28 @@ msgstr ""
 "mobilā platjoslas tīkla iestatījumus, izvēlieties “Tīkla savienojumi” no "
 "Sistēma >> Iestatījumi izvēlnes."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Apstiprināt mobilā platjoslas tīkla iestatījumus"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nav sarakstā"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "Izvēlietie_s plānu:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3194,67 +3170,83 @@ msgstr ""
 "\n"
 "Ja nezināt, kāds jums ir plāns, jautājiet sava plāna APN."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Izvēlieties rēķina plānu"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Mans plāns nav sarakstā..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Izvē_lieties operatoru no saraksta:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Operators"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Es nevaru atrast savu operatoru un vēlos to ievadīt _pašrocīgi:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Operators:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 "Mans operators izmanto GSM tehnoloģiju (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Izvēlieties savu operatoru"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../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:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Valsts vai reģions"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Mana valsts nav sarakstā"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Izvēlieties operatora valsti vai reģionu"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Uzstādītā GSM ierīce"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Uzstādītā CDMA ierīce"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3262,89 +3254,108 @@ msgstr ""
 "Šis asistents palīdzēs jums ērti uzstādīt mobilā platjoslas tīkla "
 "savienojumu ar mobilo (3G) tīklu."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Jums vajadzēs sekojošo informāciju:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Jūsu platjoslas operatora nosaukums"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Jūsu platjoslas rēķinu plāna nosaukums"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(dažos gadījumos) platjoslas rēķinu plāna APN (pieejas punkta nosaukums)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Izveidot savienojumu šai mobilā pla_tjoslas tīkla ierīcei:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Jebkura ierīce"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Iestatīt mobilā platjoslas tīkla savienojumu"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Jauns mobilā platjoslas tīkla savienojums"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Vadu"
+#: ../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_glabāt paroli tikai šim lietotājam"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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_aglabāt paroli visiem lietotājiem"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC režģtīkls"
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "_Katru reizi prasīt paroli"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#, fuzzy
+msgid "The password is not required"
+msgstr "Lai savienotos ar “%s”, ir nepieciešama parole."
 
-#: ../src/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Sekundārā parole:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Sekundārā parole:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+msgid "Sh_ow passwords"
+msgstr "Rādīt par_oles"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Atvienoties"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Jauns..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nav"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "Iz_veidot"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3352,35 +3363,35 @@ msgstr ""
 "Lai piekļūtu bezvadu tīklam “%s”, ir nepieciešamas paroles vai šifrēšanas "
 "atslēgas."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Nepieciešama bezvadu tīkla autentifikācija"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Bezvadu tīklam ir nepieciešama autentifikācija"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Izveidot jaunu bezvadu tīklu"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Jauns bezvadu tīklu"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Ievadiet izveidojamā bezvadu tīkla nosaukumu."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Savienoties ar slēptu bezvadu tīklu"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Slēpts bezvadu tīkls"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3388,31 +3399,55 @@ msgstr ""
 "Ievadiet nosaukumu un drošības iestatījums bezvadu tīklam, ar kuru vēlaties "
 "savienoties."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Sekundārā parole:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "Rādīt par_oles"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Bez_vadu drošība:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Savien_ojums:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Bezv_adu tīkla ierīce:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC režģtīkls"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Lietojums:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3420,144 +3455,157 @@ msgstr ""
 "Šī programmatūra ir daļa no NetworkManager (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nav aktivēts"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nav reģistrēts"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Mājas tīkls (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Mājas tīkls"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "meklē"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "reģistrācija ir liegta"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Viesabonēšanas tīkls (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Viesabonēšanas tīkls"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN kods SIM kartei “%s” ierīcē “%s”"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Ir nepieciešams PIN kods"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Mobilā platjoslas tīkla ierīcei ir vajadzīgs PIN kods"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Mobilā platjoslas tīkla savienojums “%s” ir aktīvs: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "viesabonēšana"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s savienojums"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Sa_glabāt paroli tikai šim lietotājam"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "S_aglabāt paroli visiem lietotājiem"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER vai PEM sertifikāti (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Izvēlieties PAC datni..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC datne (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Visas datnes"
 
@@ -3593,15 +3641,32 @@ msgstr "_Iekšējā autentifikācija:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Atļaut automātisku PAC _nodrošinājumu"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Izvēlieties sertificēšanas institūcijas sertifikātu..."
 
@@ -3629,15 +3694,46 @@ msgstr "Nav nepieciešams CA se_rtifikāts"
 msgid "PEAP _version:"
 msgstr "PEAP _versija:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "_Katru reizi prasīt paroli"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A sertifikāts:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Nešifrētas privātās atslēgas nav drošas"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3651,11 +3747,11 @@ msgstr ""
 "\n"
 "(Savu privāto atslēgu varat aizsargāt ar paroli ar openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Izvelieties personīgo sertifikātu..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Izvēlieties privāto atslēgu..."
 
@@ -3675,23 +3771,36 @@ msgstr "Privātā _atslēga:"
 msgid "_Private key password:"
 msgstr "_Privātās atslēgas parole:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunelēts TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Aizsargāts EAP (PEAP)"
 
@@ -3701,6 +3810,44 @@ msgstr "Aizsargāts EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Au_tentifikācija:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (noklusētais)"
@@ -3725,6 +3872,297 @@ msgstr "_Rādīt atslēgu"
 msgid "WEP inde_x:"
 msgstr "WEP inde_kss:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Tips:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Aktivēt WiMA_X mobilo platjoslas tīklu"
+
+#~ msgid "_Help"
+#~ msgstr "_Palīdzība"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Ir savienojums ar saistītu tīklu."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Gatavo saistītu savienojumu “%s”..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Konfigurē saistītu savienojumu “%s”..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr ""
+#~ "Saistītajam savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Tiek pieprasīta “%s” adrese..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Saistītais savienojums “%s” ir aktīvs"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Ir savienojums ar tilta tīklu."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Gatavo tilta savienojumu “%s”..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Konfigurē tilta savienojumu “%s”..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr ""
+#~ "Tilta savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Tilta savienojums “%s” ir aktīvs"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Jauns mobilā platjoslas tīkla (CDMA) savienojums..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Ir savienojums ar CDMA tīklu."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA tīkls."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Jauns mobilā platjoslas tīkla (GSM) savienojums..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Ir savienojums ar GSM tīklu."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM tīkls."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "Automātisks InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand tīkli (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand tīkls (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand tīkli"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand tīkls"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Jūs esat savienojies ar InfiniBand tīklu."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Gatavo InfiniBand savienojumu “%s”..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Konfigurē InfiniBand savienojumu “%s”..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr ""
+#~ "InfiniBand savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand savienojums “%s” ir aktīvs"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Ir savienojums ar iejūgtu tīklu."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Gatavo iejūgtu savienojumu “%s”..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Konfigurē iejūgtu savienojumu “%s”..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr ""
+#~ "Iejūgtajam savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Iejūgtais savienojums “%s” ir aktīvs"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Ir savienojums ar VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Gatavo VLAN savienojumu “%s”..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Konfigurē VLAN savienojumu “%s”..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "VLAN savienojumam “%s” ir nepieciešama lietotāja autentifikācija..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN savienojums “%s” ir aktīvs"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX mobilais platjoslas tīkls (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX mobilais platjoslas tīkls"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX ir deaktivēts"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX ir deaktivēts ar slēdzi datorā"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Jūs esat savienojies ar WiMAX tīklu."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "nezināms"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "nezināms"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "Režī_ms:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Ierīces _MAC adrese:"
+
+#~ msgid "Any"
+#~ msgstr "Jebkurš"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Dot priekšroku 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Dot priekšroku 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Dot priekšroku 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Izmantot tikai 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "I_mportēt sajūgtā savienojuma konfigurāciju no datnes..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastruktūra"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Kļūda, saglabājot savienojumu"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Īpašība “%s” / “%s” ir nederīga — %d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Automātiski (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Automātiski (PPP) tikai adreses"
+
+#~ msgid "Could not load WiMAX user interface."
+#~ msgstr "Nevarēja ielādēt WiMAX lietotāja saskarni."
+
+#~ msgid "WiMAX connection %d"
+#~ msgstr "WiMAX savienojums %d"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Neizdevās Bluetooth konfigurācija (neizdevās savienoties ar D-Bus — (%s) "
+#~ "%s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Neizdevās Bluetooth konfigurācija (kļūda, meklējot NetworkManager — (%s) "
+#~ "%s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Izmantojiet savu mobilo tālruni kā tīkla ierīci (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Piekļūstiet Internetam, izmantojot savu mobilo tālruni (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Kļūda — %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Neizdevās izveidot DUN savienojumu — %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Tālrunis ir gatavs lietošanai!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Mobilā vednis tika atcelts"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Nezināms tālruņa ierīces veids (nav GSM vai CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "nezināms modema tips."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "neizdevās savienoties ar tālruni."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "kļūda, saņemot kopnes savienojumu"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "negaidīti atvienojies no tālruņa."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "iestājās noildze, nosakot tālruņa informāciju."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Nosaka tālruņa konfigurāciju..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Noklusējuma Bluetooth iekārtai ir jābūt ieslēgtai, pirms Dial-Up-"
+#~ "Networking savienojuma iestatīšanas."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Neizdevās izveidot PAN savienojumu — %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s tīkls"
+
 #~ msgid "Primary DNS:"
 #~ msgstr "Primārais DNS:"
 
@@ -3835,9 +4273,6 @@ msgstr "WEP inde_kss:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "Nezina, kā rediģēt “%s” savienojumus"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "neizdevās atrast Bluetooth ierīci."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr ""
 #~ "Neizdevās Bluetooth konfigurācija (neizdevās izveidot D-Bus starpnieku)."
@@ -3857,9 +4292,6 @@ msgstr "WEP inde_kss:"
 #~ msgid "label"
 #~ msgstr "etiķete"
 
-#~ msgid "Network Manager"
-#~ msgstr "Network Manager"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "Jau ir palaista nm-applet instance.\n"
 
diff --git a/po/mk.po b/po/mk.po
index 8e2e7825..0dbe5d75 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -10,737 +10,943 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2011-12-08 08:32+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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
-#| msgid "No network connection"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+msgid "Network"
+msgstr "Мрежа"
+
+#: ../nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr "Менаџирајте со Вашите мрежни врски"
 
-#: ../nm-applet.desktop.in.h:2
-#| msgid "GSM Network"
-msgid "Network"
-msgstr "Мрежа"
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "Мрежни врски"
 
-#: ../nm-applet.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr "Оневозможи креирање на WiFi"
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "Управувајте и променувајте ги поставувањата на Вашата мрежна врска"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "Оневозможи ги сите известувања за поврзување"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, 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
 msgid "Disable disconnected notifications"
 msgstr "Оневозможи ги сите известувања за исклучување"
 
-#: ../nm-applet.schemas.in.h:4
-msgid "Set this to TRUE to disable notifications when connecting to a network."
-msgstr "Поставете го ова на TRUE за да ги оневозможите известувањата при поврзување на мрежа."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+"Поставете го ова на TRUE за да ги оневозможите известувањата при исклучување "
+"од мрежа."
 
-#: ../nm-applet.schemas.in.h:5
-msgid "Set this to TRUE to disable notifications when disconnecting from a network."
-msgstr "Поставете го ова на TRUE за да ги оневозможите известувањата при исклучување од мрежа."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Оневозможи ги сите известувања за поврзување"
 
-#: ../nm-applet.schemas.in.h:6
-msgid "Set this to TRUE to disable notifications when wireless networks are available."
-msgstr "Поставете го ова на TRUE за да ги оневозможите известувањата кога се достапни безжични мрежи."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Поставете го ова на TRUE за да ги оневозможите известувањата при исклучување "
+"од мрежа."
 
-#: ../nm-applet.schemas.in.h:7
-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:7
+msgid "Suppress networks available notifications"
+msgstr "Скриј ги известувањата за достапни мрежи"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"Поставете го ова на TRUE за да ги оневозможите известувањата кога се "
+"достапни безжични мрежи."
 
-#: ../nm-applet.schemas.in.h:8
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "Марка"
 
-#: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
-msgstr "Скриј ги известувањата за достапни мрежи"
-
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
 msgid "Used to determine whether settings should be migrated to a new version."
-msgstr "Се користи за да се одреди дали поставувањата ќе се мигрираат на понова верзија."
+msgstr ""
+"Се користи за да се одреди дали поставувањата ќе се мигрираат на понова "
+"верзија."
 
-#: ../nm-connection-editor.desktop.in.h:1
-#| msgid "Manage Virtual Private Network Connections"
-msgid "Manage and change your network connection settings"
-msgstr "Управувајте и променувајте ги поставувањата на Вашата мрежна врска"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
+msgid "Disable WiFi Create"
+msgstr "Оневозможи креирање на WiFi"
 
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "Network Connections"
-msgstr "Мрежни врски"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"Поставете го ова на TRUE за да го оневозможите креирањето на adhoc мрежи "
+"кога се користи овој аплет."
 
-#: ../src/applet-device-bt.c:174
-#: ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446
-#: ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:875
-#: ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "Достапно"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Изберете CA сертификат"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Аплет за менаџирање со мрежи"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Аплет за менаџирање со мрежи"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "В_рзи се"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "Име на _мрежа:"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "Не успеав да креирам PAN врска: %s"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "Непознато"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "Додавањето на врска не успеа"
+
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "прекината врска"
 
-#: ../src/applet-device-bt.c:200
-#: ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488
-#: ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "Прекината врска"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "Додавањето на врска не успеа"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "Не ја покажувај оваа порака повторно"
+
+#: ../src/applet.c:844
 #, c-format
-#| msgid "You are now connected to the wireless network '%s'."
-msgid "You are now connected to '%s'."
-msgstr "Сега сте поврзани со „%s“."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа поради тоа што мрежната врска беше прекината."
 
-#: ../src/applet-device-bt.c:204
-#: ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492
-#: ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1278
-#: ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "Врската е воспоставена"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа поради тоа што VPN сервисот прекина неочекувано."
 
-#: ../src/applet-device-bt.c:205
-#| msgid "You are now connected to the wired network."
-msgid "You are now connected to the mobile broadband network."
-msgstr "Сега сте поврзани со широкопојасна мобилна мрежа."
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа поради тоа што VPN сервисот врати невалидна "
+"конфигурација."
 
-#: ../src/applet-device-bt.c:231
-#: ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528
-#: ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "Ја подготвувам мобилната широкопојасна врска „%s“..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа поради тоа што обидот за врска истече."
 
-#: ../src/applet-device-bt.c:234
-#: ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531
-#: ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "Ја конфигурирам мобилната широкопојасна врска „%s“..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа поради тоа што VPN сервисот не се стартуваше на "
+"време."
 
-#: ../src/applet-device-bt.c:237
-#: ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534
-#: ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "Потребна е автентикација на корисникот за мобилната широкопојасна врска „%s“..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа поради тоа што VPN сервисот не успеа да се "
+"стартува."
 
-#: ../src/applet-device-bt.c:240
-#: ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:537
-#: ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2479
+#: ../src/applet.c:862
 #, c-format
-#| msgid "Requesting a network address from the wireless network '%s'..."
-msgid "Requesting a network address for '%s'..."
-msgstr "Барам мрежна адреса за „%s“..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа поради тоа што немаше валидни VPN информации за "
+"најава."
 
-#: ../src/applet-device-bt.c:244
-#: ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "Мобилната широкопојасна врска „%s“ е активна"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа поради тоа што немаше валидни VPN информации за "
+"најава."
 
-#: ../src/applet-device-cdma.c:184
-#: ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-#| msgid "CDMA (%s)"
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа."
 
-#: ../src/applet-device-cdma.c:345
-#: ../src/applet-device-gsm.c:392
-#: ../src/applet-dialogs.c:430
+#: ../src/applet.c:888
 #, c-format
-#| msgid "Mobile Broadband"
-msgid "Mobile Broadband (%s)"
-msgstr "Мобилен широкопојасен пристап (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа поради тоа што мрежната врска беше прекината"
 
-#: ../src/applet-device-cdma.c:347
-#: ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1474
-msgid "Mobile Broadband"
-msgstr "Мобилен бродбенд"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа поради тоа што VPN сервисот прекина."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Нова мобилна широкопојасна врска (CDMA)..."
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"VPN врската „%s“ се исклучи."
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "Сега сте поврзани на CDMA мрежата."
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
 
-#: ../src/applet-device-cdma.c:503
-#: ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "VPN најавна порака"
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "VPN врската не успеа"
+
+#: ../src/applet.c:990
 #, c-format
-#| msgid "Wireless network connection to '%s' (%d%%)"
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Мобилната широкопојасна врска „%s“ е активна: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа поради тоа што VPN сервисот не успеа да се "
+"стартува.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:506
-#: ../src/applet-device-gsm.c:553
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "роминг"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN врската „%s“ не успеа да стартува.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:647
-#: ../src/applet-device-cdma.c:653
-#| msgid "CDMA Network"
-msgid "CDMA network."
-msgstr "CDMA мрежа."
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "уредот не е подготвен (недостасува firmware)"
 
-#: ../src/applet-device-cdma.c:648
-#: ../src/applet-device-gsm.c:1198
-#| msgid "You are now connected to the wired network."
-msgid "You are now registered on the home network."
-msgstr "Сега сте поврзани со домашната мрежа."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "уредот не е подготвен"
 
-#: ../src/applet-device-cdma.c:654
-#: ../src/applet-device-gsm.c:1204
-#| msgid "You are now connected to the wired network."
-msgid "You are now registered on a roaming network."
-msgstr "Сега сте поврзани со роаминг мрежа."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "прекината врска"
 
-#: ../src/applet-device-gsm.c:213
-#: ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "Исклучи се"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:459
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Нова мобилна широкопојасна врска (GSM)..."
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "уредот не е менаџиран"
 
-#: ../src/applet-device-gsm.c:493
-msgid "You are now connected to the GSM network."
-msgstr "Сега сте поврзани на GSM мрежата."
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "Нема достапни мрежни уреди"
 
-#: ../src/applet-device-gsm.c:654
-msgid "PIN code required"
-msgstr "Потребен е PIN код"
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "_VPN поврзувања"
 
-#: ../src/applet-device-gsm.c:662
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "Потребен е PIN код за мобилниот широкопојасен уред"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "_Конфигурирај VPN..."
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "_Исклучи се од VPN"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "Менаџерот за мрежа работи..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "Вмрежувањето е оневозможено"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "Овозможи _вмрежување"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "Овозможи _безжична мрежа"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "Овозможи _мобилна широкопојасна врска"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "Овозможи и_звестувања"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "_Информации за поврзувањето"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "Уреди врски..."
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_За"
 
-#: ../src/applet-device-gsm.c:783
+#: ../src/applet.c:2179
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "PIN код за SIM картичката „%s“ на „%s“"
+msgid "You are now connected to '%s'."
+msgstr "Сега сте поврзани со „%s“."
 
-#: ../src/applet-device-gsm.c:875
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Погрешен PIN код. Ве молам, контактирајте со Вашиот оператор."
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "Прекината врска"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "Мрежното поврзување се прекина"
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Ја подготвувам мрежата врска „%s“..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "Потребна е автентикација на корисникот за мрежната врска „%s“..."
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Барам мрежна адреса за „%s“..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "Мрежната врска „%s“ е активна"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Ја започнувам VPN врската „%s“..."
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "Потребна е автентикација на корисникот за VPN врската „%s“..."
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Барам VPN адреса за „%s“..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN врската „%s“ е активна"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "Нема мрежна врска"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "Аплет за менаџирање со мрежи"
+
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Погрешен PUK код. Ве молам, контактирајте со Вашиот оператор."
 
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "Погрешен PIN код. Ве молам, контактирајте со Вашиот оператор."
+
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:925
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Испраќам код за отклучување..."
 
-#: ../src/applet-device-gsm.c:988
-msgid "SIM PIN unlock required"
-msgstr "Потребно е отклучување со PIN за SIM картичката"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Мобилен широкопојасен пристап (%s)"
 
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN Unlock Required"
-msgstr "Потребно е отклучување со PIN за SIM картичката"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "Мобилен бродбенд"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
-#, c-format
-msgid "The mobile broadband device '%s' requires a SIM PIN code before it can be used."
-msgstr "На мобилниот широкопојасен уред „%s“ му треба SIM PIN код пред да може да се користи."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Достапно"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
-msgid "PIN code:"
-msgstr "PIN код:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "Нова мобилна широкопојасна врска"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
-msgid "Show PIN code"
-msgstr "Покажи го PIN кодот"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Врската е воспоставена"
 
-#: ../src/applet-device-gsm.c:1000
-msgid "SIM PUK unlock required"
-msgstr "Потребно е отклучување на SIM картичката со PUK"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "Сега сте поврзани со широкопојасна мобилна мрежа."
 
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK Unlock Required"
-msgstr "Потребно е отклучување на SIM картичката со PUK"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "Лозинка за широкопојасна мобилна мрежа"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
-#, c-format
-msgid "The mobile broadband device '%s' requires a SIM PUK code before it can be used."
-msgstr "На мобилниот широкопојасен уред „%s“ му треба SIM PUK код пред да може да се користи."
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "Сега сте поврзани со домашната мрежа."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
-msgid "PUK code:"
-msgstr "PUK код:"
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "Сега сте поврзани со роаминг мрежа."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "New PIN code:"
-msgstr "Нов PIN код:"
+#: ../src/applet-device-bt.c:88
+msgid "You are now connected to the mobile broadband network."
+msgstr "Сега сте поврзани со широкопојасна мобилна мрежа."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
-msgid "Re-enter new PIN code:"
-msgstr "Повторно внесете го новиот PIN код:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "Ја подготвувам мобилната широкопојасна врска „%s“..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
-msgid "Show PIN/PUK codes"
-msgstr "Покажи ги PIN/PUK кодовите"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "Ја конфигурирам мобилната широкопојасна врска „%s“..."
+
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr ""
+"Потребна е автентикација на корисникот за мобилната широкопојасна врска "
+"„%s“..."
 
-#: ../src/applet-device-gsm.c:1197
-#: ../src/applet-device-gsm.c:1203
-#| msgid "GSM Network"
-msgid "GSM network."
-msgstr "GSM мрежа."
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "Мобилната широкопојасна врска „%s“ е активна"
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Автоматски етернет"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "Жичени мрежи (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "Мрежа (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "Жичени мрежи"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "Жичена мрежа"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232
-#: ../src/applet.c:1485
-#| msgid "Disconnected"
-msgid "disconnected"
-msgstr "прекината врска"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "Сега сте поврзани со жичената мрежа."
 
-#: ../src/applet-device-wired.c:300
-#, c-format
-#| msgid "Wireless network connection to '%s'"
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "Ја подготвувам жичената мрежна врска „%s“..."
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-#| msgid "Wireless network connection to '%s'"
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "Ја конфигурирам жичената мрежна врска „%s“..."
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Потребна е автентикација на корисник за безжичната мрежа „%s“..."
 
-#: ../src/applet-device-wired.c:309
-#, c-format
-#| msgid "Requesting a network address from the wireless network '%s'..."
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Барам адреса за жичената мрежна врска „%s“..."
 
-#: ../src/applet-device-wired.c:313
-#, c-format
-#| msgid "Wired network connection"
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "Жичената мрежна врска %s е активна"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL автентикација"
 
-#: ../src/applet-device-wifi.c:97
-#| msgid "_Connect to Other Wireless Network..."
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Поврзи се со скриена безжична мрежа..."
 
-#: ../src/applet-device-wifi.c:150
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "Креирај _нова безжична мрежа..."
 
-#: ../src/applet-device-wifi.c:294
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ништо)"
 
-#: ../src/applet-device-wifi.c:803
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "Безжични мрежи (%s)"
-
-#: ../src/applet-device-wifi.c:805
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "Безжична мрежа (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Жичени мрежи (%s)"
 
-#: ../src/applet-device-wifi.c:807
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Безжична мрежа"
-msgstr[1] "Безжични мрежи"
-msgstr[2] "Безжични мрежи"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Мрежа (%s)"
 
-#: ../src/applet-device-wifi.c:840
-#| msgid "Networking disabled"
-msgid "wireless is disabled"
-msgstr "безжичната врска е оневозможена"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Жичена мрежа"
+msgstr[1] "Жичена мрежа"
+msgstr[2] "Жичена мрежа"
+
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "WiMAX е оневозможен"
 
-#: ../src/applet-device-wifi.c:841
-msgid "wireless is disabled by hardware switch"
-msgstr "безжичниот уред е оневозможен од хардверски прекинувач"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WiMAX е оневозможен од хардверски прекинувач"
 
-#: ../src/applet-device-wifi.c:902
-#| msgid "Wired Networks"
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Повеќе мрежи"
 
-#: ../src/applet-device-wifi.c:1081
-#| msgid "Wireless Network"
-#| msgid_plural "Wireless Networks"
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "Достапни безични мрежи"
 
-#: ../src/applet-device-wifi.c:1082
-#| msgid "You are now connected to the wireless network '%s'."
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Користете го менито за мрежи за да се поврзите на безжична мрежа"
 
-#: ../src/applet-device-wifi.c:1085
-#: ../src/applet.c:901
-#| msgid "Don't warn me again"
-msgid "Don't show this message again"
-msgstr "Не ја покажувај оваа порака повторно"
-
-#: ../src/applet-device-wifi.c:1277
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, fuzzy, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Сега сте поврзани со безжичната мрежа %s."
 
-#: ../src/applet-device-wifi.c:1308
-#, c-format
-#| msgid "Wireless network connection to '%s'"
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Ја подготвувам безжичната мрежна врска „%s“..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Ја подготвувам мрежата врска „%s“..."
 
-#: ../src/applet-device-wifi.c:1311
-#, c-format
-#| msgid "Wireless network connection to '%s'"
-msgid "Configuring wireless network connection '%s'..."
-msgstr "Ја конфигурирам безжичната мрежна врска „%s“..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Ја конфигурирам жичената мрежна врска „%s“..."
 
-#: ../src/applet-device-wifi.c:1314
-#, c-format
-#| msgid "Preparing device %s for the wireless network '%s'..."
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Потребна е автентикација на корисникот за безжичната мрежа „%s“..."
 
-#: ../src/applet-device-wifi.c:1317
-#, c-format
-#| msgid "Requesting a network address from the wireless network '%s'..."
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Барам мрежна адреса од безжичната мрежа %s..."
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "Барам мрежна адреса за „%s“..."
 
-#: ../src/applet-device-wifi.c:1338
-#, c-format
-#| msgid "Wireless network connection to '%s' (%d%%)"
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Безжичната мрежна врска „%s“ е активна: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1343
-#, c-format
-#| msgid "Wireless network connection to '%s'"
-msgid "Wireless network connection '%s' active"
-msgstr "Безжичната мрежна врска „%s“ е активна"
-
-#: ../src/applet-device-wimax.c:231
-#, c-format
-#| msgid "Mobile Broadband"
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX мобилен широкопојасен пристап (%s)"
-
-#: ../src/applet-device-wimax.c:233
-#| msgid "Mobile Broadband"
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX мобилен широкопојасен пристап"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "WiMAX е оневозможен"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Жичената мрежна врска %s е активна"
 
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX е оневозможен од хардверски прекинувач"
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "Не успеав да креирам PAN врска: %s"
 
-#: ../src/applet-device-wimax.c:428
-#| msgid "You are now connected to the CDMA network."
-msgid "You are now connected to the WiMAX network."
-msgstr "Сега сте поврзани на WiMAX мрежа."
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "Не можев да ја уредам новата врска"
 
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Грешка во прикажувањето на информациите за поврзувањето:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/libnm-gtk/nm-wireless-dialog.c:949
-#: ../src/wireless-security/wireless-security.c:396
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Динамичен WEP"
 
-#: ../src/applet-dialogs.c:113
-#: ../src/applet-dialogs.c:246
-#: ../src/applet-dialogs.c:248
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:244
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Адреси"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:252
-#: ../src/applet-dialogs.c:261
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/libnm-gtk/nm-wireless-dialog.c:906
-#| msgid "None"
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ништо"
 
-#: ../src/applet-dialogs.c:352
-#: ../src/applet-dialogs.c:490
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "1 (стандардно)"
+
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:354
-#: ../src/applet-dialogs.c:492
-#| msgid "Unknown"
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../src/applet-dialogs.c:367
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Непознато"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP Адреса:"
 
 #: ../src/applet-dialogs.c:369
-#| msgid "Unknown"
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "Непознато"
+msgid "Broadcast Address:"
+msgstr "Адреса за емитување:"
 
+#. Prefix
 #: ../src/applet-dialogs.c:381
-#| msgid "Unknown"
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
+msgctxt "Subnet Mask"
+msgid "Unknown"
 msgstr "Непознато"
 
-#: ../src/applet-dialogs.c:416
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Мрежна маска:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Етернет (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:426
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:428
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:432
-#, c-format
-#| msgid "CDMA (%s)"
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:438
-#: ../src/applet-dialogs.c:797
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Општо"
 
-#: ../src/applet-dialogs.c:442
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Уред:"
 
-#: ../src/applet-dialogs.c:458
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Хардверска адреса:"
 
 #. Driver
-#: ../src/applet-dialogs.c:466
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Драјвер:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Безбедност:"
 
-#: ../src/applet-dialogs.c:518
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:531
-#| msgid "_BSSID:"
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:559
-#: ../src/applet-dialogs.c:666
-msgid "IP Address:"
-msgstr "IP Адреса:"
-
-#: ../src/applet-dialogs.c:561
-#: ../src/applet-dialogs.c:577
-#| msgid "Unknown"
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Непознато"
-
-#: ../src/applet-dialogs.c:575
-msgid "Broadcast Address:"
-msgstr "Адреса за емитување:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:584
-msgid "Subnet Mask:"
-msgstr "Мрежна маска:"
-
-#: ../src/applet-dialogs.c:586
-#| msgid "Unknown"
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Непознато"
-
-#: ../src/applet-dialogs.c:594
-#: ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Стандардна насока:"
 
-#: ../src/applet-dialogs.c:606
-msgid "Primary DNS:"
-msgstr "Примарен DNS:"
-
-#: ../src/applet-dialogs.c:615
-msgid "Secondary DNS:"
-msgstr "Секундарен DNS:"
-
-#: ../src/applet-dialogs.c:625
-#| msgid "Secondary DNS:"
-msgid "Ternary DNS:"
-msgstr "Тернарен DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:649
-#| msgid "Ignore"
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Игнорирано"
 
-#: ../src/applet-dialogs.c:802
-#| msgid "Type:"
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Тип на VPN:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN премин:"
 
-#: ../src/applet-dialogs.c:815
-#| msgid "User Name:"
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Корисничко име за VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN банер:"
 
-#: ../src/applet-dialogs.c:827
-#| msgid "GSM Connections"
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Основна врска:"
 
-#: ../src/applet-dialogs.c:829
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Непознато"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:892
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Не се пронајдени валидни врски!"
 
-#: ../src/applet-dialogs.c:945
-#| msgid ""
-#| "Copyright © 2004-2008 Red Hat, Inc.\n"
-#| "Copyright © 2005-2008 Novell, Inc."
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -748,1476 +954,2173 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "и многу други придонесувачи од заедницата и преведувачи"
 
-#: ../src/applet-dialogs.c:948
-msgid "Notification area applet for managing your network devices and connections."
-msgstr "Аплет во местото за известување за менаџирање на мрежните уреди и поврзувања."
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr ""
+"Аплет во местото за известување за менаџирање на мрежните уреди и поврзувања."
 
-#: ../src/applet-dialogs.c:950
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Веб сајтот на NetworkManager"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Недостастуваат ресурси"
 
-#: ../src/applet-dialogs.c:990
-#| msgid "Mobile Broadband"
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Лозинка за широкопојасна мобилна мрежа"
 
-#: ../src/applet-dialogs.c:999
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Потребна е лозинка за поврзување со „%s“."
 
-#: ../src/applet-dialogs.c:1018
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../src/applet.c:990
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "Потребно е отклучување со PIN за SIM картичката"
+
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "Потребно е отклучување со PIN за SIM картичката"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was interrupted."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа поради тоа што мрежната врска беше прекината."
+"На мобилниот широкопојасен уред „%s“ му треба SIM PIN код пред да може да се "
+"користи."
 
-#: ../src/applet.c:993
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "PIN код:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "Покажи го PIN кодот"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "Потребно е отклучување на SIM картичката со PUK"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "Потребно е отклучување на SIM картичката со PUK"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа поради тоа што VPN сервисот прекина неочекувано."
+"На мобилниот широкопојасен уред „%s“ му треба SIM PUK код пред да може да се "
+"користи."
 
-#: ../src/applet.c:996
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid configuration."
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "PUK код:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "Нов PIN код:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "Повторно внесете го новиот PIN код:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа поради тоа што VPN сервисот врати невалидна конфигурација."
 
-#: ../src/applet.c:999
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа поради тоа што обидот за врска истече."
+"IP адресата го идентификува Вашиот компјутер на мрежата. Кликнете на копчето "
+"„Додај“ за да додадете IP адреса."
 
-#: ../src/applet.c:1002
-#, c-format
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Избриши"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+#, 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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа поради тоа што VPN сервисот не се стартуваше на време."
+"Ако е овозможено, оваа врска никогаш нема да се користи како стандардната "
+"мрежна врска."
 
-#: ../src/applet.c:1005
-#, c-format
+#: ../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…"
+msgstr "Креирај..."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "Изберете тип на VPN поврзување"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"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."
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа поради тоа што VPN сервисот не успеа да се стартува."
+"Изберете тип на VPN кој сакате да го користите за новата врска. Ако типот на "
+"VPN врска која сакате да ја креирате не се појавува во листата, можно е да "
+"го немате инсталирано точниот VPN приклучок."
 
-#: ../src/applet.c:1008
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "Адреса за емитување:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Основна врска:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Уреди"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "Уред:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа поради тоа што немаше валидни VPN информации за најава."
 
-#: ../src/applet.c:1011
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "Примарен DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+"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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "бајти"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "_Безбедност:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Основна врска:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа поради тоа што немаше валидни VPN информации за најава."
 
-#: ../src/applet.c:1018
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Овозможи _вмрежување"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "автоматски"
+
+#: ../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
-#| msgid "Delete VPN connection \"%s\"?"
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+msgid "default"
+msgstr "стандарндо"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа."
 
-#: ../src/applet.c:1036
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Адреса"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Адреса"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was interrupted."
+msgid "invalid %s for %s (%s)"
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа поради тоа што мрежната врска беше прекината"
 
-#: ../src/applet.c:1039
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+msgid "invalid %s (%s)"
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа поради тоа што VPN сервисот прекина."
 
-#: ../src/applet.c:1045
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-#| msgid "The network connection has been disconnected."
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+msgid "invalid interface-name for %s (%s)"
 msgstr ""
-"\n"
-"VPN врската „%s“ се исклучи."
 
-#: ../src/applet.c:1079
-msgid "VPN Login Message"
-msgstr "VPN најавна порака"
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
 
-#: ../src/applet.c:1085
-#: ../src/applet.c:1093
-#: ../src/applet.c:1143
-#| msgid "VPN Connections"
-msgid "VPN Connection Failed"
-msgstr "VPN врската не успеа"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Било кој уред"
 
-#: ../src/applet.c:1150
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа поради тоа што VPN сервисот не успеа да се стартува.\n"
-"\n"
-"%s"
+"Не успеав да ги ажурирам информациите за најава поради непозната грешка."
 
-#: ../src/applet.c:1153
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "Користи 802.1X за безбедност на оваа врска"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
 msgstr ""
-"\n"
-"VPN врската „%s“ не успеа да стартува.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1473
-msgid "device not ready (firmware missing)"
-msgstr "уредот не е подготвен (недостасува firmware)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/applet.c:1475
-msgid "device not ready"
-msgstr "уредот не е подготвен"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1501
-#| msgid "Disconnected"
-msgid "Disconnect"
-msgstr "Исклучи се"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1515
-msgid "device not managed"
-msgstr "уредот не е менаџиран"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.c:1559
-#| msgid "No network devices have been found"
-msgid "No network devices available"
-msgstr "Нема достапни мрежни уреди"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.c:1647
-msgid "_VPN Connections"
-msgstr "_VPN поврзувања"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.c:1704
-msgid "_Configure VPN..."
-msgstr "_Конфигурирај VPN..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.c:1708
-#| msgid "_Disconnect VPN..."
-msgid "_Disconnect VPN"
-msgstr "_Исклучи се од VPN"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.c:1806
-msgid "NetworkManager is not running..."
-msgstr "Менаџерот за мрежа работи..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.c:1811
-#: ../src/applet.c:2604
-msgid "Networking disabled"
-msgstr "Вмрежувањето е оневозможено"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2032
-msgid "Enable _Networking"
-msgstr "Овозможи _вмрежување"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2041
-msgid "Enable _Wireless"
-msgstr "Овозможи _безжична мрежа"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2050
-#| msgid "Mobile Broadband"
-msgid "Enable _Mobile Broadband"
-msgstr "Овозможи _мобилна широкопојасна врска"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2059
-#| msgid "Mobile Broadband"
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Овозможи WiMAX мобилна широкопојасна _врска"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#. Toggle notifications item
-#: ../src/applet.c:2070
-msgid "Enable N_otifications"
-msgstr "Овозможи и_звестувања"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2081
-msgid "Connection _Information"
-msgstr "_Информации за поврзувањето"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2091
-msgid "Edit Connections..."
-msgstr "Уреди врски..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2105
-msgid "_Help"
-msgstr "_Помош"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2114
-msgid "_About"
-msgstr "_За"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.c:2291
-msgid "Disconnected"
-msgstr "Прекината врска"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2292
-msgid "The network connection has been disconnected."
-msgstr "Мрежното поврзување се прекина"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2473
-#, c-format
-#| msgid "Wireless network connection to '%s'"
-msgid "Preparing network connection '%s'..."
-msgstr "Ја подготвувам мрежата врска „%s“..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2476
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "Потребна е автентикација на корисникот за мрежната врска „%s“..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:2482
-#, c-format
-#| msgid "Network Connections"
-msgid "Network connection '%s' active"
-msgstr "Мрежната врска „%s“ е активна"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:2560
-#, c-format
-#| msgid "Cannot start VPN connection '%s'"
-msgid "Starting VPN connection '%s'..."
-msgstr "Ја започнувам VPN врската „%s“..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.c:2563
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "Потребна е автентикација на корисникот за VPN врската „%s“..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
 
-#: ../src/applet.c:2566
-#, c-format
-#| msgid "Requesting a network address from the wireless network '%s'..."
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Барам VPN адреса за „%s“..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
 
-#: ../src/applet.c:2569
-#, c-format
-#| msgid "VPN Connections"
-msgid "VPN connection '%s' active"
-msgstr "VPN врската „%s“ е активна"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
 
-#: ../src/applet.c:2608
-msgid "No network connection"
-msgstr "Нема мрежна врска"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.c:3258
-msgid "NetworkManager Applet"
-msgstr "Аплет за менаџирање со мрежи"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "Автоматски отклучи го овој уред"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "_Отклучи"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-#| msgid "Network Connections"
-msgid "Active Network Connections"
-msgstr "Активни мрежни врски"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Connection Information"
-msgstr "Информации за поврзувањето"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1
-#: ../src/wired-dialog.c:104
-#| msgid "DSL authentication"
-msgid "Wired 802.1X authentication"
-msgstr "Жичена 802.1X автентикација"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:4
-#| msgid "_Network Name:"
-msgid "_Network name:"
-msgstr "Име на _мрежа:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "автоматски"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:310
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Не успеав да ги ажурирам информациите за најава поради непозната грешка."
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-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-page-dcb.ui.h:45
+#, no-c-format
+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-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-msgid "If enabled, this connection will never be used as the default network connection."
-msgstr "Ако е овозможено, оваа врска никогаш нема да се користи како стандардната мрежна врска."
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "Ig_nore automatically obtained routes"
-msgstr "Иг_норирај ги автоматски добиените рути"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "Use this c_onnection only for resources on its network"
-msgstr "Користи ја оваа в_рска само за ресурси на нејзината мрежа"
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:2
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-#| msgid "Show password"
+msgid "_Username:"
+msgstr "_Корисничко име:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
 msgid "Sho_w password"
 msgstr "П_окажи лозинка"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../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:3
+#: ../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:2
-#| msgid "Password:"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:1
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
-#| msgid "_Speed:"
-msgid "_Service:"
+#: ../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
+msgid "Automatic"
+msgstr "Автоматски"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Бакарна парица (TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "_Порта:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+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.h:13
+msgid "Aut_onegotiate"
+msgstr "Автоматски преговори"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
 msgstr "_Сервис:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
-#: ../src/wireless-security/eap-method-leap.ui.h:3
-#: ../src/wireless-security/eap-method-simple.ui.h:4
-#: ../src/wireless-security/ws-leap.ui.h:3
-#| msgid "User Name:"
-msgid "_Username:"
-msgstr "_Корисничко име:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#, fuzzy
+msgid "C_loned MAC address:"
+msgstr "_Клонирана MAC адреса:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:1
-#: ../src/connection-editor/ce-page-ip6.ui.h:1
-#| msgid "IPv4 Addresses"
-msgid "Addresses"
-msgstr "Адреси"
+#: ../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 ""
+"MAC адресата која е внесена тука ќе се користи како хардверска адреса за "
+"мрежниот уред на кој е активирана оваа врска. Оваа опција се нарекува и "
+"клонирање на MAC адреси.  Пример: 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.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Стандардно"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Игнорирај"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Адреса за емитување:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Лозинка на _приватниот клуч:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "В_рзи се"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:3
-msgid "Automatic"
-msgstr "Автоматски"
+msgid "Automatic with manual DNS settings"
+msgstr "Автоматски со рачни DNS поставувања"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-msgid "Automatic with manual DNS settings"
-msgstr "Автоматски со рачни DNS поставувања"
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
+msgid "Manual"
+msgstr "Рачно"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:4
-msgid "D_HCP client ID:"
-msgstr "ID на клиент за D_HCP:"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:4
-msgid "Domains used when resolving host names. Use commas to separate multiple domains."
-msgstr "Домените кои се користат за разрешување на имиња на хостови. Користете запирки за да разделите повеќе домени."
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
 msgid "Link-Local"
 msgstr "Link-Local"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:191
-msgid "Manual"
-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:186
+#: ../src/connection-editor/page-ip6.c:204
+msgid "Shared to other computers"
+msgstr "Споделено со други копмјутери"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-msgid "Require IPv4 addressing for this connection to complete"
-msgstr "Барај IPv4 адресирање за да се оствари оваа врска"
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "_Method:"
+msgstr "_Метод:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
 #: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/page-ip4.c:187
-#: ../src/connection-editor/page-ip6.c:211
-msgid "Shared to other computers"
-msgstr "Споделено со други копмјутери"
+msgid "Addresses"
+msgstr "Адреси"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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 клиент, внесете го овде."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:12
-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 клиент, внесете го овде."
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+"Домените кои се користат за разрешување на имиња на хостови. Користете "
+"запирки за да разделите повеќе домени."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:13
-msgid "When connecting to IPv6-capable networks, allows the connection to complete if IPv4 configuration fails but IPv6 configuration succeeds."
-msgstr "При поврзување со мрежи кои поддржуваат IPv6, дозволува врската да се оствари ако конфигурацијата за IPv4 не успее, но таа за IPv6 успее."
+msgid "D_HCP client ID:"
+msgstr "ID на клиент за D_HCP:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#| msgid "<b>DNS Servers</b>"
-msgid "DNS ser_vers:"
-msgstr "_DNS сервери:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
+#, fuzzy
+msgid "S_earch domains:"
+msgstr "_Домени за пребарување:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "_Method:"
-msgstr "_Метод:"
+#: ../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:"
+msgstr "_DNS сервери:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+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:17
+#, fuzzy
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr "Барај IPv4 адресирање за да се оствари оваа врска"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Рути..."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-#| msgid "<b>Search Domains</b>"
-msgid "_Search domains:"
-msgstr "_Домени за пребарување:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Оневозможено"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 адресите на серверите за имиња на домени кои се користат за разрешување "
+"на имиња на хостови. Користете запирки за да разделите повеќе адреси на "
+"сервери за имиња на домени."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#, fuzzy
+msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Барај IPv6 адресирање за да се оствари оваа врска"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-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-ip6.ui.h:20
+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
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
+msgid "Basic"
+msgstr "Основно"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
+msgid "Nu_mber:"
+msgstr "Бр_ој:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Напредно"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Allow roaming if home network is not available"
-msgstr "Дозволи роминг, ако домашната мрежа не е достапна"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Any"
-msgstr "Било која"
-
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Basic"
-msgstr "Основно"
+msgid "_APN:"
+msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "Промени..."
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
-#| msgid "_Network Name:"
 msgid "N_etwork ID:"
 msgstr "ID на мр_ежа:"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr "Промени..."
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "Nu_mber:"
-msgstr "Бр_ој:"
+msgid "P_IN:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "PI_N:"
-msgstr "PI_N:"
+#, fuzzy
+msgid "Allow _roaming if home network is not available"
+msgstr "Дозволи роминг, ако домашната мрежа не е достапна"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:11
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Преферирај 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Преферирај 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
-#| msgid "Show password"
 msgid "Sho_w passwords"
 msgstr "Покажи ги лозин_ките"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
-msgstr "_APN:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-#| msgid "Type:"
-msgid "_Type:"
-msgstr "_Тип:"
-
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
-msgstr "Дозволи _BSD компресија на податоци"
+msgid "Authentication"
+msgstr "Автентикација"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
-msgstr "Дозволи _Deflate компресија на податоци"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Allowed methods:"
 msgstr "Дозволени методи:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
-#| msgid "Authentication:"
-msgid "Authentication"
-msgstr "Автентикација"
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
+msgstr "Конфигурација на _методи…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Compression"
 msgstr "Компресија"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr "_Користи енкрипција за точка-до-точка (MPPE)"
+
 #: ../src/connection-editor/ce-page-ppp.ui.h:6
-msgid "Configure _Methods…"
-msgstr "Конфигурација на _методи…"
+msgid "_Require 128-bit encryption"
+msgstr "_Барај 128-bit енкрипција"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:7
-msgid "Echo"
-msgstr "Echo"
+msgid "Use _stateful MPPE"
+msgstr "Користи _stateful MPPE"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:8
-msgid "Send PPP _echo packets"
-msgstr "Испрати PPP _echo пакети"
+msgid "Allow _BSD data compression"
+msgstr "Дозволи _BSD компресија на податоци"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Use TCP _header compression"
-msgstr "Користи компресија на TCP _заглавијата"
+msgid "Allow _Deflate data compression"
+msgstr "Дозволи _Deflate компресија на податоци"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Use _stateful MPPE"
-msgstr "Користи _stateful MPPE"
+msgid "Use TCP _header compression"
+msgstr "Користи компресија на TCP _заглавијата"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "_Require 128-bit encryption"
-msgstr "_Барај 128-bit енкрипција"
+msgid "Echo"
+msgstr "Echo"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
-msgid "_Use point-to-point encryption (MPPE)"
-msgstr "_Користи енкрипција за точка-до-точка (MPPE)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-#| msgid "%u Mb/s"
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+msgid "Send PPP _echo packets"
+msgstr "Испрати PPP _echo пакети"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-#| msgid "%u Mb/s"
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-#| msgid "%u Mb/s"
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Основна врска:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
-msgstr "Автоматски преговори"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "Уред:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
-msgstr "BNC"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "Full duple_x"
-msgstr "Full duple_x"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "_Клонирана MAC адреса:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-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-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Twisted Pair (TP)"
-msgstr "Бакарна парица (TP)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-#| msgid "_MAC address:"
-msgid "_Cloned MAC address:"
-msgstr "_Клонирана MAC адреса:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-#| msgid "_MAC address:"
-msgid "_Device MAC address:"
-msgstr "MAC адреса на _уредот:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-msgid "_Port:"
-msgstr "_Порта:"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Speed:"
-msgstr "_Брзина:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "bytes"
-msgstr "бајти"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "Безбедност:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#| msgid "%u (%u MHz)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
-msgid "Ban_d:"
-msgstr "Опсе_г:"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "C_hannel:"
-msgstr "К_анал:"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-#| msgid ""
-#| "Infrastructure\n"
-#| "Adhoc"
-msgid "Infrastructure"
-msgstr "Инфраструктура"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "M_ode:"
-msgstr "Р_ежим:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-#| msgid "%u Mb/s"
-msgid "Mb/s"
-msgstr "Mb/s"
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-msgid "This option locks this connection to the wireless access point (AP) specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr "Оваа опција ја заклучува врската на мрежната пристапна точка (AP) одредена со BSSID кое е внесено тука.  Пример: 00:11:22:33:44:55"
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Јачина на емит_ување:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
-msgid "_BSSID:"
-msgstr "_BSSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Брзина:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_SSID:"
-msgstr "_SSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "mW"
-msgstr "mW"
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr "К_анал:"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-#| msgid "Security:"
-msgid "_Security:"
-msgstr "_Безбедност:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr "Опсе_г:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
-#| msgid "Inner Authentication:"
-msgid "Allowed Authentication Methods"
-msgstr "Дозволени методи на автентикација"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
-#| msgid "CHAP"
-msgid "C_HAP"
-msgstr "C_HAP"
+#: ../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
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "Challenge handshake протокол за автентикација"
+msgid "Allowed Authentication Methods"
+msgstr "Дозволени методи на автентикација"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
-#| msgid "Inner Authentication:"
-msgid "Extensible Authentication Protocol"
-msgstr "Extensible Authentication Protocol"
+msgid "_EAP"
+msgstr "_EAP"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
-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 серверите овозможуваат поддршка за сите методи на автентикација. Ако врската не успее, пробајте да оневозможите некои од методите."
+msgid "Extensible Authentication Protocol"
+msgstr "Extensible Authentication Protocol"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
-#| msgid "MSCHAPv2"
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+msgid "_PAP"
+msgstr "_PAP"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Протокол за автентикација „Microsoft Challenge Handshake Authentication Protocol“"
+msgid "Password Authentication Protocol"
+msgstr "Протокол за автентикација на лозинки"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Протокол за автентикација „Microsoft Challenge Handshake Authentication Protocol“ верзија 2"
+msgid "C_HAP"
+msgstr "C_HAP"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-#| msgid "Inner Authentication:"
-msgid "Password Authentication Protocol"
-msgstr "Протокол за автентикација на лозинки"
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "Challenge handshake протокол за автентикација"
 
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-#| msgid "LEAP"
-msgid "_EAP"
-msgstr "_EAP"
-
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
-#| msgid "MSCHAP"
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr ""
+"Протокол за автентикација „Microsoft Challenge Handshake Authentication "
+"Protocol“"
+
 #: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-#| msgid "PAP"
-msgid "_PAP"
-msgstr "_PAP"
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:1
-#: ../src/libnm-gtk/wifi.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-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr ""
+"Протокол за автентикација „Microsoft Challenge Handshake Authentication "
+"Protocol“ верзија 2"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-#| msgid "Create VPN Connection"
-msgid "Choose a VPN Connection Type"
-msgstr "Изберете тип на VPN поврзување"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+"Во повеќето случаи PPP серверите овозможуваат поддршка за сите методи на "
+"автентикација. Ако врската не успее, пробајте да оневозможите некои од "
+"методите."
+
+#: ../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 "Автоматски етернет"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Create…"
-msgstr "Креирај..."
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "DSL"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-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 приклучок."
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:901
-#: ../src/connection-editor/page-ip6.c:867
-#| msgid "IP Address:"
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "Хардверска адреса:"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "Извези VPN врска..."
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+"Дијалогот за уредување на врски не можеше да се иницијализира поради "
+"непозната грешка."
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "Не можев да креирам нова врска"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "Бришењето на врската не успеа"
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "Дали сте сигурни дека сакате да ја избришете врската %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
 msgid "Address"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:918
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Нет маска"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:935
-#: ../src/connection-editor/page-ip6.c:901
+#: ../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
 msgid "Gateway"
 msgstr "Премин"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Метрика"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:884
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Префикс"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "Уредувам %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "Ја уредувам неименуваната врска"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Име на _врска:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Грешка при иницијализацијата на врската"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Додавањето на врска не успеа"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+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:419
+msgid "_Save"
+msgstr "_Зачувај"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "Зачувај ги сите промени направени на оваа врска."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr ""
+"Автентицирајте се за да се зачува оваа врска за сите корисници на оваа "
+"машина."
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "Не можев да креирам нова врска"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "Не можев да ја уредам врската"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+msgid "Unknown error creating connection editor dialog."
+msgstr "Грешка при креирањето на дијалогот за врски."
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "Грешка при иницијализацијата на врската"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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-list.c:1482
-msgid "DSL"
-msgstr "DSL"
+msgid "Connection _name:"
+msgstr "Име на _врска:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "И_звези"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "никогаш"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "сега"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "пред %d минута"
+msgstr[1] "пред %d минути"
+msgstr[2] "пред %d минути"
+
+#: ../src/connection-editor/nm-connection-list.c:160
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "пред %d час"
+msgstr[1] "пред %d часа"
+msgstr[2] "пред %d часа"
+
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "пред %d ден"
+msgstr[1] "пред %d дена"
+msgstr[2] "пред %d дена"
+
+#: ../src/connection-editor/nm-connection-list.c:178
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "пред %d месец"
+msgstr[1] "пред %d месеци"
+msgstr[2] "пред %d месеци"
+
+#: ../src/connection-editor/nm-connection-list.c:182
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "пред %d година"
+msgstr[1] "пред %d години"
+msgstr[2] "пред %d години"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "Име"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "Последно користена"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "Уреди ја избраната врска"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "Автентицирајте се за да ја уредите избраната врска"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "Избриши ја избраната врска"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "Автентицирајте се за да ја избришите избраната врска"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "Не знам како да креирам врски за „%s“"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "Грешка при креирањето на врската"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr "Грешка при уредувањето на врската"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "Не најдов врска со UUID „%s“"
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "802.1x безбедност"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за безбедност на WiFi."
+
+#: ../src/connection-editor/page-8021x-security.c:125
+#, fuzzy
+msgid "Use 802.1_X security for this connection"
+msgstr "Користи 802.1X за безбедност на оваа врска"
+
+#: ../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-dsl.c:141
-#| msgid "Could not decode private key."
+#: ../src/connection-editor/page-bluetooth.c:125
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "не можев да пронајдам Bluetooth уред."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Жичена врска %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Овозможи _вмрежување"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Безжична мрежа"
+
+#: ../src/connection-editor/page-bond.c:447
+#, fuzzy
+msgid "Could not load bond user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "Примарен DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "Жичена врска %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "Жичена врска %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за DSL."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за DSL."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
-#| msgid "GSM connection"
 msgid "DSL connection %d"
 msgstr "DSL врска %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"Оваа опција ја заклучува врската на мрежниот уред одреден со неговата трајна "
+"MAC адреса која е внесена тука. Пример: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Етернет (%s)"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Клонирана MAC адреса:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "Стандардно"
+
+#: ../src/connection-editor/page-general.c:52
+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 "Менаџерот за мрежа работи..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+#, fuzzy
+msgid "Could not load InfiniBand user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за WiFi."
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "Жичена врска %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Автоматски (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Само автоматски (VPN) адреси"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Автоматски (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Само автоматски (PPP) адреси"
+msgid "Automatic, addresses only"
+msgstr "Автоматски, само адреси"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Автоматски (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Само автоматски (PPPoE) адреси"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Автоматски (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Само автоматски (DHCP) адреси"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Само Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Оневозможено"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "_DNS сервери:"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "_Домени за пребарување:"
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Уредување на IPv4 рутите за %s"
 
-#: ../src/connection-editor/page-ip4.c:982
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Поставувања за IPv4"
 
-#: ../src/connection-editor/page-ip4.c:984
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за IPv4."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "Автоматски, само адреси"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:285
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Игнорирај"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Автоматски, само DHCP"
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Уредување на IPv6 рутите за %s"
 
-#: ../src/connection-editor/page-ip6.c:946
-#| msgid "IPv4 Settings"
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Поставувања за IPv6"
 
-#: ../src/connection-editor/page-ip6.c:948
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за IPv6."
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
-msgstr "Не можев да го вчитам корисничкиот интерфејс за широкопојасен мобилен пристап."
+msgstr ""
+"Не можев да го вчитам корисничкиот интерфејс за широкопојасен мобилен "
+"пристап."
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Неподдржан тип на широкопојасна мобилна врска."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:639
-#| msgid "Mobile Broadband"
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Изберете тип на оператор за мобилен широкопојасен пристап"
 
-#: ../src/connection-editor/page-mobile.c:674
-msgid "Select the technology your mobile broadband provider uses.  If you are unsure, ask your provider."
-msgstr "Изберете го типот на технологија за широкопојасен мобилен пристап која ја користи Вашиот оператор. Ако не сте сигурни која технологија се користи, прашајте го операторот."
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
+"Изберете го типот на технологија за широкопојасен мобилен пристап која ја "
+"користи Вашиот оператор. Ако не сте сигурни која технологија се користи, "
+"прашајте го операторот."
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Мојот оператор користи C_DMA базирана технологија (пр.. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:134
-#| msgid "LEAP"
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
-#| msgid "(none)"
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ништо"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:283
-#| msgid "IPv4 Settings"
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Поставувања за PPP"
 
-#: ../src/connection-editor/page-ppp.c:285
-#| msgid "Could not decode private key."
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за PPP."
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1478
-msgid "VPN"
-msgstr "VPN"
+#: ../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 "Одберете датотека за увезување"
+
+#: ../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"
+msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:111
-#| msgid "Could not decode private key."
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "Жичена врска %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Нема мрежна врска"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "Не можев да го вчитам корисничкиот интерфејс за IPv4."
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "VPN врска %d"
+
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за VPN."
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Не можев да најдам сервис од додаток за VPN за „%s“."
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:884
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
-#| msgid "VPN Connections"
 msgid "VPN connection %d"
 msgstr "VPN врска %d"
 
-#: ../src/connection-editor/page-wired.c:88
-#: ../src/connection-editor/page-wireless.c:93
-msgid "This option locks this connection to the network device specified by its permanent MAC address entered here.  Example: 00:11:22:33:44:55"
-msgstr "Оваа опција ја заклучува врската на мрежниот уред одреден со неговата трајна MAC адреса која е внесена тука. Пример: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/page-wired.c:267
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1466
-msgid "Wired"
-msgstr "Жичено"
-
-#: ../src/connection-editor/page-wired.c:269
-#| msgid "Could not decode private key."
-msgid "Could not load wired user interface."
-msgstr "Не можев да го вчитам корисничкиот интерфејс за жичени врски."
-
-#: ../src/connection-editor/page-wired.c:444
-#, c-format
-#| msgid "Wired network connection"
-msgid "Wired connection %d"
-msgstr "Жичена врска %d"
+#: ../src/connection-editor/page-vpn.c:229
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
+"Додатокот за VPN не успеа правилно да ја увези VPN врската\n"
+"\n"
+"Грешка: нема тип на VPN сервис."
 
-#: ../src/connection-editor/page-wired-security.c:116
-#| msgid "Security:"
-msgid "802.1x Security"
-msgstr "802.1x безбедност"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "Изберете тип на VPN поврзување"
 
-#: ../src/connection-editor/page-wired-security.c:118
-msgid "Could not load Wired Security security user interface."
-msgstr "Не можев да го вчитам корисничкиот интерфејс за жичена безбедност."
+#: ../src/connection-editor/page-vpn.c:255
+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 приклучок."
 
-#: ../src/connection-editor/page-wired-security.c:136
-msgid "Use 802.1X security for this connection"
-msgstr "Користи 802.1X за безбедност на оваа врска"
+#: ../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 ""
+"Оваа опција ја заклучува врската на мрежната пристапна точка (AP) одредена "
+"со BSSID кое е внесено тука.  Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:166
-#: ../src/connection-editor/page-wireless.c:170
-#: ../src/connection-editor/page-wireless.c:191
-#, c-format
-msgid "default"
-msgstr "стандарндо"
+#: ../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)\""
+msgstr ""
+"Оваа опција ја заклучува врската на мрежниот уред одреден со неговата трајна "
+"MAC адреса која е внесена тука. Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:195
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:452
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1470
-msgid "Wireless"
-msgstr "Безжично"
-
-#: ../src/connection-editor/page-wireless.c:454
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за WiFi."
 
-#: ../src/connection-editor/page-wireless.c:658
-#, c-format
-#| msgid "Wireless network connection to '%s'"
-msgid "Wireless connection %d"
-msgstr "Безжична врска %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Било кој уред"
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Жичена врска %d"
 
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/libnm-gtk/nm-wireless-dialog.c:923
-#| msgid "WEP 40/128-bit ASCII"
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:272
-#: ../src/libnm-gtk/nm-wireless-dialog.c:932
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit фраза за лозинка"
 
-#: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/libnm-gtk/nm-wireless-dialog.c:962
+#: ../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)"
 msgstr "Динамичен WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/libnm-gtk/nm-wireless-dialog.c:976
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:990
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wireless-security.c:360
-msgid "Could not load WiFi security user interface; missing WiFi setting."
-msgstr "Не можев да го вчитам корисничкиот интерфејс за безбедност на WiFi. Недостасува поставувањето за WiFi."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+"Не можев да го вчитам корисничкиот интерфејс за безбедност на WiFi. "
+"Недостасува поставувањето за WiFi."
 
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "Безжична безбедност"
 
-#: ../src/connection-editor/page-wireless-security.c:372
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
 msgstr "Не можев да го вчитам корисничкиот интерфејс за безбедност на WiFi."
 
-#: ../src/connection-editor/nm-connection-editor.c:101
-#, c-format
-msgid "Editing %s"
-msgstr "Уредувам %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:105
-#| msgid "Editing unamed connection"
-msgid "Editing un-named connection"
-msgstr "Ја уредувам неименуваната врска"
-
-#: ../src/connection-editor/nm-connection-editor.c:288
-#| msgid ""
-#| "The connection editor could not find some required resources (the glade "
-#| "file was not found)."
-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:391
-#| msgid "Error displaying connection information:"
-msgid "Error creating connection editor dialog."
-msgstr "Грешка при креирањето на дијалогот за врски."
-
-#: ../src/connection-editor/nm-connection-editor.c:403
-msgid "_Save"
-msgstr "_Зачувај"
-
-#: ../src/connection-editor/nm-connection-editor.c:404
-msgid "Save any changes made to this connection."
-msgstr "Зачувај ги сите промени направени на оваа врска."
-
-#: ../src/connection-editor/nm-connection-editor.c:405
-msgid "_Save..."
-msgstr "_Зачувај..."
-
-#: ../src/connection-editor/nm-connection-editor.c:406
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "Автентицирајте се за да се зачува оваа врска за сите корисници на оваа машина."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "A_vailable to all users"
-msgstr "Достапна за сите корисници"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "Врзувај се _автоматски"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
-msgstr "Име на _врска:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "E_xport"
-msgstr "И_звези"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-#| msgid "E_xport"
-msgid "_Import"
-msgstr "_Увези"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "никогаш"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "сега"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "пред %d минута"
-msgstr[1] "пред %d минути"
-msgstr[2] "пред %d минути"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "пред %d час"
-msgstr[1] "пред %d часа"
-msgstr[2] "пред %d часа"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "пред %d ден"
-msgstr[1] "пред %d дена"
-msgstr[2] "пред %d дена"
-
-#: ../src/connection-editor/nm-connection-list.c:267
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "пред %d месец"
-msgstr[1] "пред %d месеци"
-msgstr[2] "пред %d месеци"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "пред %d година"
-msgstr[1] "пред %d години"
-msgstr[2] "пред %d години"
-
-#: ../src/connection-editor/nm-connection-list.c:486
-#| msgid "Connection Established"
-msgid "Connection add failed"
-msgstr "Додавањето на врска не успеа"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-#| msgid "Error displaying connection information:"
-msgid "Error saving connection"
-msgstr "Грешка при зачувувањето на врската"
-
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Својството „%s“ / „%s“ е невалидно: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
-msgid "An unknown error occurred."
-msgstr "Се случи непозната грешка."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:686
-#| msgid "Error initializing certificate data: %s"
-msgid "Error initializing editor"
-msgstr "Грешка при иницијализацијата на врската"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:703
-#: ../src/connection-editor/nm-connection-list.c:870
-msgid "The connection editor dialog could not be initialized due to an unknown error."
-msgstr "Дијалогот за уредување на врски не можеше да се иницијализира поради непозната грешка."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-#| msgid "Create VPN connection"
-msgid "Could not create new connection"
-msgstr "Не можев да креирам нова врска"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-#| msgid "No network connection"
-msgid "Could not edit new connection"
-msgstr "Не можев да ја уредам новата врска"
-
-#: ../src/connection-editor/nm-connection-list.c:717
-#| msgid "No network connection"
-msgid "Could not edit connection"
-msgstr "Не можев да ја уредам врската"
-
-#: ../src/connection-editor/nm-connection-list.c:747
-#| msgid "Connection Established"
-msgid "Connection delete failed"
-msgstr "Бришењето на врската не успеа"
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:779
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "Дали сте сигурни дека сакате да ја избришете врската %s?"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:914
-#: ../src/connection-editor/vpn-helpers.c:227
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Не можам да увезам VPN поврзување"
 
-#: ../src/connection-editor/nm-connection-list.c:916
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"Додатокот за VPN не успеа правилно да ја увези VPN врската\n"
-"\n"
-"Грешка: нема тип на VPN сервис."
-
-#: ../src/connection-editor/nm-connection-list.c:929
-#| msgid "Cannot import VPN connection"
-msgid "Could not edit imported connection"
-msgstr "Не можев да ја уредам увезената врска"
-
-#: ../src/connection-editor/nm-connection-list.c:1099
-msgid "Name"
-msgstr "Име"
-
-#: ../src/connection-editor/nm-connection-list.c:1111
-msgid "Last Used"
-msgstr "Последно користена"
-
-#: ../src/connection-editor/nm-connection-list.c:1227
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr "Нема достапен VPN додаток. Ве молам, инсталирајте додаток за да се овозможи ова копче."
-
-#: ../src/connection-editor/nm-connection-list.c:1238
-msgid "_Edit"
-msgstr "_Уреди"
-
-#: ../src/connection-editor/nm-connection-list.c:1239
-#| msgid "Edit the selected VPN connection"
-msgid "Edit the selected connection"
-msgstr "Уреди ја избраната врска"
-
-#: ../src/connection-editor/nm-connection-list.c:1240
-msgid "_Edit..."
-msgstr "_Уреди..."
-
-#: ../src/connection-editor/nm-connection-list.c:1241
-#| msgid "Delete the selected VPN connection"
-msgid "Authenticate to edit the selected connection"
-msgstr "Автентицирајте се за да ја уредите избраната врска"
-
-#: ../src/connection-editor/nm-connection-list.c:1256
-msgid "_Delete"
-msgstr "_Избриши"
-
-#: ../src/connection-editor/nm-connection-list.c:1257
-#| msgid "Delete the selected VPN connection"
-msgid "Delete the selected connection"
-msgstr "Избриши ја избраната врска"
-
-#: ../src/connection-editor/nm-connection-list.c:1258
-msgid "_Delete..."
-msgstr "_Избриши..."
-
-#: ../src/connection-editor/nm-connection-list.c:1259
-#| msgid "Delete the selected VPN connection"
-msgid "Authenticate to delete the selected connection"
-msgstr "Автентицирајте се за да ја избришите избраната врска"
-
-#: ../src/connection-editor/nm-connection-list.c:1538
-#| msgid "No network connection"
-msgid "Error creating connection"
-msgstr "Грешка при креирањето на врската"
-
-#: ../src/connection-editor/nm-connection-list.c:1539
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "Не знам како да креирам врски за „%s“"
-
-#: ../src/connection-editor/nm-connection-list.c:1594
-#: ../src/connection-editor/nm-connection-list.c:1606
-#| msgid "Editing unamed connection"
-msgid "Error editing connection"
-msgstr "Грешка при уредувањето на врската"
-
-#: ../src/connection-editor/nm-connection-list.c:1595
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "Не знам како да уредувам врски за „%s“"
-
-#: ../src/connection-editor/nm-connection-list.c:1607
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "Не најдов врска со UUID „%s“"
-
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../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"
+"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"
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
 "\n"
 "Error: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:262
-#| msgid "File to import"
-msgid "Select file to import"
-msgstr "Одберете датотека за увезување"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Непознато"
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Веќе постои датотека со име „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:315
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Замени"
 
-#: ../src/connection-editor/vpn-helpers.c:317
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:353
-#| msgid "Cannot import VPN connection"
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Не можев да ја извезам VPN врската"
 
-#: ../src/connection-editor/vpn-helpers.c:355
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2228,668 +3131,1189 @@ msgstr ""
 "\n"
 "Грешка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:390
-#| msgid "Create VPN connection"
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Извези VPN врска..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-#| msgid "Finished Create VPN Connection"
-msgid "Failed to create PAN connection: %s"
-msgstr "Не успеав да креирам PAN врска: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "Вашиот телефон сега е подготвен за употреба!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:249
-#, c-format
-#| msgid "GSM Network"
-msgid "%s Network"
-msgstr "%s мрежа"
-
-#: ../src/gnome-bluetooth/bt-widget.c:375
-#, c-format
-msgid "Error: %s"
-msgstr "Грешка: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:488
-#, c-format
-#| msgid "Finished Create VPN Connection"
-msgid "Failed to create DUN connection: %s"
-msgstr "Не успеав да креирам DUN врска: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:511
-msgid "Mobile wizard was canceled"
-msgstr "Помошникот за мобилни беше прекинат"
-
-#: ../src/gnome-bluetooth/bt-widget.c:520
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Непознат тип на телефон (не е GSM или CDMA)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
-#| msgid "You are now connected to the GSM network."
-msgid "failed to connect to the phone."
-msgstr "не успеав да се поврзам со телефонот."
-
-#: ../src/gnome-bluetooth/bt-widget.c:753
-msgid "unexpectedly disconnected from the phone."
-msgstr "неочекувано се прекина врската со телефонот."
-
-#: ../src/gnome-bluetooth/bt-widget.c:762
-msgid "timed out detecting phone details."
-msgstr "не успеав да ги откријам повеќе детали за телефонот."
-
-#: ../src/gnome-bluetooth/bt-widget.c:774
-msgid "Detecting phone configuration..."
-msgstr "Ја откривам конфигурацијата на телефонот..."
-
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "не можев да пронајдам Bluetooth уред."
-
-#: ../src/gnome-bluetooth/bt-widget.c:980
-msgid "The default Bluetooth adapter must be enabled before setting up a Dial-Up-Networking connection."
-msgstr "Стандардниот Bluetooth адаптер мора да биде овозможен за да се постави Dial-Up-Networking врска."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1012
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "Bluetooth врската не е возможна (не успеав да се поврзам со D-Bus: %s)."
+#: ../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 ""
+"Аплетот за NetworkManager не може да најде некои од потребните ресурси (не е "
+"пронајдена .ui датотеката)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "Bluetooth врската не е возможна (не успеав да креирам D-Bus прокси)."
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "_Отклучи"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1031
-#, c-format
-msgid "Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "Bluetooth врската не е возможна (грешка во наоѓањето на NetworkManager: %s)."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "Автоматски отклучи го овој уред"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1098
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Користете го Вашиот мобилен телефон како мрежен уред (PAN/NAP)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Информации за поврзувањето"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1107
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Пристапувајте на интернет преку Вашиот мобилен телефон (DUN)"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "Активни мрежни врски"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
-msgid "Your mobile broadband connection is configured with the following settings:"
-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/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Вашиот уред:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Вашиот оператор:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Вашата тарифа:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
-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/libnm-gtk/nm-mobile-wizard.c:264
-#| msgid "Mobile Broadband"
+#: ../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/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Не е во листата"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Изберете ја Вашата тарифа:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../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/libnm-gtk/nm-mobile-wizard.c:528
+#: ../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"
+"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"
 "\n"
-"Ако не сте сигурни која тарифа да ја изберете, прашајте го Вашиот оператор да ви го APN за Вашата тарифа."
+"Ако не сте сигурни која тарифа да ја изберете, прашајте го Вашиот оператор "
+"да ви го APN за Вашата тарифа."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Изберете ја Вашата тарифа"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Мојата тарифа не е во листата..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Изберете го Вашиот оператор од _листата:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Оператор"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../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/libnm-gtk/nm-mobile-wizard.c:789
-#| msgid "Driver:"
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Оператор:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../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/libnm-gtk/nm-mobile-wizard.c:819
+#: ../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/libnm-gtk/nm-mobile-wizard.c:830
-#| msgid "Choose your private key..."
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Изберете го Вашиот оператор:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "Листа на држави и региони:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1092
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Држава или регион"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1099
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Мојата земја не е во листата"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1145
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1199
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Инсталиран GSM уред"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1202
-#| msgid "Dialing CDMA device %s..."
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Инсталиран CDMA уред"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1374
-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: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 ""
+"Овој помошник Ви помага лесно да ја поставите врската за мобилен интернет на "
+"мобилна (3G) мрежа."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1379
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Ви требаат следните податоци:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1394
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Името на Вашиот оператор за широкопојасна врска"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1400
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Името на тарифата"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1406
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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 "Креирај врска за  _овој уред за мобилен широкопојасен пристап:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Било кој уред"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
-#| msgid "Mobile Broadband"
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Поставете мобилна широкопојасна врска"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1625
-#| msgid "Mobile Broadband"
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Нова мобилна широкопојасна врска"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Лозинка:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Лозинка:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "Покажи ги лозин_ките"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Нов..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1077
-#| msgid "_Rate:"
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ништо"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "К_реирај"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1161
-#, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "За да и пристапите на оваа безжична мрежа потребен е енкриптиран клуч или лозинка '%s'."
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
+"За да и пристапите на оваа безжична мрежа потребен е енкриптиран клуч или "
+"лозинка '%s'."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1163
-#| msgid "Wireless Network Secrets Required"
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "Потребна е автентикација за безжична мрежа"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1165
-#| msgid "Secrets required by wireless network"
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "Потребна е автентикација за безжичната мрежа"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1170
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "Креирај нова безжична мрежа"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "Нова безжична мрежа"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1173
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Внесете име на безжичната мрежа на која што сакате да се врзете."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1175
-#| msgid "Connect to Other Wireless Network"
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Поврзи се со скриена безжична мрежа"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
-#| msgid "New wireless network"
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "Скриена безжична мрежа"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1178
-#| msgid "Enter the name of the wireless network to which you wish to connect."
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "Внесете име и безбедносни податоци за безжичната мрежа на која што сакате да се врзете."
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, 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:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_Безжична безбедност:"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
-#| msgid "Connection _name:"
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Вр_ска:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
 msgstr "Безжичен _адаптер:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-#| msgid "_Wireless Security:"
-msgid "Wireless _security:"
-msgstr "_Безжична безбедност:"
+#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+msgid "Wired"
+msgstr "Жичено"
 
-#: ../src/main.c:73
-#| msgid "User Name:"
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Искористеност:"
 
-#: ../src/main.c:75
-msgid "This program is a component of NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/)."
-msgstr "Оваа програма е дел од NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/)."
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+"Оваа програма е дел од NetworkManager (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
 
-#: ../src/main.c:76
-msgid "It is not intended for command-line interaction but instead runs in the GNOME desktop environment."
-msgstr "Не е наменета за користење преку командната линија, туку да се извршува во работната околина GNOME."
+#: ../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:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "не е овозможено"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "не е регистрано"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
-#| msgid "Wired Network (%s)"
 msgid "Home network (%s)"
 msgstr "Домашна мрежа (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
-#| msgid "Wired Network"
 msgid "Home network"
 msgstr "Домашна мрежа"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "барам"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "регистрацијата не успеа"
 
-#: ../src/mb-menu-item.c:151
-#: ../src/mb-menu-item.c:157
+#: ../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:153
-#: ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роминг)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:170
 #, c-format
-#| msgid "Wired Network (%s)"
 msgid "Roaming network (%s)"
 msgstr "Мрежа во роаминг (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Мрежа за роминг"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-#| msgid "default"
-msgid "Default"
-msgstr "Стандардно"
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "PIN код за SIM картичката „%s“ на „%s“"
 
-#: ../src/wired-dialog.c:91
-#: ../src/wired-dialog.c:99
-#| msgid ""
-#| "The NetworkManager Applet could not find some required resources (the "
-#| "glade file was not found)."
-msgid "The NetworkManager Applet could not find some required resources (the .ui file was not found)."
-msgstr "Аплетот за NetworkManager не може да најде некои од потребните ресурси (не е пронајдена .ui датотеката)."
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "Потребен е PIN код"
 
-#: ../src/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
-msgstr "Не е избран сертификат од авторитет за сертификати"
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "Потребен е PIN код за мобилниот широкопојасен уред"
 
-#: ../src/wireless-security/eap-method.c:280
-msgid "Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "Некористењето на авторитет за сертификати (CA) може да резултира со врски до небезбедни, сомнителни безижни мрежи.  Дали сакате да изберете сертификат од авторитетот за сертификати?"
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Мобилната широкопојасна врска „%s“ е активна: (%d%%%s%s)"
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
-msgstr "Изберете CA сертификат"
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "роминг"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "CDMA врска"
+
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:648
-#| msgid "DER or PEM certificates (*.der, *.pem)"
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
+
+#: ../src/wireless-security/eap-method.c:452
+#, 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:651
-#| msgid "DER or PEM certificates (*.der, *.pem)"
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Сертификати за DER или PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:372
-msgid "MD5"
-msgstr "MD5"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
-msgid "Choose a Certificate Authority certificate..."
-msgstr "Изберете сертификат од авторитетот за сертификати..."
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "Анони_мен идентитет:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "Автентикација"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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 "Anonymous Identity:"
 msgid "Anony_mous identity:"
 msgstr "Анони_мен идентитет:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-#| msgid "CA Certificate:"
-msgid "C_A certificate:"
-msgstr "Сертификат на C_A:"
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file:"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
-#| msgid "Inner Authentication:"
-msgid "I_nner authentication:"
+#: ../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
+#, fuzzy
+msgid "_Inner authentication:"
 msgstr "В_натрешна автентикација:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-#| msgid ""
-#| "Version 0\n"
-#| "Version 1"
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+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 "Изберете сертификат од авторитетот за сертификати..."
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
 msgstr "Верзија 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#| msgid ""
-#| "Version 0\n"
-#| "Version 1"
+#: ../src/wireless-security/eap-method-peap.ui.h:4
 msgid "Version 1"
 msgstr "Верзија 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#| msgid "PEAP Version:"
-msgid "_PEAP version:"
+#: ../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 "Сертификат на C_A:"
+
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "Сертификат на C_A:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#, fuzzy
+msgid "PEAP _version:"
 msgstr "Верзија на _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-msgid "As_k for this password every time"
-msgstr "Ба_рај ја оваа лозинка секогаш"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Сертификат на C_A:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Неенкриптираните приватни клучеви се небезбедни"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../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"
+"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 ""
-"Избраниот приватен клуч изгледа дека не е заштитен со лозинка. Ова може да овозможи Вашите сигурносни информации да бидат откриени. Изберете приватен клуч заштитен со лозинка.\n"
+"Избраниот приватен клуч изгледа дека не е заштитен со лозинка. Ова може да "
+"овозможи Вашите сигурносни информации да бидат откриени. Изберете приватен "
+"клуч заштитен со лозинка.\n"
 "\n"
 "(Може да го заштитите Вашиот приватен клуч со openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Изберете личен сертификат..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Изберете го Вашиот приватен клуч..."
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
-#| msgid "Identity:"
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "И_дентитет:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:3
-#| msgid "Private Key:"
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "_Кориснички сертификат:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Приватен _клуч:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
-#| msgid "Private Key Password:"
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "Лозинка на _приватниот клуч:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-#| msgid "User Certificate:"
-msgid "_User certificate:"
-msgstr "_Кориснички сертификат:"
+#: ../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/wireless-security.c:384
+#: ../src/wireless-security/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:408
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Тунелиран TLS"
 
-#: ../src/wireless-security/wireless-security.c:419
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Заштитен EAP (PEAP)"
 
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:2
 #: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
-#| msgid "Authentication:"
-msgid "_Authentication:"
+#, fuzzy
+msgid "Au_thentication:"
 msgstr "_Автентикација:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-#| msgid "default"
-msgid "1 (Default)"
-msgstr "1 (стандардно)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
-#| msgid ""
-#| "Open System\n"
-#| "Shared Key"
 msgid "Open System"
 msgstr "Open System"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-#| msgid ""
-#| "Open System\n"
-#| "Shared Key"
 msgid "Shared Key"
 msgstr "Споделен клуч"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
-#| msgid "Show key"
+msgid "_Key:"
+msgstr "_Клуч:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
 msgid "Sho_w key"
 msgstr "Пок_ажи го клучот"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "WEP инде_кс:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
-#| msgid "Key:"
-msgid "_Key:"
-msgstr "_Клуч:"
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Тип:"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Нова мобилна широкопојасна врска (CDMA)..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Сега сте поврзани на CDMA мрежата."
+
+#~| msgid "CDMA Network"
+#~ msgid "CDMA network."
+#~ msgstr "CDMA мрежа."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Нова мобилна широкопојасна врска (GSM)..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Сега сте поврзани на GSM мрежата."
+
+#~| msgid "GSM Network"
+#~ msgid "GSM network."
+#~ msgstr "GSM мрежа."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Безжични мрежи (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Безжична мрежа (%s)"
+
+#~| msgid "Networking disabled"
+#~ msgid "wireless is disabled"
+#~ msgstr "безжичната врска е оневозможена"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "безжичниот уред е оневозможен од хардверски прекинувач"
+
+#~| msgid "Wireless network connection to '%s'"
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Ја подготвувам безжичната мрежна врска „%s“..."
+
+#~| msgid "Wireless network connection to '%s'"
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "Ја конфигурирам безжичната мрежна врска „%s“..."
+
+#~| msgid "Requesting a network address from the wireless network '%s'..."
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Барам мрежна адреса од безжичната мрежа %s..."
+
+#~| msgid "Wireless network connection to '%s'"
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "Безжичната мрежна врска „%s“ е активна"
+
+#~| msgid "Mobile Broadband"
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX мобилен широкопојасен пристап (%s)"
+
+#~| msgid "Mobile Broadband"
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX мобилен широкопојасен пристап"
+
+#~| msgid "You are now connected to the CDMA network."
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Сега сте поврзани на WiMAX мрежа."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~| msgid "Unknown"
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "Непознато"
+
+#~| msgid "CDMA (%s)"
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~| msgid "_BSSID:"
+#~ 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 мобилна широкопојасна _врска"
+
+#~ msgid "_Help"
+#~ msgstr "_Помош"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "Any"
+#~ msgstr "Било која"
+
+#~ msgid "PI_N:"
+#~ msgstr "PI_N:"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Преферирај 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Преферирај 3G (UMTS/HSPA)"
+
+#~ msgid "MT_U:"
+#~ msgstr "MT_U:"
+
+#~| msgid "_MAC address:"
+#~ msgid "_Device MAC address:"
+#~ msgstr "MAC адреса на _уредот:"
+
+#~| msgid ""
+#~| "Infrastructure\n"
+#~| "Adhoc"
+#~ msgid "Infrastructure"
+#~ msgstr "Инфраструктура"
+
+#~ msgid "_SSID:"
+#~ msgstr "_SSID:"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Автоматски (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Само автоматски (PPP) адреси"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "Не можев да го вчитам корисничкиот интерфејс за жичена безбедност."
+
+#~ msgid "Wireless"
+#~ msgstr "Безжично"
+
+#~| msgid "Wireless network connection to '%s'"
+#~ msgid "Wireless connection %d"
+#~ msgstr "Безжична врска %d"
+
+#~ msgid "_Save..."
+#~ 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 "Грешка при зачувувањето на врската"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Својството „%s“ / „%s“ е невалидно: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "Се случи непозната грешка."
+
+#~| msgid "Cannot import VPN connection"
+#~ msgid "Could not edit imported connection"
+#~ msgstr "Не можев да ја уредам увезената врска"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr ""
+#~ "Нема достапен VPN додаток. Ве молам, инсталирајте додаток за да се "
+#~ "овозможи ова копче."
+
+#~ msgid "_Edit..."
+#~ msgstr "_Уреди..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Избриши..."
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "Не знам како да уредувам врски за „%s“"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Вашиот телефон сега е подготвен за употреба!"
+
+#~| msgid "GSM Network"
+#~ msgid "%s Network"
+#~ msgstr "%s мрежа"
+
+#~ 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 "Помошникот за мобилни беше прекинат"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Непознат тип на телефон (не е GSM или CDMA)"
+
+#~| msgid "You are now connected to the GSM network."
+#~ msgid "failed to connect to the phone."
+#~ msgstr "не успеав да се поврзам со телефонот."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "неочекувано се прекина врската со телефонот."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "не успеав да ги откријам повеќе детали за телефонот."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Ја откривам конфигурацијата на телефонот..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Стандардниот Bluetooth адаптер мора да биде овозможен за да се постави "
+#~ "Dial-Up-Networking врска."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr ""
+#~ "Bluetooth врската не е возможна (не успеав да се поврзам со D-Bus: %s)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr ""
+#~ "Bluetooth врската не е возможна (не успеав да креирам D-Bus прокси)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr ""
+#~ "Bluetooth врската не е возможна (грешка во наоѓањето на NetworkManager: "
+#~ "%s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Користете го Вашиот мобилен телефон како мрежен уред (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Пристапувајте на интернет преку Вашиот мобилен телефон (DUN)"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Не е избран сертификат од авторитет за сертификати"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Некористењето на авторитет за сертификати (CA) може да резултира со врски "
+#~ "до небезбедни, сомнителни безижни мрежи.  Дали сакате да изберете "
+#~ "сертификат од авторитетот за сертификати?"
 
 #~ msgid "Auto CDMA network connection"
 #~ msgstr "Автоматска CDMA мрежна врска"
+
 #~ msgid "Disconnect..."
 #~ msgstr "Одврзи ме..."
+
 #~ msgid "CDMA Connections (%s)"
 #~ msgstr "CDMA врски (%s)"
+
 #~ msgid "CDMA Network (%s)"
 #~ msgstr "CDMA мрежа (%s)"
+
 #~ msgid "CDMA Connections"
 #~ msgstr "CDMA врски"
+
 #~ msgid "Running PPP on device %s..."
 #~ msgstr "Извршувам PPP на уредот %s..."
-#~ msgid "CDMA connection"
-#~ msgstr "CDMA врска"
+
 #~ msgid "Auto GSM network connection"
 #~ msgstr "Автоматска GSM мрежна врска"
+
 #~ msgid "GSM Connections (%s)"
 #~ msgstr "GSM врски (%s)"
+
 #~ msgid "GSM Network (%s)"
 #~ msgstr "GSM мрежа (%s)"
+
 #~ msgid "Dialing GSM device %s..."
 #~ msgstr "Вртам преку GSM уредот %s..."
+
 #~ msgid "Preparing device %s for the wired network..."
 #~ msgstr "Го подготвувам уредот %s за жичената мрежа..."
+
 #~ msgid "Configuring device %s for the wired network..."
 #~ msgstr "Го конфигурирам уредот %s за жичената мрежа..."
+
 #~ msgid "Requesting a network address from the wired network..."
 #~ msgstr "Барам мрежна адреса од жичената мрежа..."
+
 #~ msgid "Attempting to join the wireless network '%s'..."
 #~ msgstr "Се обидувам да се придружам кон безжичната мрежа %s..."
+
 #~ msgid "Waiting for Network Key for the wireless network '%s'..."
 #~ msgstr "Чекам мрежен клуч за безжичната мрежа %s..."
+
 #~ msgid "Could not find some required resources (the glade file)!"
 #~ msgstr ""
 #~ "Аплетот за „Менаџерот за мрежа“ не може да најде некои од потребните "
 #~ "ресурси (не е пронајдена glade датотеката)!"
+
 #~ msgid "translator-credits"
 #~ msgstr "Јован Наумовски"
+
 #~ msgid ""
 #~ "The NetworkManager applet could not find some required resources.  It "
 #~ "cannot continue.\n"
 #~ msgstr ""
 #~ "Аплетот за „Менаџерот за мрежа“ не може да најде некои од потребните "
 #~ "ресурси. Не може да продолжи.\n"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
 #~ msgstr ""
 #~ "<span weight=\"bold\" size=\"larger\">Информации за активното поврзување</"
 #~ "span>"
-#~ msgid "C_onnect"
-#~ msgstr "В_рзи се"
+
 #~ msgid "Other Wireless Network..."
 #~ msgstr "Друга безжична мрежа..."
+
 #~ msgid "Passphrase:"
 #~ msgstr "Фраза за лозинка:"
+
 #~ msgid "Select A File"
 #~ msgstr "Изберете датотека"
+
 #~ msgid "Show passphrase"
 #~ msgstr "Покажи ја фразата за лозинка"
+
 #~ msgid "alert text"
 #~ msgstr "текст за известување"
+
 #~ msgid "_Manual configuration"
 #~ msgstr "_Рачна конфигурација"
+
 #~ msgid ""
 #~ "default\n"
 #~ "10 Mb/s\n"
@@ -2902,6 +4326,7 @@ msgstr "_Клуч:"
 #~ "100 Mb/s\n"
 #~ "1 Gb/s\n"
 #~ "10 Gb/s"
+
 #~ msgid ""
 #~ "default\n"
 #~ "Twisted Pair (TP)\n"
@@ -2914,6 +4339,7 @@ msgstr "_Клуч:"
 #~ "Attachment Unit Interface (AUI)\n"
 #~ "BNC\n"
 #~ "Media Independent Interface (MII)"
+
 #~ msgid ""
 #~ "default\n"
 #~ "A (5 GHz)\n"
@@ -2922,95 +4348,133 @@ msgstr "_Клуч:"
 #~ "стандардно\n"
 #~ "A (5 GHz)\n"
 #~ "B/G (2.4 GHz)"
+
 #~ msgid "WEP 40/128-bit Hexadecimal"
 #~ msgstr "WEP 40/128-bit Hexadecimal"
+
 #~ msgid ""
 #~ "The connection editor could not find some required resources (the "
 #~ "NetworkManager applet glade file was not found)."
 #~ msgstr ""
 #~ "Уредувачот на врски не може да најде некои од потребните ресурси (Аплетот "
 #~ "не ја пронајде glade датотеката)."
+
 #~ msgid "Connection Editor"
 #~ msgstr "Уредувач на врски"
+
 #~ msgid "PEM key file had no end tag '%s'."
 #~ msgstr "PEM датотеката за клучот нема завршна ознака %s."
+
 #~ msgid "Doesn't look like a PEM private key file."
 #~ msgstr "Не изгледа како датотека со приватен PEM клуч."
+
 #~ msgid "Not enough memory to store PEM file data."
 #~ msgstr ""
 #~ "Нема доволно меморија за складирање на податоците од PEM датотеката."
+
 #~ msgid "Malformed PEM file: Proc-Type was not first tag."
 #~ msgstr "Погрешна PEM датотека: Proc-Type не е првата ознака."
+
 #~ msgid "Malformed PEM file: unknown Proc-Type tag '%s'."
 #~ msgstr "Погрешна PEM датотека: непозната Proc-Type ознака %s."
+
 #~ msgid "Malformed PEM file: DEK-Info was not the second tag."
 #~ msgstr "Погрешна PEM датотека: DEK-Info не е втората ознака."
+
 #~ msgid "Malformed PEM file: no IV found in DEK-Info tag."
 #~ msgstr ""
 #~ "Погрешна PEM датотека: не беше пронајден IV во ознаката за DEK-Info."
+
 #~ msgid "Malformed PEM file: invalid format of IV in DEK-Info tag."
 #~ msgstr ""
 #~ "Погрешна PEM датотека: невалиден формат на IV во ознаката за DEK-Info."
+
 #~ msgid "Malformed PEM file: unknown private key cipher '%s'."
 #~ msgstr "Погрешна PEM датотека: непознат cipher за приватниот клуч %s."
+
 #~ msgid "PEM certificate '%s' had no end tag '%s'."
 #~ msgstr "PEM сертификатот %s нема завршна ознака %s."
+
 #~ msgid "Failed to decode certificate."
 #~ msgstr "Не успеав да го декодирам сертификатот."
+
 #~ msgid "Not enough memory to store certificate data."
 #~ msgstr "Нема доволно меморија за складирање на податоците од сертификатот."
+
 #~ msgid "IV must be an even number of bytes in length."
 #~ msgstr "IV мора да биде еднаков број или бајти во должина."
+
 #~ msgid "Not enough memory to store the IV."
 #~ msgstr "Нема доволно меморија за складирање на IV."
+
 #~ msgid "IV contains non-hexadecimal digits."
 #~ msgstr "IV содржи не-хекседецимални броеви."
+
 #~ msgid "Private key cipher '%s' was unknown."
 #~ msgstr "Приватнот cipher за клучот'%s е непознат."
+
 #~ msgid "Not enough memory to create private key decryption key."
 #~ msgstr ""
 #~ "Нема доволно меморија за креирање на клучот за декриптирање на приватниот "
 #~ "клуч."
+
 #~ msgid "Not enough memory to store decrypted private key."
 #~ msgstr ""
 #~ "Нема доволно меморија за складирање на декриптираниот приватен клуч."
+
 #~ msgid "Failed to initialize the MD5 engine: %s / %s."
 #~ msgstr "Не успеав да го иницијализирам MD5 енџинот: %s / %s."
+
 #~ msgid "Not enough memory for decrypted key buffer."
 #~ msgstr "Нема доволно меморија за декриптираниот бафер на клучот."
+
 #~ msgid "Failed to initialize the decryption cipher context: %s / %s."
 #~ msgstr ""
 #~ "Не успеав да го иницијализирам cipher контекстот за декриптирање: %s / %s."
+
 #~ msgid "Failed to set symmetric key for decryption: %s / %s."
 #~ msgstr "Не успеав да поставам симетрички клуч за декриптирање: %s / %s."
+
 #~ msgid "Failed to set IV for decryption: %s / %s."
 #~ msgstr "Не успеав да поставам IV за декрипција: %s / %s."
+
 #~ msgid "Failed to decrypt the private key: %s / %s."
 #~ msgstr "Не успеав да го декриптирам приватниот клуч: %s / %s."
+
 #~ msgid "Couldn't decode certificate: %s"
 #~ msgstr "Не можам да го декодирам сертификатот: %s"
+
 #~ msgid "Failed to initialize the MD5 context: %d."
 #~ msgstr "Не успеав да го иницијализирам MD5 контекстот: %d."
+
 #~ msgid "Failed to initialize the decryption cipher slot."
 #~ msgstr "Не успеав да го иницијализирам cipher слотот за декриптирање."
+
 #~ msgid "Failed to set symmetric key for decryption."
 #~ msgstr "Не успеав да поставам симетрички клуч за декриптирање."
+
 #~ msgid "Failed to set IV for decryption."
 #~ msgstr "Не успеав да поставам IV за декриптирање."
+
 #~ msgid "Failed to initialize the decryption context."
 #~ msgstr "Не успеав да го иницијализирам контекстот за декриптирање."
+
 #~ msgid "Failed to decrypt the private key: %d."
 #~ msgstr "Не успеав да го декриптирам приватниот клуч: %d."
+
 #~ msgid "Failed to finalize decryption of the private key: %d."
 #~ msgstr "Не успеав да иницијализирам декриптирање на приватниот клуч: %d."
+
 #~ msgid "Couldn't decode certificate: %d"
 #~ msgstr "Не можам да го декодирам сертификатот: %d"
+
 #~ msgid ""
 #~ "Cannot find suitable software for VPN connection type '%s' to import the "
 #~ "file '%s'. Contact your system administrator."
 #~ msgstr ""
 #~ "Не можам да најдам соодветен софтвер за VPN поврзување од типот %s за да "
 #~ "ја внесам датотеката %s . Контактирајте го администраторот."
+
 #~ msgid ""
 #~ "All information about the VPN connection \"%s\" will be lost and you may "
 #~ "need your system administrator to provide information to create a new "
@@ -3019,24 +4483,30 @@ msgstr "_Клуч:"
 #~ "Сите информации за  VPN поврзувањето \"%s\" ќе бидат изгубени и можеби ќе "
 #~ "треба да го контактирате администраторот за да добиете информации за "
 #~ "креирање на ново поврзување."
+
 #~ msgid "Unable to load"
 #~ msgstr "Не можам да вчитам"
+
 #~ msgid "Cannot find some needed resources (the glade file)!"
 #~ msgstr "Не можам да ги пронајдам потребните ресурси (glade датотеката)!"
+
 #~ msgid "Cannot add VPN connection"
 #~ msgstr "Не можам да додадам VPN поврзување"
+
 #~ msgid ""
 #~ "No suitable VPN software was found on your system. Contact your system "
 #~ "administrator."
 #~ msgstr ""
 #~ "Не е пронајден соодветен VPN софтвер на Вашиот систем. Контактирајте го "
 #~ "Вашиот систем администратор."
+
 #~ msgid ""
 #~ "This assistant will guide you through the creation of a connection to a "
 #~ "Virtual Private Network (VPN)."
 #~ msgstr ""
 #~ "Помошникот ќе ве води низ процесот за креирање на врска до виртуелна "
 #~ "приватна мрежа (VPN)."
+
 #~ msgid ""
 #~ "It will require some information, such as IP addresses and secrets.  "
 #~ "Please see your system administrator to obtain this information."
@@ -3044,26 +4514,37 @@ msgstr "_Клуч:"
 #~ "Потребни се неколку информации, како IP адреси и некои тајни податоци.   "
 #~ "Ве молам обратете се кај Вашиот систем администратор за да ги добиете "
 #~ "овие информации."
+
 #~ msgid "1 of 2"
 #~ msgstr "1 од 2"
+
 #~ msgid "Choose which type of _VPN connection you wish to create:"
 #~ msgstr "Изберете го типот на _VPN врската која што сакате да ја креирате:"
+
 #~ msgid "Choose which type of VPN connection you wish to create:"
 #~ msgstr "Изберете го типот на VPN врската што сакате да ја креирате:"
+
 #~ msgid "2 of 2"
 #~ msgstr "2 од 2"
+
 #~ msgid "Edit VPN Connection"
 #~ msgstr "Уреди го VPN поврзувањето"
+
 #~ msgid "VPN Service for importing"
 #~ msgstr "VPN сервис за увоз"
+
 #~ msgid "- NetworkManager VPN properties"
 #~ msgstr "- Својства за VPN на NetworkManager"
+
 #~ msgid "Add a new VPN connection"
 #~ msgstr "Додај ново VPN поврзување"
+
 #~ msgid "Export the VPN settings to a file"
 #~ msgstr "Извези ги поставувањата за VPN во датотека"
+
 #~ msgid "Export the selected VPN connection to a file"
 #~ msgstr "Извези го избраното VPN поврзување во датотека"
+
 #~ msgid ""
 #~ "Could not find the authentication dialog for VPN connection type '%s'. "
 #~ "Contact your system administrator."
@@ -3071,6 +4552,7 @@ msgstr "_Клуч:"
 #~ "Не можам да го пронајдам дијалог прозорецот за проверка на "
 #~ "веродостојноста за VPN поврзувањето од тип %s. Контактирајте го "
 #~ "администраторот на системот."
+
 #~ msgid ""
 #~ "There was a problem launching the authentication dialog for VPN "
 #~ "connection type '%s'. Contact your system administrator."
@@ -3078,6 +4560,6 @@ msgstr "_Клуч:"
 #~ "Имаше проблем со подигањето на дијалог прозорецот за проверка на "
 #~ "веродостојноста за VPN поврзувањето од тип %s. Контактирајте го "
 #~ "администраторот на системот."
+
 #~ msgid "Existing wireless network"
 #~ msgstr "Постоечка безжична мрежа"
-
diff --git a/po/ml.po b/po/ml.po
index 0955b6a8..dd9d9b4d 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.master.ml\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2013-04-19 13:24+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -22,7 +21,7 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "ശൃംഖല"
 
@@ -128,46 +127,90 @@ msgstr ""
 "ഇഎപി ആധികാരികത ഉറപ്പാക്കലിന്റെ രണ്ടാം ഘട്ടത്തിലുള്ള സിഎ സര്‍ട്ടിഫിക്കേറ്റുകളെപ്പറ്റിയുള്ള "
 "മുന്നറിയിപ്പുകള്‍ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനായി ഇതു് true ആയി സജ്ജമാക്കുക."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "ശൃംഖല മാനേജര്‍"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "ശൃംഖല മാനേജര്‍"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X ആധികാരികത"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_കണക്ട് ചെയ്യുക"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_ശൃംഖലയുടെ പേരു്:"
 
-#: ../src/applet.c:541
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "അഡ്-ഹോക്"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "ഒരു ബന്ധം ചേര്‍ക്കാന്‍/സജീവമാക്കാന്‍ സാധിച്ചില്ല"
 
-#: ../src/applet.c:543 ../src/applet.c:587 ../src/applet.c:613
-#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "അറിയാത്ത ഏതോ പ്രശ്നം"
 
-#: ../src/applet.c:546 ../src/applet.c:616 ../src/applet-device-wifi.c:1379
-#: ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "ബന്ധമായില്ല"
 
-#: ../src/applet.c:585
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "ഉപകരണം വേര്‍പ്പെടുത്താന്‍ സാധിച്ചില്ല"
 
-#: ../src/applet.c:590
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "വേര്‍പ്പെടുത്താന്‍ സാധിച്ചില്ല"
 
-#: ../src/applet.c:611
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "ബന്ധം സജീവമാക്കാന്‍ സാധിച്ചില്ല"
 
-#: ../src/applet.c:926 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "ഈ സന്ദേശം ഇനി കാണിക്കരുതു്"
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -177,7 +220,7 @@ msgstr ""
 "\n"
 "ശൃംഖല കണക്ഷനില്‍ തടസ്സം നേരിട്ടതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -186,7 +229,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ സര്‍വീസ് അപ്രതീക്ഷിതമായി നിലച്ചതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:1021
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -196,7 +239,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ സേവനം തെറ്റായ ക്രമീകരമാണെന്നറിയിച്ചതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -205,7 +248,7 @@ msgstr ""
 "\n"
 "ബന്ധപ്പെടാനനുവദിച്ച സമയം കഴിഞ്ഞുപോയതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:1027
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -215,7 +258,7 @@ msgstr ""
 "വിപിഎന്‍ സേവനം ശരിയായ സമയത്തു് ആരംഭിക്കുവാന്‍ സാധ്യമാകാത്തതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' "
 "പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:1030
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -224,7 +267,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ സേവനം ആരംഭിക്കുന്നതിലുള്ള തടസ്സം കാരണം വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:1033
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -233,7 +276,7 @@ msgstr ""
 "\n"
 "സാധുവായ വിപിഎന്‍ രഹസ്യങ്ങള്‍ ലഭ്യമല്ലാത്തതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:1036
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -242,7 +285,7 @@ msgstr ""
 "\n"
 "അസാധുവായ വിപിഎന്‍ രഹസ്യങ്ങള്‍ കാരണം വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:1043
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -251,7 +294,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ ബന്ധം '%s' പരാജയപ്പെട്ടു."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -261,7 +304,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ കണക്ഷനില്‍ തടസ്സം നേരിട്ടതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' വിഛേദിക്കപ്പെട്ടു."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -270,7 +313,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ സേവനത്തില്‍ തടസ്സം നേരിട്ടതിനാല്‍ വിപിഎന്‍ ബന്ധം '%s' വിഛേദിക്കപ്പെട്ടു."
 
-#: ../src/applet.c:1070
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -279,7 +322,7 @@ msgstr ""
 "\n"
 "വിപിഎന്‍ ബന്ധം '%s' വിഛേദിക്കപ്പെട്ടു."
 
-#: ../src/applet.c:1100
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -290,19 +333,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1102
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "വിപിഎന്‍ കണക്ഷന്‍ വിജയകരമായി സ്ഥാപിച്ചിരിയ്ക്കുന്നു.\n"
 
-#: ../src/applet.c:1104
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "വിപിഎന്‍ ലോഗിന്‍ സന്ദേശം"
 
-#: ../src/applet.c:1110 ../src/applet.c:1118 ../src/applet.c:1168
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "വിപിഎന്‍ ബന്ധം പരാജയപ്പെട്ടു"
 
-#: ../src/applet.c:1175
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -315,7 +358,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1178
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -328,707 +371,593 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1493
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "ഉപകരണം തയ്യാറല്ല (ഫേംവെയര്‍ ഇല്ല)"
 
-#: ../src/applet.c:1495
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "ഉപകരണം തയ്യാറല്ല"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1505 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ബന്ധം വിഛേദിച്ചിരിയ്ക്കുന്നു"
 
-#: ../src/applet.c:1521
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "ബന്ധം വിഛേദിക്കുക"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "ഉപകരണം കൈകാര്യം ചെയ്യാത്തതാണു്"
 
-#: ../src/applet.c:1579
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "ശൃംഖല ഉപകരണങ്ങളൊന്നും ലഭ്യമല്ല"
 
-#: ../src/applet.c:1667
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_വിപിഎന്‍ ബന്ധങ്ങള്‍"
 
-#: ../src/applet.c:1724
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "വിപി_എന്‍ ക്രമീകരിക്കുക..."
 
-#: ../src/applet.c:1728
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "വിപിഎന്‍ _വിഛേദിക്കുക"
 
-#: ../src/applet.c:1822
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager പ്രവര്‍ത്തനത്തിലില്ല..."
 
-#: ../src/applet.c:1827 ../src/applet.c:2682
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "ശൃംഖല ബന്ധം പ്രവര്‍ത്ത രഹിതമാക്കിയിരിക്കുന്നു"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2048
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "_ശൃംഖല ബന്ധം സജ്ജമാക്കുക"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2057
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "_വയര്‍ലെസ് സജ്ജമാക്കുക"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2066
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "_മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് സജ്ജമാക്കുക"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2075
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "വൈമാ_ക്സ് മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് പ്രവര്‍ത്തനസജ്ജമാക്കുക"
-
 #. Toggle notifications item
-#: ../src/applet.c:2086
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "അറിയിപ്പു_കള്‍ പ്രവര്‍ത്തന സജ്ജമാക്കുക"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2097
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "ബന്ധ _വിവരം"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2107
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "ബന്ധങ്ങള്‍ ചിട്ടപ്പെടുത്തുക..."
 
-#. Help item
-#: ../src/applet.c:2121
-msgid "_Help"
-msgstr "_സഹായം"
-
-#. About item
-#: ../src/applet.c:2130
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_അണിയറ വിശേഷം"
 
-#: ../src/applet.c:2308
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ '%s'-മായി ബന്ധപ്പെട്ടിരിക്കുന്നു."
+
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "ബന്ധംവിഛേദിച്ചിരിക്കുന്നു"
 
-#: ../src/applet.c:2309
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "ശൃംഖല ബന്ധം വിഛേദിച്ചിരിക്കുന്നു."
 
-#: ../src/applet.c:2544
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "ശൃംഖല ബന്ധം '%s'-നായി തയ്യാറെടുക്കുന്നു..."
 
-#: ../src/applet.c:2547
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr ""
 "ശൃംഖല ബന്ധം '%s' ഉപയോക്താവിനോടു് ആധികാരികത ഉറപ്പാക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു..."
 
-#: ../src/applet.c:2550 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:590
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s'-നു് ഒരു ശൃംഖല വിലാസത്തിനായി ആവശ്യപ്പെടുന്നു..."
 
-#: ../src/applet.c:2553
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ശൃംഖല ബന്ധം '%s' സജീവമാണു്"
 
-#: ../src/applet.c:2636
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "വിപിഎന്‍ ബന്ധം '%s' ആരംഭിക്കുന്നു..."
 
-#: ../src/applet.c:2639
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr ""
 "വിപിഎന്‍ ബന്ധം '%s' ഉപയോക്താവിനോടു് ആധികാരികത ഉറപ്പാക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു..."
 
-#: ../src/applet.c:2642
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s'-നായി ഒരു വിപിഎന്‍ വിലാസം ആവശ്യപ്പെടുന്നു..."
 
-#: ../src/applet.c:2645
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "വിപിഎന്‍ ബന്ധം '%s' സജീവമാണു്"
 
-#: ../src/applet.c:2687
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "ശൃംഖല ബന്ധം ലഭ്യമല്ല"
 
-#: ../src/applet.c:3394
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager ലഘുപ്രയോഗം"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:304
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:772
-#: ../src/applet-device-gsm.c:360 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr "തെറ്റായ പിയുകെ കോഡ്; ദയവായി നിങ്ങളുടെ ദാതാവുമായി ബന്ധപ്പെടുക."
+
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "തെറ്റായ പിന്‍ കോഡ്; ദയവായി നിങ്ങളുടെ ദാതാവുമായി ബന്ധപ്പെടുക."
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr "പൂട്ട് തുറക്കേണ്ട കോഡ് അയയ്ക്കുന്നു..."
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് (%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
+msgid "Mobile Broadband"
+msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ്"
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "ലഭ്യമായവ"
 
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:346
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:816
-#: ../src/applet-device-gsm.c:402 ../src/applet-device-wimax.c:419
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ '%s'-മായി ബന്ധപ്പെട്ടിരിക്കുന്നു."
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് കണക്ഷന്‍..."
 
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:350
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:820
-#: ../src/applet-device-gsm.c:406 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "ബന്ധം സ്ഥാപിച്ചു"
 
-#: ../src/applet-device-bt.c:200
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ മൊബെല്‍ ബ്രോഡ്ബാന്‍ഡ് ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ശൃംഖല."
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ വീട്ടിലെ ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ പുറത്തൊരു ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
+
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ മൊബെല്‍ ബ്രോഡ്ബാന്‍ഡ് ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
 
-#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:581
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം '%s'-നായി തയ്യാറാകുന്നു..."
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:584
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം '%s' ക്രമീകരിക്കുന്നു..."
 
-#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:587
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr ""
 "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം '%s' ഉപയോക്താവിനോടു് ആധികാരികത ഉറപ്പാക്കുന്നതിനായി "
 "ആവശ്യപ്പെട്ടിരിക്കുന്നു..."
 
-#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:607
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം '%s' സജീവമാണു്"
 
-#: ../src/applet-device-cdma.c:250 ../src/applet-device-broadband.c:718
-#: ../src/applet-device-gsm.c:306 ../src/applet-dialogs.c:425
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് (%s)"
-
-#: ../src/applet-device-cdma.c:252 ../src/applet-device-broadband.c:720
-#: ../src/applet-device-gsm.c:308
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
-#: ../src/libnm-gtk/nm-ui-utils.c:333
-msgid "Mobile Broadband"
-msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ്"
-
-#. Default connection item
-#: ../src/applet-device-cdma.c:317
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് (സിഡിഎംഎ)ബന്ധം..."
-
-#: ../src/applet-device-cdma.c:351
-msgid "You are now connected to the CDMA network."
-msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ സിഡിഎംഎ ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
-
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-cdma.c:424
-msgid "CDMA network."
-msgstr "സിഡിഎംഎ ശൃംഖല."
-
-#: ../src/applet-device-cdma.c:419 ../src/applet-device-broadband.c:958
-#: ../src/applet-device-gsm.c:679
-msgid "You are now registered on the home network."
-msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ വീട്ടിലെ ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
-
-#: ../src/applet-device-cdma.c:425 ../src/applet-device-broadband.c:964
-#: ../src/applet-device-gsm.c:685
-msgid "You are now registered on a roaming network."
-msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ പുറത്തൊരു ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
-
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "ഓട്ടോ ഇതര്‍നെറ്റ്"
 
-#: ../src/applet-device-ethernet.c:202
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "എതര്‍നെറ്റ് ശൃംഖലകള്‍ (%s)"
 
-#: ../src/applet-device-ethernet.c:204
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "എതര്‍നെറ്റ് ശൃംഖല (%s)"
 
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "എതര്‍നെറ്റ് ശൃംഖലകള്‍"
 
-#: ../src/applet-device-ethernet.c:209
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "എതര്‍നെറ്റ് ശൃംഖല"
 
-#: ../src/applet-device-ethernet.c:271
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ എഥര്‍നെറ്റ് ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
 
-#: ../src/applet-device-ethernet.c:297
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "എഥര്‍നെറ്റ് ശൃംഖല ബന്ധം '%s' തയ്യാറാകുന്നു..."
 
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "എഥര്‍നെറ്റ് ശൃംഖല ബന്ധം '%s' ക്രമീകരിയ്ക്കുന്നു..."
 
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr ""
 "എഥര്‍നെറ്റ് ബന്ധം '%s' ഉപയോക്താവിനോടു് ആധികാരികത ഉറപ്പാക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു..."
 
-#: ../src/applet-device-ethernet.c:306
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s'-നുള്ള ഒരു എഥര്‍നെറ്റ് ശൃംഖല വിലാസം ആവശ്യപ്പെടുന്നു..."
 
-#: ../src/applet-device-ethernet.c:310
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "എഥര്‍നെറ്റ് ശൃംഖല ബന്ധം '%s' സജീവമാണു്"
 
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "ഡിഎസ്എല്‍ ആധികാരികത ഉറപ്പാക്കല്‍"
 
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:521
-msgid "Wrong PUK code; please contact your provider."
-msgstr "തെറ്റായ പിയുകെ കോഡ്; ദയവായി നിങ്ങളുടെ ദാതാവുമായി ബന്ധപ്പെടുക."
-
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:498
-msgid "Wrong PIN code; please contact your provider."
-msgstr "തെറ്റായ പിന്‍ കോഡ്; ദയവായി നിങ്ങളുടെ ദാതാവുമായി ബന്ധപ്പെടുക."
-
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:548
-msgid "Sending unlock code..."
-msgstr "പൂട്ട് തുറക്കേണ്ട കോഡ് അയയ്ക്കുന്നു..."
-
-#. Default connection item
-#: ../src/applet-device-broadband.c:785
-msgid "New Mobile Broadband connection..."
-msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് കണക്ഷന്‍..."
-
-#: ../src/applet-device-broadband.c:821
-msgid "You are now connected to the Mobile Broadband network."
-msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ മൊബെല്‍ ബ്രോഡ്ബാന്‍ഡ് ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
-
-#: ../src/applet-device-broadband.c:957 ../src/applet-device-broadband.c:963
-msgid "Mobile Broadband network."
-msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ശൃംഖല."
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:373
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് (ജിഎസ്എം) ബന്ധം..."
-
-#: ../src/applet-device-gsm.c:407
-msgid "You are now connected to the GSM network."
-msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ ജിഎസ്എം ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
-
-#: ../src/applet-device-gsm.c:678 ../src/applet-device-gsm.c:684
-msgid "GSM network."
-msgstr "ജിഎസ്എം ശൃംഖല."
-
-#: ../src/applet-device-wifi.c:98
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "അദൃശ്യമായ വയര്‍ലെസ് ശൃംഖലയുമായി ബ_ന്ധപ്പെടുക..."
 
-#: ../src/applet-device-wifi.c:149
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "_പുതിയ വയര്‍ലെസ് ശൃംഖല ഉണ്ടാക്കുക..."
 
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ഒന്നുമില്ല)"
 
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "വയര്‍ലെസ് ശൃംഖലകള്‍ (%s)"
 
-#: ../src/applet-device-wifi.c:789
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "വയര്‍ലെസ് ശൃംഖല (%s)"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "വയര്‍ലെസ് ശൃംഖല"
 msgstr[1] "വയര്‍ലെസ് ശൃംഖലകള്‍"
 
-#: ../src/applet-device-wifi.c:824
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "വയര്‍ലസ്സ് പ്രവര്‍ത്തനരഹിതമാക്കിയിരിയ്ക്കുന്നു"
 
-#: ../src/applet-device-wifi.c:825
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "ഹാര്‍ഡ്‌​വെയര്‍ സ്വിച്ച് ഉപയോഗിച്ച് വയര്‍ലെസ്സ് പ്രവര്‍ത്തന രഹിതമാക്കിയിരിക്കുന്നു"
 
-#: ../src/applet-device-wifi.c:886
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "കൂടുതല്‍ ശൃംഖലകള്‍"
 
-#: ../src/applet-device-wifi.c:1065
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "ലഭ്യമായ വയര്‍ലെസ് ശൃംഖലകള്‍"
 
-#: ../src/applet-device-wifi.c:1066
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ശൃംഖലകളുടെ പട്ടികയുപയോഗിച്ചു് ഒരു വയര്‍ലെസ് ശൃംഖലയുമായി ബന്ധപ്പെടുക"
 
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ വയര്‍ലെസ് ശൃംഖല '%s'-മായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
 
-#: ../src/applet-device-wifi.c:1291
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "വയര്‍ഡ് ശൃംഖല ബന്ധം '%s' തയ്യാറാകുന്നു..."
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "വയര്‍ലെസ് ശൃംഖല ബന്ധം '%s' ക്രമീകരിക്കുന്നു..."
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr ""
 "വയര്‍ലെസ് ബന്ധം '%s' ഉപയോക്താവിനോടു് ആധികാരികത ഉറപ്പാക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു..."
 
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "'%s'-നുള്ള ഒരു വയര്‍ലെസ് ശൃംഖല വിലാസത്തിനായി ആവശ്യപ്പെടുന്നു..."
 
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "വയര്‍ലെസ് ശൃംഖല ബന്ധം '%s' സജീവമാണു്: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "വയര്‍ലെസ് ശൃംഖല ബന്ധം '%s' സജീവമാണു്"
 
-#: ../src/applet-device-wifi.c:1374
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "ബന്ധം സജീവമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു"
 
-#: ../src/applet-device-wifi.c:1393
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "പുതിയ ബന്ധം ചേര്‍ക്കാനായില്ല"
 
-#: ../src/applet-device-wimax.c:227
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "വൈമാക്സ് മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് (%s)"
-
-#: ../src/applet-device-wimax.c:229
-msgid "WiMAX Mobile Broadband"
-msgstr "വൈമാക്സ് മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ്"
-
-#: ../src/applet-device-wimax.c:255
-msgid "WiMAX is disabled"
-msgstr "വൈമാക്സ് പ്രവര്‍ത്തനരഹിതമാക്കിയിരിയ്ക്കുന്നു"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled by hardware switch"
-msgstr "ഹാര്‍ഡ്​വെയര്‍ സ്വിച്ച് ഉപയോഗിച്ച് വൈമാക്സ് പ്രവര്‍ത്തന രഹിതമാക്കിയിരിക്കുന്നു"
-
-#: ../src/applet-device-wimax.c:424
-msgid "You are now connected to the WiMAX network."
-msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ വൈമാക്സ് ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
-
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:602
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം '%s' സജീവമാണു്: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:605
-msgid "roaming"
-msgstr "പുറത്തുള്ള"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "ബന്ധം സംബന്ധിച്ചുള്ള വിവരം കാണിക്കുന്നതില്‍ പിശക്"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "എല്‍ഇഎപി"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "ഡൈനമിക് ഡബ്ലിയുഇപി"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
-#: ../src/applet-dialogs.c:248
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "ഡബ്ലിയുപിഎ/ഡബ്ലിയുപിഎ2"
 
-#: ../src/applet-dialogs.c:244
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "വിലാസങ്ങള്‍"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "ഡബ്ലിയുഇപി"
 
-#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ഒന്നുമില്ല"
 
-#: ../src/applet-dialogs.c:278
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (സഹജം)"
 
-#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:485
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:487
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "അറിയില്ല"
 
-#: ../src/applet-dialogs.c:362
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:364
-msgctxt "WiMAX CINR"
-msgid "unknown"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
 msgstr "അറിയില്ല"
 
-#: ../src/applet-dialogs.c:376
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "ഐപി വിലാസം:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "ബ്രോഡ്കാസ്റ്റ് വിലാസം:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
 msgstr "അറിയില്ല"
 
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "സബ്‌നെറ്റ് മാസ്ക്:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ഇതര്‍നെറ്റ് (%s)"
 
-#: ../src/applet-dialogs.c:414
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 വൈഫൈ (%s)"
 
-#: ../src/applet-dialogs.c:421
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "ജിഎസ്എം (%s)"
 
-#: ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "സിഡിഎംഎ (%s)"
 
-#: ../src/applet-dialogs.c:427
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "വൈമാക്സ് (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:433 ../src/applet-dialogs.c:792
-#: ../src/connection-editor/page-general.c:325
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "പൊതുവായ"
 
-#: ../src/applet-dialogs.c:437
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "വിനിമയതലം:"
 
-#: ../src/applet-dialogs.c:453
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "ഹാര്‍ഡ്‌വെയര്‍ വിലാസം:"
 
 #. Driver
-#: ../src/applet-dialogs.c:461
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ഡ്രൈവര്‍:"
 
-#: ../src/applet-dialogs.c:490
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "വേഗത:"
 
-#: ../src/applet-dialogs.c:500
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "സുരക്ഷ:"
 
-#: ../src/applet-dialogs.c:513
-msgid "CINR:"
-msgstr "സിഐഎന്‍ആര്‍:"
-
-#: ../src/applet-dialogs.c:526
-msgid "BSID:"
-msgstr "ബിഎസ്ഐഡി:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:543
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:554 ../src/applet-dialogs.c:661
-msgid "IP Address:"
-msgstr "ഐപി വിലാസം:"
-
-#: ../src/applet-dialogs.c:556 ../src/applet-dialogs.c:572
-msgctxt "Address"
-msgid "Unknown"
-msgstr "അറിയില്ല"
-
-#: ../src/applet-dialogs.c:570
-msgid "Broadcast Address:"
-msgstr "ബ്രോഡ്കാസ്റ്റ് വിലാസം:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:579
-msgid "Subnet Mask:"
-msgstr "സബ്‌നെറ്റ് മാസ്ക്:"
-
-#: ../src/applet-dialogs.c:581
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "അറിയില്ല"
-
-#: ../src/applet-dialogs.c:589 ../src/applet-dialogs.c:676
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "സഹജമായ റൂട്ട്:"
 
-#: ../src/applet-dialogs.c:601
-msgid "Primary DNS:"
-msgstr "പ്രാഥമിക ഡിഎന്‍എസ്:"
-
-#: ../src/applet-dialogs.c:610
-msgid "Secondary DNS:"
-msgstr "രണ്ടാമത്തെ ഡിഎന്‍എസ്:"
-
-#: ../src/applet-dialogs.c:620
-msgid "Ternary DNS:"
-msgstr "മൂന്നാമത്തെ ഡിഎന്‍എസ്:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:635
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:644
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "അവഗണിക്കപ്പെട്ടവ"
 
-#: ../src/applet-dialogs.c:797
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "വിപിഎന്‍ തരം:"
 
-#: ../src/applet-dialogs.c:804
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "വിപിഎന്‍ ഗേറ്റ്‌വേ:"
 
-#: ../src/applet-dialogs.c:810
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "വിപിഎന്‍ ഉപയോക്തൃനാമം:"
 
-#: ../src/applet-dialogs.c:816
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "വിപിഎന്‍ ബാനര്‍:"
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "അടിസ്ഥാന ബന്ധം:"
 
-#: ../src/applet-dialogs.c:824 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "അപരിചിതം"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:887
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "സാധുവായ സജീവ ബന്ധങ്ങളൊന്നും കണ്ടില്ല!"
 
-#: ../src/applet-dialogs.c:915
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 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:918
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "നിങ്ങളുടെ ശൃംഖല ഉപകരണങ്ങളും ബന്ധങ്ങളും കൈകാര്യം ചെയ്യുന്നതിനായുള്ള അറിയിപ്പിനുള്ള സ്ഥലം."
 
-#: ../src/applet-dialogs.c:920
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager വെബ്സൈറ്റ്"
 
-#: ../src/applet-dialogs.c:935
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "ലഭ്യമല്ലാത്ത റിസോഴ്സുകള്‍"
 
-#: ../src/applet-dialogs.c:960
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് നെറ്റ്‌വര്‍ക്കിനുള്ള അടയാളവാക്ക്"
 
-#: ../src/applet-dialogs.c:969
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s'-ലേക്കു് ബന്ധപ്പെടുന്നതിനായി ഒരു അടയാളവാക്ക് ആവശ്യമുണ്ടു്."
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "അടയാളവാക്ക്:"
 
-#: ../src/applet-dialogs.c:1282
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "സിം പിന്‍ കൊടുത്തു് തുറക്കണം"
 
-#: ../src/applet-dialogs.c:1283
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "സിം പിന്‍ കൊടുത്തു് തുറക്കണം"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1285
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1036,25 +965,25 @@ msgid ""
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ഉപകരണം '%s' ഉപയോഗിക്കുന്നതിനു് മുമ്പ് ഒരു സിം പിന്‍ കോഡ് ആവശ്യമുണ്ടു്."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1287
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "പിന്‍ കോഡ്:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1291
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "പിന്‍ കോഡ് കാണിയ്ക്കുക"
 
-#: ../src/applet-dialogs.c:1293
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "സിം പിയുകെ കൊടുത്തു് തുറക്കണം"
 
-#: ../src/applet-dialogs.c:1294
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "സിം പിയുകെ കൊടുത്തു് തുറക്കണം"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1296
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1062,29 +991,36 @@ msgid ""
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ഉപകരണം '%s' ഉപയോഗിക്കുന്നതിനു് മുമ്പ് ഒരു സിം പിയുകെ കോഡ് ആവശ്യമുണ്ടു്."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1298
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "പിയുകെ കോഡ്:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1301
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "പുതിയ പിന്‍ കോഡ്:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1303
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "പുതിയ പിന്‍ കോഡ് വീണ്ടും നല്‍കുക:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1308
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "പിന്‍/പിഒകെ കോഡുകള്‍ കാണിയ്ക്കുക"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1092,26 +1028,48 @@ msgstr ""
 "നിങ്ങളുടെ കമ്പ്യൂട്ടറിനെ ശൃംഖലയില്‍ തിരിച്ചറിയുന്നതു്  ഐപി വിലാസങ്ങള്‍ വഴിയാണു്. ഒരു ഐപി വിലാസം "
 "ചേര്‍ക്കുന്നതിനായി \"ചേര്‍ക്കുക\" എന്ന ബട്ടണില്‍ ക്ലിക്ക് ചെയ്യുക."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_നീക്കം ചെയ്യുക"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "സ്വയം ലഭിച്ച റൂട്ടുകള്‍ അവ_ഗണിക്കുക"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "ഈ _ബന്ധത്തിന്റെ ശൃംഖലയിലുള്ള വസ്തുക്കള്‍ക്കു് മാത്രം ഉപയോഗിയ്ക്കുക"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "സജ്ജമെങ്കില്‍, ഈ ബന്ധം ഒരിക്കലും സഹജമായി ശൃംഖല ബന്ധമായി ഉപയോഗിക്കുവാന്‍ സാധ്യമല്ല."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1119,15 +1077,15 @@ msgstr "സജ്ജമെങ്കില്‍, ഈ ബന്ധം ഒരി�
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "ഉണ്ടാക്കുക"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "ഒരു ബന്ധ രീതി തെരഞ്ഞെടുക്കുക"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1180,65 +1138,90 @@ msgid "Bonded _connections:"
 msgstr "ബോണ്ടട് _ബന്ധങ്ങള്‍:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "രീതി(_M):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "_മോഡ്:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
-msgid "_Edit"
-msgstr "_ചിട്ട"
-
-#. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "_Delete"
-msgstr "_നീക്കം ചെയ്യുക"
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_ചിട്ട"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "നോക്കുന്ന _ഇടവേള:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "മില്ലി സെക്കന്റ്"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: ../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:"
 msgstr "_ഇന്റര്‍ഫെയിസ് പേര്:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "_കണ്ണി നോക്കുക:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP _ലക്ഷ്യങ്ങള്‍:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "കണ്ണി _ഇപ് സമയം:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "കണ്ണി _ഡൌണ്‍ സമയം:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "പ്രാഥമിക ഡിഎന്‍എസ്:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "ബൈറ്റുകള്‍"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "വഴിയുടെ _വില:"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_മുന്‍ഗണന: "
 
@@ -1250,40 +1233,286 @@ msgstr "_ഹെയര്‍പിന്‍ രീതി:"
 msgid "Bridged _connections:"
 msgstr "ബ്രീഡ്ജ്ഡ് _ബന്ധങ്ങള്‍:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "_മുന്നോട്ടുള്ള സമയം:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_ഹലോ സമയം:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "സെക്കന്റ്"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "_ശൃംഖല ബന്ധം സജ്ജമാക്കുക"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_STP സജ്ജമാക്കുക (സ്പാനിംഗ് ട്രീ നിയമം)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_പരമാവധി വയസ്സ്:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_വയസ്സാകുന്ന സമയം:"
 
-#: ../src/connection-editor/ce-page.c:67
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "സ്വയം"
 
-#: ../src/connection-editor/ce-page.c:348
+#: ../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
+msgid "default"
+msgstr "സ്വതവേയുള്ള"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "വിലാസം"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "വിലാസം"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "ഏതെങ്കിലും ഡിവൈസ്"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "അപരിചിതമായ പിശക് കാരണം ബന്ധ രഹസ്യങ്ങള്‍ പരിഷ്കരിക്കുന്നതില്‍ പരാജയം."
 
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "ഈ കണക്ഷനുവേണ്ടി 802.1_X സുരക്ഷ ഉപയോഗിക്കുക"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#, fuzzy
+msgid "Enable"
+msgstr "_വയര്‍ലെസ് സജ്ജമാക്കുക"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#, fuzzy
+msgid "Priority"
+msgstr "_മുന്‍ഗണന: "
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#, fuzzy
+msgid "Priority Groups"
+msgstr "_മുന്‍ഗണന: "
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Priority:"
+msgstr "_മുന്‍ഗണന: "
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Priority Bandwidth:"
+msgstr "_മുന്‍ഗണന: "
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:10
+#: ../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
@@ -1296,16 +1525,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 msgid "Sho_w password"
 msgstr "അടയാളവാക്ക് കാ_ണിക്കുക"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1317,7 +1547,8 @@ msgstr "_അടയാളവാക്ക്:"
 #: ../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-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "സ്വയം"
@@ -1372,18 +1603,18 @@ msgstr "Aut_onegotiate"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "_ഉപകരണത്തിന്റെ മാക് വിലാസം:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_സേവനം:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "തനിപ്പകര്‍പ്പെടുത്ത മാക് വിലാസം:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1393,19 +1624,54 @@ msgstr ""
 "ഡിവൈസിനുള്ള ഹാര്‍ഡ്‌വെയര്‍ വിലാസമായി ഉപയോഗിയ്ക്കുന്നു. ഈ വിശേഷതയെ മാക് ക്ലോണിങ് അല്ലെങ്കില്‍ "
 "സ്പൂഫീങ് എന്നു് വിളിയ്ക്കുന്നു.  ഉദാഹരണം: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_എംടിയു:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "ബൈറ്റുകള്‍"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "സ്വതവേയുള്ള"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "അവഗണിക്കുക"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "സംപ്രേക്ഷണം"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1444,8 +1710,8 @@ msgstr "നിങ്ങള്‍ നല്‍കിയ ഡിഎന്‍എസ�
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "നിങ്ങള്‍ നല്‍കിയ"
 
@@ -1456,22 +1722,22 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "മറ്റു് കമ്പ്യൂട്ടറുകളുമായി പങ്കിടുന്നു"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_രീതി:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "വിലാസങ്ങള്‍"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1481,8 +1747,8 @@ msgstr ""
 "ശൃംഖല ഭരണാധികാരിയെ അനുവദിക്കുന്നു. നിങ്ങള്‍ക്കു് ഒരു DHCP ക്ലയന്റ് ഐഡന്റിഫയര്‍ ഉപയോഗിക്കണമെങ്കില്‍, "
 "ഇവിടെ നല്‍കുക."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1490,26 +1756,25 @@ msgstr ""
 "ഹോസ്റ്റ് നാമങ്ങള്‍ റിസോള്‍വ് ചെയ്യുമ്പോള്‍ ഉപയോഗിയ്ക്കുന്ന ഡൊമെയിനുകള്‍. ഡൊമെയിനുകള്‍ തമ്മില്‍ കോമാ "
 "ഉപയോഗിച്ചു് വേര്‍തിരിക്കുക."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "_തിരയേണ്ട ഡൊമെയിനുകള്‍:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_ഡിഎന്‍എസ് സെര്‍വറുകള്‍:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1517,11 +1782,11 @@ msgstr ""
 "ഹോസ്റ്റ് നാമങ്ങള്‍ റിസോള്‍വ് ചെയ്യുവാന്‍ ഉപയോഗിക്കുന്ന ഡൊമെയിന്‍ നെയിം സെര്‍വറുകളുടെ ഐപി വിലാസങ്ങള്‍. "
 "ഡൊമെയിന്‍ നെയിം സെര്‍വര്‍ വിലാസങ്ങള്‍ തമ്മില്‍ കോമാ ഉപയോഗിച്ചു് വേര്‍തിരിക്കുക."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1529,16 +1794,43 @@ msgstr ""
 "IPv6-നുള്ള ശൃംഖലകളുമായി ബന്ധപ്പെടുമ്പോള്‍, IPv4 ക്രമീകരണം പരാജയപ്പെടുകയും IPv6 ക്രമീകരണം "
 "വിജയിക്കുകയും ചെയ്താല്‍ ബന്ധം പൂര്‍ത്തിയാക്കുവാന്‍ അനുവദിക്കുന്നു."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_റൂട്ടുകള്‍…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "പ്രവര്‍ത്തന രഹിതം"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "ഈ ബന്ധം പൂര്‍ത്തിയാക്കുന്നതിനായി IPv_6 അഡ്രസിങ് ആവശ്യമുണ്ടു്"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1547,71 +1839,38 @@ msgstr ""
 "വിജയിക്കുകയും ചെയ്താല്‍ ബന്ധം പൂര്‍ത്തിയാക്കുവാന്‍ അനുവദിക്കുന്നു."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "ഏതെങ്കിലും"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3ജി (യുഎംടിഎസ്/എച്ച്എസ്‌പിഎ)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2ജി (ജിപിആര്‍എസ്/എഡ്ജ്)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3ജി (യുഎംടിഎസ്/എച്ച്എസ്‌പിഎ) യ്ക്കു് മുന്‍ഗണന"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2ജി (ജിപിആര്‍എസ്/എഡ്ജ്) യ്ക്കു് മുന്‍ഗണന"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "4ജി (LTE) യ്ക്കു് മുന്‍ഗണന"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "4ജി (LTE) മാത്രം ഉപയോഗിക്കുക"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "അടിസ്ഥാനം"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "ന_മ്പര്‍:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "സങ്കീര്‍ണ്ണമായ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_എപിഎന്‍:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "_ശൃംഖല ഐഡി:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_തരം:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "മാറ്റുക..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "_പിന്‍:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "വീട്ടിലെ ശൃംഖല ലഭ്യമല്ലെങ്കില്‍ _പുറത്തുള്ളവ അനുവദിക്കുക"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "അടയാളവാക്കുകള്‍ _കാണിക്കുക"
 
@@ -1663,29 +1922,71 @@ msgstr "പ്രതിധ്വനി"
 msgid "Send PPP _echo packets"
 msgstr "PPP _എക്കോ പാക്കറ്റുകള്‍ അയയ്ക്കുക"
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+msgid "_Import team configuration from a file..."
+msgstr "സൂക്ഷിച്ച വിപിഎന്‍ ക്രമീകരണങ്ങള്‍ ഇറക്കുമതി ചെയ്യുക..."
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "ബോണ്ടട് _ബന്ധങ്ങള്‍:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "സൂക്ഷിച്ച വിപിഎന്‍ ക്രമീകരണങ്ങള്‍ ഇറക്കുമതി ചെയ്യുക..."
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_പാരന്‍റ്റ് ഇന്റെര്‍ഫേസ്:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN ഇന്റെര്‍ഫേസ് _നാമം:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_പകര്‍ത്തിയ MAC വിലാസം:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN _ഐഡി:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "ഉപകരണത്തിന്റെ പേര് + സംഖ്യ"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + സംഖ്യ"
 
@@ -1702,94 +2003,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "ബി/ജി (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "ഇന്‍ഫ്രാസ്ട്രക്ചര്‍"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "അഡ്-ഹോക്"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "ട്രാന്‍സ്മിഷന്‍ _പവര്‍:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_നിരക്ക്:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_ചാനല്‍:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_ബാന്‍ഡ്:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "_മോഡ്:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "എസ്എസ്_ഐഡി:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "തിരിച്ചറിയാന്‍ അനുവദിച്ച രീതികള്‍"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "എക്സ്റ്റെന്‍സിബിള്‍ തിരിച്ചറിയല്‍ പ്രോട്ടോക്കോള്‍"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "പാസ്‌വേര്‍ഡ് തിരിച്ചറിയല്‍ പ്രോട്ടോക്കോള്‍"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "ചാലഞ്ച് ഹാന്‍ഡ്ഷെയിക് തിരിച്ചറിയല്‍ പ്രോട്ടോക്കോള്‍"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "മൈക്രോസോഫ്റ്റ് ചാലഞ്ച് ഹാന്‍ഡ്ഷെയിക് തിരിച്ചറിയല്‍ പ്രോട്ടോക്കോള്‍"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "മൈക്രോസോഫ്റ്റ് ചാലഞ്ച് ഹാന്‍ഡ്ഷെയിക് തിരിച്ചറിയല്‍ പ്രോട്ടോക്കോള്‍ പതിപ്പു് 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1798,307 +2103,364 @@ msgstr ""
 "പിന്തുണയ്ക്കുന്നു. ബന്ധങ്ങള്‍ പരാജയപ്പെട്ടാല്‍, ചില മാര്‍ഗ്ഗങ്ങള്‍ക്കുള്ള പിന്തുണ പ്രവര്‍ത്ത രഹിതമാക്കി "
 "വീണ്ടും ശ്രമിക്കുക."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:749
-#: ../src/connection-editor/ip6-routes-dialog.c:691
-#: ../src/connection-editor/page-ip4.c:915
-#: ../src/connection-editor/page-ip6.c:881
-msgid "Address"
-msgstr "വിലാസം"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:766
-#: ../src/connection-editor/page-ip4.c:932
-msgid "Netmask"
-msgstr "നെറ്റ്‌മാസ്ക്"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:783
-#: ../src/connection-editor/ip6-routes-dialog.c:725
-#: ../src/connection-editor/page-ip4.c:949
-#: ../src/connection-editor/page-ip6.c:915
-msgid "Gateway"
-msgstr "ഗേറ്റ്‌വേ"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:800
-#: ../src/connection-editor/ip6-routes-dialog.c:742
-msgid "Metric"
-msgstr "മെട്രിക്"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:708
-#: ../src/connection-editor/page-ip6.c:898
-msgid "Prefix"
-msgstr "പ്രീഫിക്സ്"
-
-#: ../src/connection-editor/new-connection.c:101
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "ഈഥര്‍നെറ്റ്"
 
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "വയര്‍ലസ്സ്"
 
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "വൈമാക്സ്"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "ബ്ലൂടൂത്ത്"
 
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:131
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "ഇന്‍ഫിനിബാന്‍ഡ്"
 
-#: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:392 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:559
+#: ../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
 msgid "Bond"
 msgstr "ബോണ്ട്"
 
-#: ../src/connection-editor/new-connection.c:143
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+#: ../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
+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
 msgid "Bridge"
 msgstr "ബ്രിഡ്ജ്"
 
-#: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:475 ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:563
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:252
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "ഹാര്‍ഡ്‌വെയര്‍"
 
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "വിര്‍ച്ച്വല്‍"
 
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "സൂക്ഷിച്ച വിപിഎന്‍ ക്രമീകരണങ്ങള്‍ ഇറക്കുമതി ചെയ്യുക..."
 
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "അപരിചിതമായ പിശക് കാരണം ബന്ധംഎഡിറ്റര്‍ ഡയലോഗ് ആരംഭിക്കുവാന്‍ സാധിച്ചില്ല."
 
-#: ../src/connection-editor/new-connection.c:380
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "പുതിയ ബന്ധം ഉണ്ടാക്കുവാന്‍ സാധ്യമായില്ല"
 
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "ബന്ധം നീക്കം ചെയ്യുന്നതില്‍ പരാജയം"
 
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "നിങ്ങള്‍ക്കു് %s ബന്ധം വെട്ടിനീക്കണം എന്നുറപ്പാണോ?"
 
-#: ../src/connection-editor/nm-connection-editor.c:118
+#: ../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
+msgid "Address"
+msgstr "വിലാസം"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "നെറ്റ്‌മാസ്ക്"
+
+#: ../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
+msgid "Gateway"
+msgstr "ഗേറ്റ്‌വേ"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "മെട്രിക്"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "പ്രീഫിക്സ്"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "%s ചിട്ടപ്പെടുത്തുന്നു"
 
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "പേരില്ലാത്ത ബന്ധം ചിട്ടപ്പെടുത്തുന്നു"
 
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "കണക്ഷന്റെ _പേരു്:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "എഡിറ്റര്‍ ആരംഭിക്കുന്നതില്‍ പിശക്."
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "ബന്ധം ചേര്‍ക്കുന്നതില്‍ പരാജയം"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 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:413
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_സൂക്ഷിക്കുക"
 
-#: ../src/connection-editor/nm-connection-editor.c:414
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "ഈ കണക്ഷന്‍ വരുത്തിയിരിയ്ക്കുന്ന ഏതു് മാറ്റങ്ങളും സൂക്ഷിയ്ക്കുക."
 
-#: ../src/connection-editor/nm-connection-editor.c:415
-msgid "_Save..."
-msgstr "_സൂക്ഷിക്കുക..."
-
-#: ../src/connection-editor/nm-connection-editor.c:416
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "ഈ സിസ്റ്റത്തിലുള്ള എല്ലാ ഉപയോക്താക്കള്‍ക്കും ഉപയോഗിയ്ക്കാവുന്ന രീതിയില്‍ ഈ ബന്ധം സൂക്ഷിക്കുന്നതിനായി "
 "ആധികാരികത നല്‍കുക."
 
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "ബന്ധം ഉണ്ടാക്കുവാന്‍ സാധ്യമായില്ല"
 
-#: ../src/connection-editor/nm-connection-editor.c:432
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "ബന്ധം ചിട്ടപ്പെടുത്തുവാന്‍ സാധ്യമായില്ല"
 
-#: ../src/connection-editor/nm-connection-editor.c:434
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "ബന്ധ എഡിറ്റര്‍ ജാലകം ഉണ്ടാക്കുന്നതില്‍ അറിയാത്ത പിഴവ്."
 
-#: ../src/connection-editor/nm-connection-editor.c:602
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "എഡിറ്റര്‍ ആരംഭിക്കുന്നതില്‍ പിശക്."
 
-#: ../src/connection-editor/nm-connection-editor.c:923
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "ബന്ധം ചേര്‍ക്കുന്നതില്‍ പരാജയം"
 
-#: ../src/connection-editor/nm-connection-editor.c:973
-msgid "Error saving connection"
-msgstr "ബന്ധം സൂക്ഷിയ്ക്കുന്നതില്‍ തെറ്റു്"
-
-#: ../src/connection-editor/nm-connection-editor.c:974
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "'%s' / '%s' വിശേഷത അസാധുവാകുന്നു: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "കണക്ഷന്റെ _പേരു്:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_കയറ്റുമതി..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "ഒരിക്കലും"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "ഉടന്‍"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d മിനിറ്റ് മുമ്പു്"
 msgstr[1] "%d മിനിറ്റുകള്‍ മുമ്പു്"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d മണിക്കൂര്‍ മുമ്പു്"
 msgstr[1] "%d മണിക്കൂറുകള്‍ മുമ്പു്"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ദിവസം മുമ്പു്"
 msgstr[1] "%d ദിവസങ്ങള്‍ മുമ്പു്"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d മാസം മുമ്പു്"
 msgstr[1] "%d മാസങ്ങള്‍ മുമ്പു്"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d വര്‍ഷം മുമ്പു്"
 msgstr[1] "%d വര്‍ഷങ്ങള്‍ മുമ്പു്"
 
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "പേര്"
 
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "ഏറ്റവും ഒടുവില്‍ ഉപയോഗിച്ചതു്"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "തെരഞ്ഞെടുത്ത ബന്ധം ചിട്ടപ്പെടുത്തുക."
 
-#: ../src/connection-editor/nm-connection-list.c:687
-msgid "_Edit..."
-msgstr "_ചിട്ട..."
-
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "തെരഞ്ഞെടുത്ത ബന്ധം ചിട്ടപ്പെടുത്തുന്നതിനു് മുമ്പ് ആധികാരികത ഉറപ്പാക്കുക."
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "തെരഞ്ഞെടുത്ത ബന്ധം നീക്കം ചെയ്യുക."
 
-#: ../src/connection-editor/nm-connection-list.c:704
-msgid "_Delete..."
-msgstr "_നീക്കം ചെയ്യുക..."
-
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "തെരഞ്ഞെടുത്ത ബന്ധംഇല്ലാതാക്കുന്നതിനായി ആധികാരികത ഉറപ്പാക്കുക"
 
-#: ../src/connection-editor/nm-connection-list.c:933
-msgid "Error creating connection"
-msgstr "ബന്ധം സൃഷ്ടിയ്ക്കുമ്പോള്‍ തെറ്റു്"
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:934
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "എങ്ങനെ '%s' കണക്ഷനുകള്‍ തയ്യാറാക്കണമെന്നറിയില്ല"
 
-#: ../src/connection-editor/nm-connection-list.c:989
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "ബന്ധം സൃഷ്ടിയ്ക്കുമ്പോള്‍ തെറ്റു്"
+
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "ബന്ധം ചിട്ടപ്പെടുത്തുന്നതില്‍ പിശക്"
 
-#: ../src/connection-editor/nm-connection-list.c:990
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID '%s'-മായുള്ളൊരു കണക്ഷന്‍ ലഭ്യമായില്ല"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1X സുരക്ഷ"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "802.1x സെക്യൂരിറ്റി യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "ഈ കണക്ഷനുവേണ്ടി 802.1_X സുരക്ഷ ഉപയോഗിക്കുക"
 
-#: ../src/connection-editor/page-bond.c:395
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "ഈഥര്‍നെറ്റ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "ബ്ലൂടൂത് ഡിവൈസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "ബോണ്ട് ബന്ധം %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "ബ്ലൂടൂത്ത്"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "എതര്‍നെറ്റ് ശൃംഖല"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "വയര്‍ലെസ് ശൃംഖല"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "ബോണ്ട് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-bond.c:534
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "പ്രാഥമിക ഡിഎന്‍എസ്:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "ബോണ്ട് ബന്ധം %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "ബ്രിഡ്ജ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
@@ -2110,50 +2472,75 @@ msgstr "ബ്രിഡ്ജ് ബന്ധം %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "ബ്രിഡ്ജ് പോര്‍ട്ട്"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "ബ്രിഡ്ജ് പോര്‍ട്ട് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "DSL യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL ബന്ധം%d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "മാക് വിലാസം ഇവിടെ സൂചിപ്പിക്കുന്ന ശൃംഖല ഡിവൈസിലേക്കുള്ള ബന്ധം ഈ ഐച്ഛികം മാറ്റാര്‍ക്കും "
 "അനുവദിക്കുന്നതല്ല. ഉദാഹരണം: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "ഈഥര്‍നെറ്റ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "ഈഥര്‍നെറ്റ്"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "തനിപ്പകര്‍പ്പെടുത്ത മാക് വിലാസം:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "സ്വതവേയുള്ള"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2162,138 +2549,193 @@ msgstr ""
 "മേഖല ബന്ധത്തിന്റെ വിശ്വാസ നിലയെ നിര്‍ണ്ണയിക്കുന്നു. ഫയര്‍വാള്‍ ചാത്തന്‍ സജീവമാണെങ്കില്‍ മാത്രം "
 "കാണിക്കുന്നു."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD പ്രവര്‍ത്തനത്തിലില്ല."
 
-#: ../src/connection-editor/page-general.c:328
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "പൊതു യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "ഇന്‍ഫിനിബാന്‍ഡ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "ഇന്‍ഫിനിബാന്‍ഡ് ബന്ധം %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "ഓട്ടോമാറ്റിക് (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "ഓട്ടോമാറ്റിക് (VPN) വിലാസങ്ങള്‍ മാത്രം"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "ഓട്ടോമാറ്റിക് (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "ഓട്ടോമാറ്റിക് (PPP) വിലാസങ്ങള്‍ മാത്രം"
+msgid "Automatic, addresses only"
+msgstr "ഓട്ടോമാറ്റിക് വിലാസങ്ങള്‍ മാത്രം"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "ഓട്ടോമാറ്റിക് (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "ഓട്ടോമാറ്റിക് (PPPoE) വിലാസങ്ങള്‍ മാത്രം"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "ഓട്ടോമാറ്റിക് (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "ഓട്ടോമാറ്റിക് (DHCP) വിലാസങ്ങള്‍ മാത്രം"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "ലിങ്ക്-ലോക്കല്‍ മാത്രം"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "പ്രവര്‍ത്തന രഹിതം"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "കൂടുതല്‍ _ഡിഎന്‍എസ് സെര്‍വറുകള്‍:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "അധികമായി തെ_രയേണ്ട ഡൊമെയിനുകള്‍:"
 
-#: ../src/connection-editor/page-ip4.c:847
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s-നുള്ള IPv4 റൂട്ടുകള്‍ ചിട്ടപ്പെടുത്തുക"
 
-#: ../src/connection-editor/page-ip4.c:998
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 സജ്ജീകരണങ്ങള്‍"
 
-#: ../src/connection-editor/page-ip4.c:1000
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "ഓട്ടോമാറ്റിക് വിലാസങ്ങള്‍ മാത്രം"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "അവഗണിക്കുക"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "ഓട്ടോമാറ്റിക്, DHCP മാത്രം"
 
-#: ../src/connection-editor/page-ip6.c:813
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s-നുള്ള IPv6 റൂട്ടുകള്‍ ചിട്ടപ്പെടുത്തുക"
 
-#: ../src/connection-editor/page-ip6.c:962
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 സജ്ജീകരണങ്ങള്‍"
 
-#: ../src/connection-editor/page-ip6.c:964
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-master.c:284
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
 #, c-format
 msgid "%s slave %d"
 msgstr "%s അടിമ %d"
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "ബ്രോഡ്ബാന്‍ഡ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "പിന്തുണ ലഭ്യമല്ലാത്ത മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:658
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് പ്രൊവൈഡര്‍ തരം തെരഞ്ഞെടുക്കുക"
 
-#: ../src/connection-editor/page-mobile.c:685
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2301,93 +2743,144 @@ msgstr ""
 "നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് പ്രൊവൈഡര്‍ ഉപയോഗിക്കുന്ന ടെക്നോളജി തെരഞ്ഞെടുക്കുക.  "
 "നിങ്ങള്‍ക്കറിയില്ലെങ്കില്‍ പ്രൊവൈഡറിനോട് അന്വേഷിക്കുക."
 
-#: ../src/connection-editor/page-mobile.c:690
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "എന്റെ പ്രൊവൈഡര്‍ _GSM ടെക്നോളജി ഉപയോഗിക്കുന്നു (i.e. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:697
+#: ../src/connection-editor/page-mobile.c:568
 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:707 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "സിഡിഎംഎ"
 
-#: ../src/connection-editor/page-mobile.c:710 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "ജിഎസ്എം"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ഒന്നുമില്ല"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP സജ്ജീകരണങ്ങള്‍"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-vlan.c:477
+#: ../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 "ഇംപോര്‍ട്ട് ചെയ്യുന്നതിനുള്ള ഫയല്‍ തെരഞ്ഞെടുക്കുക"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "vlan യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "DSL ബന്ധം%d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+#, fuzzy
+msgid "Team Port"
+msgstr "ബ്രിഡ്ജ് പോര്‍ട്ട്"
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "ശൃംഖല ബന്ധം ലഭ്യമല്ല"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "vlan യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-vlan.c:673
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN ബന്ധം%d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "വിപിഎന്‍ യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s'-നുള്ള വിപിഎന്‍ പ്ലഗിന്‍ സര്‍വീസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "വിപിഎന്‍ ബന്ധം%d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2397,11 +2890,11 @@ msgstr ""
 "\n"
 "പിശക്: വിപിഎന്‍ സര്‍വീസ് തരം ലഭ്യമല്ല."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "ഒരു വിപിഎന്‍ കണക്ഷന്‍ രീതി തെരഞ്ഞെടുക്കുക"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2411,7 +2904,7 @@ msgstr ""
 "തെരഞ്ഞെടുക്കുക.  നിങ്ങള്‍ക്കു് ആവശ്യമുള്ളതു് പട്ടികയില്‍ ലഭ്യമല്ല എങ്കില്‍, നിങ്ങള്‍ ശരിയായ പ്ലഗിന്‍ "
 "ഇന്‍സ്റ്റോള്‍ ചെയ്തിട്ടുണ്ടാവില്ല."
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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"
@@ -2419,83 +2912,91 @@ msgstr ""
 "BSSID ഇവിടെ സൂചിപ്പിക്കുന്ന വയര്‍ലെസ് ആക്സെസ് പോയിന്റിലേക്കുള്ള (എപി) ബന്ധം ഈ ഐച്ഛികം "
 "മാറ്റാര്‍ക്കും അനുവദിക്കുന്നതല്ല. ഉദാഹരണം: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:172
-#: ../src/connection-editor/page-wifi.c:176
-#: ../src/connection-editor/page-wifi.c:197
-#, c-format
-msgid "default"
-msgstr "സ്വതവേയുള്ള"
+#: ../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)\""
+msgstr ""
+"മാക് വിലാസം ഇവിടെ സൂചിപ്പിക്കുന്ന ശൃംഖല ഡിവൈസിലേക്കുള്ള ബന്ധം ഈ ഐച്ഛികം മാറ്റാര്‍ക്കും "
+"അനുവദിക്കുന്നതല്ല. ഉദാഹരണം: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "വൈഫൈ യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-wifi.c:645
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "ഏതെങ്കിലും ഡിവൈസ്"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "വയര്‍ലസ് ബന്ധം %d"
 
-#: ../src/connection-editor/page-wifi-security.c:265
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "ഒന്നുമില്ല"
-
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit പാസ്‌ഫ്രെയിസ്"
 
-#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "ഡൈനമിക് WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 പേഴ്സണല്‍"
 
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 എന്റര്‍പ്രൈസ്"
 
-#: ../src/connection-editor/page-wifi-security.c:396
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "വൈഫൈ സുരക്ഷ യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല; വൈഫൈ ക്രമീകരണം ലഭ്യമല്ല."
 
-#: ../src/connection-editor/page-wifi-security.c:407
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "വയര്‍ലെസ് സെക്യൂരിറ്റി"
 
-#: ../src/connection-editor/page-wifi-security.c:409
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "വൈഫൈ സെക്യൂരിറ്റി യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "വൈമാക്സ് യൂസര്‍ ഇന്റര്‍ഫെയിസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "വൈമാക്സ് ബന്ധം %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "വിപിഎന്‍ ബന്ധം ഇംപോര്‍ട്ട് ചെയ്യുവാന്‍ സാധ്യമല്ല"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2507,29 +3008,30 @@ msgstr ""
 "\n"
 "പിശക്: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "ഇംപോര്‍ട്ട് ചെയ്യുന്നതിനുള്ള ഫയല്‍ തെരഞ്ഞെടുക്കുക"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "അറിയാത്ത ഏതോ പ്രശ്നം"
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" എന്ന പേരില്‍ ഒരു ഫയല്‍ നിലവിലുണ്ടു്."
 
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_മാറ്റിസ്ഥാപിക്കുക"
 
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "നിങ്ങള്‍ സൂക്ഷിച്ചുകൊണ്ടിരിക്കുന്ന വിപിഎന്‍ ബന്ധംഉപയോഗിച്ചു് %s മാറ്റണമോ?"
 
-#: ../src/connection-editor/vpn-helpers.c:332
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "വിപിഎന്‍ ബന്ധം എക്സ്പോര്‍ട്ട് ചെയ്യുവാന്‍ സാധിച്ചില്ല"
 
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2540,11 +3042,11 @@ msgstr ""
 "\n"
 "പിശക്: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "വിപിഎന്‍ ബന്ധം എക്സ്പോര്‍ട്ട് ചെയ്യുക..."
 
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../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)."
@@ -2552,97 +3054,11 @@ msgstr ""
 "ആവശ്യമുള്ള ചില ഉറവിടങ്ങള്‍ ലഭ്യമാക്കുവാന്‍ NetworkManager ആപ്ലെറ്റിനു് സാധ്യമായില്ല (.uiഫയല്‍ "
 "ലഭ്യമായില്ല)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "ബ്ലൂടൂത് ക്രമീകരണം സാധ്യമല്ല (ഡീ-ബസിലേക്കു് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയം: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "ബ്ലൂടൂത് ക്രമീകരണം സാധ്യമല്ല (NetworkManager കണ്ടുപിടിയ്ക്കുന്നതില്‍ പിശക്: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "നിങ്ങളുടെ മൊബൈല്‍ ഫോണ്‍ ശൃംഖല ഡിവൈസായി ഉപയോഗിക്കുക (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "നിങ്ങളുടെ മൊബൈല്‍ ഫോണിലൂടെ (DUN) ഇന്റര്‍നെറ്റ് ലഭ്യമാക്കുക"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "പിശക്: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "ഡിയുഎന്‍ കണക്ഷനുണ്ടാക്കുന്നതില്‍ പരാജയം: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:947
-msgid "Your phone is now ready to use!"
-msgstr "ഫോണ്‍ ഉപയോഗിക്കുവാന്‍ തയ്യാര്‍!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "മൊബൈല്‍ വിസാര്‍ഡ് റദ്ദാക്കിയിരിക്കുന്നു"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "അപരിചിതമായ ഫോണ്‍ ഡിവൈസ് രീതി (GSM അല്ലെങ്കില്‍ CDMA അല്ല)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "അപരിചിതമായ മോഡം തരം."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:721
-#: ../src/gnome-bluetooth/nma-bt-device.c:727
-msgid "failed to connect to the phone."
-msgstr "ഫോണിലേക്ക് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയം."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:758
-msgid "unexpectedly disconnected from the phone."
-msgstr "ഫോണില്‍ നിന്നും അപ്രതീക്ഷിതമായി വിഛേദിക്കപ്പെട്ടിരിക്കുന്നു."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:768
-msgid "timed out detecting phone details."
-msgstr "ഫോണ്‍ വിശദാംശങ്ങള്‍ തെരയുന്നതിനുള്ള സമയം കഴിഞ്ഞിരിക്കുന്നു."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:779
-msgid "Detecting phone configuration..."
-msgstr "ഫോണ്‍ ക്രമീകരണം ലഭ്യമാക്കുന്നു..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:811
-msgid "error getting bus connection"
-msgstr "ബസ്സ് ബന്ധം കിട്ടുന്നതില്‍ പിഴവ്"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:908
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"ഡയല്‍-അപ്പ് നെറ്റ്‌വര്‍ക്കിങ് ബന്ധം സജ്ജമാക്കുന്നതിനു മുമ്പായി സ്വതവേയുള്ള ബ്ലൂടൂത് അഡാപ്ടര്‍ പ്രവര്‍ത്തന "
-"സജ്ജമാക്കുക."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:945
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "പിഎഎന്‍ കണക്ഷന്‍ തയ്യാറാക്കുന്നതില്‍ പരാജയം: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:966
-#, c-format
-msgid "%s Network"
-msgstr "%s ശൃംഖല"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_പൂട്ട് തുറക്കുക"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "ഈ ഉപകരണം സ്വയം തുറക്കുക"
 
@@ -2650,32 +3066,37 @@ msgstr "ഈ ഉപകരണം സ്വയം തുറക്കുക"
 msgid "Connection Information"
 msgstr "ബന്ധവിവരം"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "സജീവ ശൃംഖല ബന്ധങ്ങള്‍"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "നിങ്ങളുടെ ഡിവൈസ്:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "നിങ്ങളുടെ പ്രൊവൈഡര്‍:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "നിങ്ങളുടെ പ്ലാന്‍:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -2688,23 +3109,28 @@ msgstr ""
 "ഡബിള്‍ ക്ലിക്ക് ചെയ്യുക. നിങ്ങളുടെ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം ക്രമീകരണങ്ങള്‍ മാറ്റുന്നതിനായി, "
 "സിസ്റ്റം >> മുന്‍ഗണനകള്‍ എന്ന മെനുവില്‍ നിന്നും \"ശൃംഖല ബന്ധങ്ങള്‍\" തെരഞ്ഞെടുക്കുക."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:266
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് സജ്ജീകരണങ്ങള്‍ ഉറപ്പാക്കുക"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:330
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "പട്ടികയിലില്ലാത്ത"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:481
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "നിങ്ങളുടെ പ്ലാന്‍ _തെരെഞ്ഞെടുക്കുക:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:505
+#: ../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/libnm-gtk/nm-mobile-wizard.c:525
+#: ../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"
@@ -2716,67 +3142,83 @@ msgstr ""
 "\n"
 "നിങ്ങളുടെ പ്ലാന്‍ ഏതെന്നുറപ്പല്ലെങ്കില്‍, ദയവായി നിങ്ങളുടെ പ്രൊവൈഡറില്‍ നിന്നും APN ലഭ്യമാക്കുക."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:532
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "നിങ്ങളുടെ ബില്ലിങ് പ്ലാന്‍ തെരഞ്ഞെടുക്കുക"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:581
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "എന്റെ പ്ലാന്‍ പട്ടികയിലില്ല..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:734
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "_പട്ടികയില്‍ നിന്നും നിങ്ങളുടെ പ്രൊവൈഡര്‍ തെരഞ്ഞെടുക്കുക:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:747
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "പ്രൊവൈഡര്‍"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:772
+#: ../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/libnm-gtk/nm-mobile-wizard.c:785
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "പ്രൊവൈഡര്‍:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:802
+#: ../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/libnm-gtk/nm-mobile-wizard.c:804
+#: ../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/libnm-gtk/nm-mobile-wizard.c:815
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "നിങ്ങളുടെ പ്രൊവൈഡര്‍ തെരഞ്ഞെടുക്കുക"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "രാജ്യങ്ങളുടേയോ പ്രദേശങ്ങളുടേയോ പട്ടിക:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "രാജ്യമോ പ്രദേശമോ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1090
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "എന്റെ രാജ്യം ലഭ്യമല്ല"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1140
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1194
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന GSM ഡിവൈസ്"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1197
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ഇന്‍സ്റ്റോള്‍ ചെയ്തിരിക്കുന്ന CDMA ഡിവൈസ്"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1365
+#: ../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."
@@ -2784,83 +3226,105 @@ msgstr ""
 "ഈ സഹായി നിങ്ങളെ എളുപ്പത്തില്‍ ഒരു സെല്ലുലാര്‍ (3G) നെറ്റ്‌വര്‍ക്കിലേക്ക് നിങ്ങളുടെമൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് "
 "ബന്ധം സജ്ജമാക്കുന്നു."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1370
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "നിങ്ങള്‍ക്ക് ഈ വിവരങ്ങള്‍ ആവശ്യമാകുന്നു:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1381
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "നിങ്ങളുടെ ബ്രോഡ്ബാന്‍ഡ് പ്രൊവൈഡറിന്റെ പേര്"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "നിങ്ങളുടെ ബ്രോഡ്ബാന്‍ഡ് ബില്ലിങ് പ്ലാന്‍"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1393
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1420
+#: ../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 "ഈ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ഡിവൈസിനു് ഒരു ബന്ധം ഉണ്ടാക്കുക:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1435
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "ഏതെങ്കിലും ഡിവൈസ്"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ഒരു മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം സജ്ജമാക്കുക"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1621
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് കണക്ഷന്‍"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
-msgid "Wired"
-msgstr "വയര്‍ഡ്"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "ബ്ലൂടൂത്ത്"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC മെഷ്"
+#: ../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/libnm-gtk/nm-ui-utils.c:343
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:405
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_ദ്വിതീയ തലത്തിലുള്ള അടയാളവാക്ക്:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
-msgid "USB"
-msgstr "യുഎസ്ബി"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_ദ്വിതീയ തലത്തിലുള്ള അടയാളവാക്ക്:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+msgid "Sh_ow passwords"
+msgstr "അടയാളവാക്കുക _കാണിക്കുക"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "പുതിയ..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ഒന്നുമില്ല"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_ഉണ്ടാക്കുക"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -2868,35 +3332,35 @@ msgstr ""
 "വയര്‍ലെസ് ശൃംഖല '%s'-ലേക്ക് പ്രവേശിക്കുന്നതിനായി അടയാളവാക്കുകള്‍ അല്ലെങ്കില്‍ എന്‍ക്രിപ്ഷന്‍ കീകള്‍ "
 "ആവശ്യമുണ്ടു്."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "വയര്‍ലെസ് ശൃംഖല ആധികാരികത ആവശ്യമുണ്ടു്"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "വയര്‍ലെസ് ശൃംഖല ആധികാരികത ഉറപ്പിക്കുന്നതിനായി ആവശ്യപ്പെട്ടിരിക്കുന്നു"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "പുതിയ വയര്‍ലെസ് ശൃംഖല ഉണ്ടാക്കുക"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "പുതിയ വയര്‍ലെസ് ശൃംഖല"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "നിങ്ങള്‍ ഉണ്ടാക്കുവാന്‍ ആഗ്രഹിക്കുന്ന വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിന്റെ പേരു് നല്‍കുക."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "അദൃശ്യമായ വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിലേക്ക് കണക്ട് ചെയ്യുക"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "അദൃശ്യമായ വയര്‍ലെസ് ശൃംഖല"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -2904,186 +3368,214 @@ msgstr ""
 "നിങ്ങള്‍ കണക്ട് ചെയ്യുവാന്‍ ആഗ്രഹിക്കുന്ന അദൃശ്യമായ വയര്‍ലെസ് നെറ്റ്‌വര്‍ക്കിന്റ് പേരും സുരക്ഷാ "
 "വിശദാംശങ്ങളും നല്‍കുക"
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_ദ്വിതീയ തലത്തിലുള്ള അടയാളവാക്ക്:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "അടയാളവാക്കുക _കാണിക്കുക"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_വയര്‍ലെസ് സുരക്ഷ:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "ക_ണക്ഷന്‍:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "വയര്‍ലെസ് _അഡാപ്ടര്‍:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC മെഷ്"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "യുഎസ്ബി"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "ഉപയോഗം:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"ഈ പ്രോഗ്രാം ശൃംഖലമാനേജറിന്റെ ഒരു ഘടകമാണു് (https://wiki.gnome.org/"
-"Projects/NetworkManager/)."
+"ഈ പ്രോഗ്രാം ശൃംഖലമാനേജറിന്റെ ഒരു ഘടകമാണു് (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "പ്രവര്‍ത്തന സജ്ജമല്ല"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "രജിസ്ടര്‍ ചെയ്തിട്ടില്ല"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ഹോം ശൃംഖല (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "ഹോം ശൃംഖല "
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "തെരയുന്നു"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "രജിസ്ട്രേഷന്‍ നിഷേധിച്ചിരിക്കുന്നു"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (റോമിങ്)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "റോമിങ് ശൃംഖല (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "റോമിങ് ശൃംഖല"
 
-#: ../src/mobile-helpers.c:317
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "'%2$s' ലെ സിം കാര്‍ഡ് '%1$s' നു് പിന്‍ കോഡ് ആവശ്യമുണ്ടു്"
 
-#: ../src/mobile-helpers.c:450
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "പിന്‍ കോഡ് ആവശ്യമുണ്ടു്"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ഡിവൈസിനു് പിന്‍ കോഡ് ആവശ്യമുണ്ടു്"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് ബന്ധം '%s' സജീവമാണു്: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "പുറത്തുള്ള"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s കണക്ഷന്‍"
 
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "സര്‍ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി (CA) സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുത്തിട്ടില്ല"
-
-#: ../src/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"ഒരു സര്‍ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി (CA) സര്‍ട്ടിഫീക്കേറ്റ് ഉപയോഗിച്ചില്ല എങ്കില്‍, സുരക്ഷിതമല്ലാത്ത "
-"വയര്‍ലെസ് ശൃംഖലകളിലേയ്ക്കു് കടക്കുവാന്‍ സാധ്യതയുണ്ടു്. നിങ്ങള്‍ക്കു് ഒരു സര്‍ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി "
-"സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കണമോ?"
 
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:645
+#: ../src/wireless-security/eap-method.c:452
 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:648
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER അല്ലെങ്കില്‍ PEM സര്‍ട്ടിഫീക്കേറ്റുകള്‍ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "ഒരു പിഎസി ഫയല്‍ തിരഞ്ഞെടുക്കുക..."
 
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "പിഎസി ഫയലുകള്‍ (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "എല്ലാ ഫയലുകളും"
 
@@ -3110,8 +3602,8 @@ msgid "PAC _file:"
 msgstr "പിഎസി _ഫയല്‍:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "_ആന്തരിക ആധികാരികത ഉറപ്പാക്കല്‍"
 
@@ -3119,14 +3611,32 @@ msgstr "_ആന്തരിക ആധികാരികത ഉറപ്പാക
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ഓട്ടോമാറ്റിക് പിഎസി അനുവദിയ്ക്കുക"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "ഒരു സര്‍ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക..."
 
@@ -3144,19 +3654,56 @@ msgstr "പതിപ്പ് 1"
 msgid "C_A certificate:"
 msgstr "C_A സര്‍ട്ടിഫീക്കേറ്റ്:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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
+msgid "No CA certificate is _required"
+msgstr "സിഎ സര്‍ട്ടിഫീക്കേറ്റ് _ആവശ്യമാണു്:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "പിഇഎപി _പതിപ്പ്:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "അടയാളവാക്ക് എപ്പോഴും ചോ_ദിക്കുക"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A സര്‍ട്ടിഫീക്കേറ്റ്:"
 
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "എന്‍ക്രിപ്റ്റ് ചെയ്യാത്ത സ്വകാര്യ കീകള്‍ അസുരക്ഷിതമാണു്"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../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 "
@@ -3170,11 +3717,11 @@ msgstr ""
 "\n"
 "(openssl ഉപയോഗിച്ചു് നിങ്ങളുടെ സ്വകാര്യ കീ അടയാളവാക്ക് വഴി സുരക്ഷിതമാക്കാം)"
 
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "നിങ്ങളുടെ സ്വകാര്യ സര്‍ട്ടിഫിക്കേറ്റ് തെരഞ്ഞെടുക്കുക..."
 
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "നിങ്ങളുടെ സ്വകാര്യ കീ തെരഞ്ഞെടുക്കുക..."
 
@@ -3186,27 +3733,44 @@ msgstr "_തിരിച്ചറിയല്‍:"
 msgid "_User certificate:"
 msgstr "_ഉപയോക്താവിന്റെ സര്‍ട്ടിഫീക്കേറ്റ്:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "സ്വകാര്യ _കീ:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "_സ്വകാര്യ കീ അടയാളവാക്ക്:"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "എഫ്എഎസ്‌ടി"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "ടണ്‍ല്ഡ് TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "സുരക്ഷിതമായ EAP (PEAP)"
 
@@ -3216,21 +3780,47 @@ msgstr "സുരക്ഷിതമായ EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "_തിരിച്ചറിയല്‍:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (സഹജം)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
 msgid "Open System"
@@ -3252,6 +3842,224 @@ msgstr "കീ കാ_ണിക്കുക"
 msgid "WEP inde_x:"
 msgstr "WEP _സൂചിക:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_തരം:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "വൈമാ_ക്സ് മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് പ്രവര്‍ത്തനസജ്ജമാക്കുക"
+
+#~ msgid "_Help"
+#~ msgstr "_സഹായം"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് (സിഡിഎംഎ)ബന്ധം..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ സിഡിഎംഎ ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
+
+#~ msgid "CDMA network."
+#~ msgstr "സിഡിഎംഎ ശൃംഖല."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "പുതിയ മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് (ജിഎസ്എം) ബന്ധം..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ ജിഎസ്എം ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
+
+#~ msgid "GSM network."
+#~ msgstr "ജിഎസ്എം ശൃംഖല."
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "വൈമാക്സ് മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ് (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "വൈമാക്സ് മൊബൈല്‍ ബ്രോഡ്ബാന്‍ഡ്"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "വൈമാക്സ് പ്രവര്‍ത്തനരഹിതമാക്കിയിരിയ്ക്കുന്നു"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "ഹാര്‍ഡ്​വെയര്‍ സ്വിച്ച് ഉപയോഗിച്ച് വൈമാക്സ് പ്രവര്‍ത്തന രഹിതമാക്കിയിരിക്കുന്നു"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "നിങ്ങള്‍ ഇപ്പോള്‍ വൈമാക്സ് ശൃംഖലയുമായി ബന്ധപ്പെട്ടിരിയ്ക്കുന്നു."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "അറിയില്ല"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "അറിയില്ല"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "വൈമാക്സ് (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "സിഐഎന്‍ആര്‍:"
+
+#~ msgid "BSID:"
+#~ msgstr "ബിഎസ്ഐഡി:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "രണ്ടാമത്തെ ഡിഎന്‍എസ്:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "മൂന്നാമത്തെ ഡിഎന്‍എസ്:"
+
+#~ msgid "_Mode:"
+#~ msgstr "രീതി(_M):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_ഉപകരണത്തിന്റെ മാക് വിലാസം:"
+
+#~ msgid "Any"
+#~ msgstr "ഏതെങ്കിലും"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3ജി (യുഎംടിഎസ്/എച്ച്എസ്‌പിഎ)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2ജി (ജിപിആര്‍എസ്/എഡ്ജ്)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "3ജി (യുഎംടിഎസ്/എച്ച്എസ്‌പിഎ) യ്ക്കു് മുന്‍ഗണന"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "2ജി (ജിപിആര്‍എസ്/എഡ്ജ്) യ്ക്കു് മുന്‍ഗണന"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "4ജി (LTE) യ്ക്കു് മുന്‍ഗണന"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "4ജി (LTE) മാത്രം ഉപയോഗിക്കുക"
+
+#~ msgid "Infrastructure"
+#~ msgstr "ഇന്‍ഫ്രാസ്ട്രക്ചര്‍"
+
+#~ msgid "WiMAX"
+#~ msgstr "വൈമാക്സ്"
+
+#~ msgid "_Save..."
+#~ msgstr "_സൂക്ഷിക്കുക..."
+
+#~ msgid "Error saving connection"
+#~ msgstr "ബന്ധം സൂക്ഷിയ്ക്കുന്നതില്‍ തെറ്റു്"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "'%s' / '%s' വിശേഷത അസാധുവാകുന്നു: %d"
+
+#~ msgid "_Edit..."
+#~ msgstr "_ചിട്ട..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_നീക്കം ചെയ്യുക..."
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "ഓട്ടോമാറ്റിക് (PPP)"
+
+#~ 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)."
+#~ msgstr "ബ്ലൂടൂത് ക്രമീകരണം സാധ്യമല്ല (ഡീ-ബസിലേക്കു് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയം: (%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "ബ്ലൂടൂത് ക്രമീകരണം സാധ്യമല്ല (NetworkManager കണ്ടുപിടിയ്ക്കുന്നതില്‍ പിശക്: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "നിങ്ങളുടെ മൊബൈല്‍ ഫോണ്‍ ശൃംഖല ഡിവൈസായി ഉപയോഗിക്കുക (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "നിങ്ങളുടെ മൊബൈല്‍ ഫോണിലൂടെ (DUN) ഇന്റര്‍നെറ്റ് ലഭ്യമാക്കുക"
+
+#~ msgid "Error: %s"
+#~ msgstr "പിശക്: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "ഡിയുഎന്‍ കണക്ഷനുണ്ടാക്കുന്നതില്‍ പരാജയം: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "ഫോണ്‍ ഉപയോഗിക്കുവാന്‍ തയ്യാര്‍!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "മൊബൈല്‍ വിസാര്‍ഡ് റദ്ദാക്കിയിരിക്കുന്നു"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "അപരിചിതമായ ഫോണ്‍ ഡിവൈസ് രീതി (GSM അല്ലെങ്കില്‍ CDMA അല്ല)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "അപരിചിതമായ മോഡം തരം."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "ഫോണിലേക്ക് കണക്ട് ചെയ്യുന്നതില്‍ പരാജയം."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ഫോണില്‍ നിന്നും അപ്രതീക്ഷിതമായി വിഛേദിക്കപ്പെട്ടിരിക്കുന്നു."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "ഫോണ്‍ വിശദാംശങ്ങള്‍ തെരയുന്നതിനുള്ള സമയം കഴിഞ്ഞിരിക്കുന്നു."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "ഫോണ്‍ ക്രമീകരണം ലഭ്യമാക്കുന്നു..."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "ബസ്സ് ബന്ധം കിട്ടുന്നതില്‍ പിഴവ്"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "ഡയല്‍-അപ്പ് നെറ്റ്‌വര്‍ക്കിങ് ബന്ധം സജ്ജമാക്കുന്നതിനു മുമ്പായി സ്വതവേയുള്ള ബ്ലൂടൂത് അഡാപ്ടര്‍ പ്രവര്‍ത്തന "
+#~ "സജ്ജമാക്കുക."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "പിഎഎന്‍ കണക്ഷന്‍ തയ്യാറാക്കുന്നതില്‍ പരാജയം: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s ശൃംഖല"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "സര്‍ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി (CA) സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുത്തിട്ടില്ല"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "ഒരു സര്‍ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി (CA) സര്‍ട്ടിഫീക്കേറ്റ് ഉപയോഗിച്ചില്ല എങ്കില്‍, "
+#~ "സുരക്ഷിതമല്ലാത്ത വയര്‍ലെസ് ശൃംഖലകളിലേയ്ക്കു് കടക്കുവാന്‍ സാധ്യതയുണ്ടു്. നിങ്ങള്‍ക്കു് ഒരു "
+#~ "സര്‍ട്ടിഫീക്കേറ്റ് അഥോറിറ്റി സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കണമോ?"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "CA സര്‍ട്ടിഫീക്കേറ്റ് തെരഞ്ഞെടുക്കുക"
+
 #~ msgid "No"
 #~ msgstr "ഇല്ല"
 
@@ -3322,15 +4130,9 @@ msgstr "WEP _സൂചിക:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "'%s' കണക്ഷനുകള്‍ ഏങ്ങനെ ചിട്ടപ്പെടുത്തണമെന്നറിയില്ല"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "ബ്ലൂടൂത് ഡിവൈസ് ലഭ്യമാക്കുവാന്‍ സാധ്യമായില്ല."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "ബ്ലൂടൂത് ക്രമീകരണം സാധ്യമല്ല (ഡീ-ബസ് പ്രോക്സി തയ്യാറാക്കുന്നതില്‍ പരാജയം)."
 
-#~ msgid "Network Manager"
-#~ msgstr "ശൃംഖല മാനേജര്‍"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "nm-applet-ന്റെ ഒരു ഇന്‍സ്റ്റന്‍സ് പ്രവര്‍ത്തിക്കുന്നു.\n"
 
diff --git a/po/mr.po b/po/mr.po
index 18162555..9c6add0c 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,639 +7,929 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2011-03-25 04:42+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../nm-applet.desktop.in.h:1
-#| msgid "Control your network connections"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+msgid "Network"
+msgstr "नेटवर्क"
+
+#: ../nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr "नेटवर्क जोडणी नियंत्रीत करा"
 
-#: ../nm-applet.desktop.in.h:2
-#| msgid "%s Network"
-msgid "Network"
-msgstr "नेटवर्क"
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "नेटवर्क जोडणी"
 
-#: ../nm-applet.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr "WiFi निर्माण बंद करा"
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "नेटवर्क संयोजना व्यवस्थापीत करा व बदला"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "जोडलेले सूचना बंद करा"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, 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
 msgid "Disable disconnected notifications"
 msgstr "खंडीत सूचना बंद करा"
 
-#: ../nm-applet.schemas.in.h:4
-msgid "Set this to TRUE to disable notifications when connecting to a network."
-msgstr "नेटवर्कशी जोडणी करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr "नेटवर्कशी खंडन करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
 
-#: ../nm-applet.schemas.in.h:5
-msgid "Set this to TRUE to disable notifications when disconnecting from a network."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "जोडलेले सूचना बंद करा"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
 msgstr "नेटवर्कशी खंडन करतेवेळी सूचना बंद करण्यासाठी यांस TRUE असे सेट करा."
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "नेटवर्क्स् उपलब्धता सूचना दाखवू नका"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "वायरलेस नेटवर्क्स् उपलब्ध झाल्यावर यांस TRUE असे सेट करा."
 
-#: ../nm-applet.schemas.in.h:7
-msgid "Set to TRUE to disable creation of adhoc networks when using the applet."
-msgstr "ऍप्लेटचा वापर करतेवेळी ऍडहॉक नेटवर्क्स्चे निर्माण बंद करण्यासाठी यांस TRUE असे सेट करा."
-
-#: ../nm-applet.schemas.in.h:8
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "स्टॅम्प"
 
-#: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
-msgstr "नेटवर्क्स् उपलब्धता सूचना दाखवू नका"
-
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr "सेटिंग्स्ला नवीन आवृत्तीकरीता स्थानांतरीत करायचे, हे ओळखण्यासाठी वापर केला जातो."
 
-#: ../nm-connection-editor.desktop.in.h:1
-msgid "Manage and change your network connection settings"
-msgstr "नेटवर्क संयोजना व्यवस्थापीत करा व बदला"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
+msgid "Disable WiFi Create"
+msgstr "WiFi निर्माण बंद करा"
 
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "Network Connections"
-msgstr "नेटवर्क जोडणी"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+"ऍप्लेटचा वापर करतेवेळी ऍडहॉक नेटवर्क्स्चे निर्माण बंद करण्यासाठी यांस TRUE असे सेट करा."
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:337
-#: ../src/applet-device-gsm.c:381 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:867 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "उपल्बध"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "CA प्रमाणपत्र नीवडा"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "NetworkManager ॲप्लेट"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "NetworkManager ॲप्लेट"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "जुळवा (_o)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "नेटवर्कचे नाव (_N):"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "ॲडहॉक"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:379
-#: ../src/applet-device-gsm.c:423 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "PAN जोडणी निर्माण करणे अशक्य: %s"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "अपरिचीत"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "जोडणी समावेश करणे अपयशी"
+
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "जोडणी मोडली"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "जोडणी मोडली"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "जोडणी समावेश करणे अपयशी"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "हा संदेश पुन्हा दाखवू नका"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "तुम्ही आता '%s' शी जुळले आहात."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"नेटवर्क जोडणी अंतर्गत व्यत्यय आण्याल्यामुले VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:383
-#: ../src/applet-device-gsm.c:427 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1272 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "जोडणी स्थापीत"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"VPN सेवा अनपेक्षीतरित्या थांबविल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "तुम्ही आत्ता मोबाईल ब्रॉडबँड नेटवर्कशी जुळले आहात."
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"VPN सेवाने अवैध संयोजना पुरविल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:419
-#: ../src/applet-device-gsm.c:463 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' बनवत आहे..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"जोडणी स्थापन प्रयत्न करीता वेळ संपल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:422
-#: ../src/applet-device-gsm.c:466 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' संयोजीत करत आहे..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"VPN सेवा वेळे सुरू न झाल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:425
-#: ../src/applet-device-gsm.c:469 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' करीता वापरकर्त्याला ओळख पटवणे आवश्यक आहे..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"VPN सेवा सुरू होण्यास अपयशी ठरल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:428
-#: ../src/applet-device-gsm.c:472 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2383
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "'%s' करीता नेटवर्क पत्तासाठी विनंती करत आहे..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"वैध VPN गोपनीयता न आढळल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:446
-#: ../src/applet-device-gsm.c:490
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' सक्रीय आहे"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"वैध VPN गोपनीयता न आढळल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet-device-cdma.c:186 ../src/connection-editor/page-mobile.c:681
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
-#: ../src/applet-dialogs.c:405
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "मोबाइल ब्रॉडबँड (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"नेटवर्क जोडणीत व्यत्यय आणल्यामुळे VPN जोडणी '%s' तुटली."
 
-#: ../src/applet-device-cdma.c:285 ../src/applet-device-gsm.c:329
-#: ../src/connection-editor/page-mobile.c:372
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1436
-msgid "Mobile Broadband"
-msgstr "मोबाइल ब्रॉडबँड"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"VPN सेवा थांबविल्यामुळे VPN जोडणी '%s' तुटली."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:350
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "नवीन मोबाइल ब्रॉडबँड (CDMA) जोडणी..."
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"VPN जोडणी '%s' तुटली."
 
-#: ../src/applet-device-cdma.c:384
-msgid "You are now connected to the CDMA network."
-msgstr "तुम्ही आता CDMA जाळाशी जुळले आहात."
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
 
-#: ../src/applet-device-cdma.c:441 ../src/applet-device-gsm.c:485
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "VPN प्रवेश संदेश"
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "VPN जोडणी अपयशी"
+
+#: ../src/applet.c:990
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' सक्रीय आहे: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN सेवा सुरू होण्यास अपयशी ठरल्यामुळे VPN जोडणी '%s' तुटली.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:444 ../src/applet-device-gsm.c:488
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "रोमींग"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN जोडणी '%s' सुरू होण्यास अपयशी.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:212 ../src/connection-editor/page-mobile.c:684
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "साधन सज्ज नाही (फर्मवेअर आढळले नाही)"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:394
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "नवीन मोबाइल ब्रॉडबँड (GSM) जोडणी..."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "साधन सज्ज नाही"
 
-#: ../src/applet-device-gsm.c:428
-msgid "You are now connected to the GSM network."
-msgstr "तुम्ही आता GSM नेटवर्कशी जुळले आहात."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "जोडणी मोडली"
 
-#: ../src/applet-device-gsm.c:589
-msgid "PIN code required"
-msgstr "PIN कोड आवश्यक आहे"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "जोडणी मोडा"
 
-#: ../src/applet-device-gsm.c:597
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "मोबाइल ब्रॉडबँड साधन करीता PIN कोड आवश्यक आहे"
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "साधन व्यवस्थापीत केले गेले नाही"
 
-#: ../src/applet-device-gsm.c:718
-msgid "Wrong PIN code; please contact your provider."
-msgstr "चुकीचा PIN कोड; कृपया प्रोव्हाइडरशी संपर्क करा."
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "नेटवर्क साधन उपलब्ध नाही"
+
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "VPN जोडणी (_V)"
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "VPN संरचीत करा (_C)..."
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "VPN खंडीत करा (_D)"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager कार्यरत नाही..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "नेटवर्क बंद केले"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "नेटवर्क कार्यान्वीत करा (_N)"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "वायरलेस कार्यान्वीत करा (_W)"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "मोबाइल ब्रॉडबँड सुरू करा (_M)"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "सूचना सुरू करा (_o)"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "जोडणी विषयी माहिती (_I)"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "जोडणी संपादीत करा..."
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "विषयी (_A)"
+
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "तुम्ही आता '%s' शी जुळले आहात."
+
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "जोडणी मोडली"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "नेटवर्क जोडणी मोडली."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "नेटवर्क जोडणी '%s' बनवत आहे..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "नेटवर्क जोडणी '%s' करीता वापरकर्त्याची ओळ पटवणे आवश्यक आहे..."
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "'%s' करीता नेटवर्क पत्तासाठी विनंती करत आहे..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "नेटवर्क जोडणी '%s' सक्रीय आहे"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "VPN जोडणी '%s' सुरू करत आहे..."
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN जोडणी '%s' करीता वापरकर्त्याची ओळ पटवणे आवश्यक आहे..."
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "'%s' करीता VPN पत्ता विनंतीकृत करत आहे..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN जोडणी '%s' सक्रीय आहे"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "नेटवर्क जोडणी आढळली नाही"
 
-#: ../src/applet-device-gsm.c:741
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "NetworkManager ॲप्लेट"
+
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "चुकीचा PUK कोड; कृपया प्रोव्हाइडरशी संपर्क करा."
 
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "चुकीचा PIN कोड; कृपया प्रोव्हाइडरशी संपर्क करा."
+
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:768
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "कुलूपबंद अशक्य कोड पाठवत आहे..."
 
-#: ../src/applet-device-gsm.c:831
-msgid "SIM PIN unlock required"
-msgstr "SIM PIN कुलूपबंद अशक्य करणे आवश्यक"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "मोबाइल ब्रॉडबँड (%s)"
 
-#: ../src/applet-device-gsm.c:832
-msgid "SIM PIN Unlock Required"
-msgstr "SIM PIN कुलूपबंद अशक्य करणे आवश्यक"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "मोबाइल ब्रॉडबँड"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:834
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr "वापर करण्यापूर्वी मोबाईल ब्रॉडबँड साधण '%s' यांस SIM PIN कोड आवश्यक आहे."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "उपल्बध"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:836
-msgid "PIN code:"
-msgstr "PIN कोड:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "नवीन मोबाइल ब्रॉडबँड जोडणी"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:840
-#| msgid "New PIN code:"
-msgid "Show PIN code"
-msgstr "PIN कोड दाखवा"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "जोडणी स्थापीत"
 
-#: ../src/applet-device-gsm.c:843
-msgid "SIM PUK unlock required"
-msgstr "SIM PUK कुलूपबंद अशक्य करणे आवश्यक"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "तुम्ही आत्ता मोबाईल ब्रॉडबँड नेटवर्कशी जुळले आहात."
 
-#: ../src/applet-device-gsm.c:844
-msgid "SIM PUK Unlock Required"
-msgstr "SIM PUK कुलूपबंद अशक्य करणे आवश्यक"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "मोबाइल ब्रॉडबँड नेटवर्क पासवर्ड"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:846
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr "वापर करण्यापूर्वी मोबाईल ब्रॉडबँड साधण '%s' यांस SIM PUK कोड आवश्यक आहे."
+#: ../src/applet-device-broadband.c:957
+#, fuzzy
+msgid "You are now registered on the home network."
+msgstr "तुम्ही आता वायर्ड नेटवर्कशी जुळले आहात."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:848
-msgid "PUK code:"
-msgstr "PUK कोड:"
+#: ../src/applet-device-broadband.c:963
+#, fuzzy
+msgid "You are now registered on a roaming network."
+msgstr "तुम्ही आता वायर्ड नेटवर्कशी जुळले आहात."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:851
-msgid "New PIN code:"
-msgstr "नवीन PIN कोड:"
+#: ../src/applet-device-bt.c:88
+msgid "You are now connected to the mobile broadband network."
+msgstr "तुम्ही आत्ता मोबाईल ब्रॉडबँड नेटवर्कशी जुळले आहात."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:853
-msgid "Re-enter new PIN code:"
-msgstr "नवीन PIN कोड पुनः द्या:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' बनवत आहे..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:858
-#| msgid "New PIN code:"
-msgid "Show PIN/PUK codes"
-msgstr "PIN/PUK कोड्स् दाखवा"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' संयोजीत करत आहे..."
+
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' करीता वापरकर्त्याला ओळख पटवणे आवश्यक आहे..."
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' सक्रीय आहे"
+
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "स्वयं Ethernet"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "वायर्ड नेटवर्क्स् (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "वायर्ड नेटवर्क (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "वायर्ड नेटवर्क्स्"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "वायर्ड नेटवर्क"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1389
-msgid "disconnected"
-msgstr "जोडणी मोडली"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "तुम्ही आता वायर्ड नेटवर्कशी जुळले आहात."
 
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "वायर्ड नेटवर्क जोडणी '%s' बनवत आहे..."
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "वायर्ड नेटवर्क जोडणी '%s' संयोजीत करत आहे..."
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "वायर्ड नेटवर्क जोडणी '%s' करीता वापरकर्त्याची ओळक पटवणे आवश्यक आहे..."
 
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' करीता वायर्ड नेटवर्क पत्ता विनंतीकृत करत आहे..."
 
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "करीता वायर्ड नेटवर्क जोडणी '%s' सक्रीय आहे"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL ओळख पटवणे"
 
-#: ../src/applet-device-wifi.c:89
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "लपविलेले वायरलेस नेटवर्कशी जुळवा (_C)..."
 
-#: ../src/applet-device-wifi.c:142
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "नवीन वायरलेस नेटवर्क बनवा (_N)..."
 
-#: ../src/applet-device-wifi.c:226
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(काहिच नाही)"
 
-#: ../src/applet-device-wifi.c:795
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "वायरलेस नेटवर्क्स् (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "वायर्ड नेटवर्क्स् (%s)"
 
-#: ../src/applet-device-wifi.c:797
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "वायरलेस नेटवर्क (%s)"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "वायर्ड नेटवर्क (%s)"
 
-#: ../src/applet-device-wifi.c:799
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "वायरलेस "
-msgstr[1] "वायरलेस नेटवर्क्स्"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "वायर्ड नेटवर्क"
+msgstr[1] "वायर्ड नेटवर्क"
 
-#: ../src/applet-device-wifi.c:832
-msgid "wireless is disabled"
-msgstr "वायरलेस बंद केले"
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "WiMAX बंद केले"
 
-#: ../src/applet-device-wifi.c:833
-#| msgid "wireless is disabled"
-msgid "wireless is disabled by hardware switch"
-msgstr "वायरलेस हार्डवेअर स्विचद्वारे बंद केले आहे"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WiMAX हार्डवेअर स्विचद्वारे असमर्थीत आहे"
 
-#: ../src/applet-device-wifi.c:894
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "अधिक नेटवर्क्स्"
 
-#: ../src/applet-device-wifi.c:1073
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "वायरलेस नेटवर्क्स् उपलब्ध"
 
-#: ../src/applet-device-wifi.c:1075
-msgid "Click on this icon to connect to a wireless network"
-msgstr "वायरलेस नेटवर्कशी जोडणी स्थापीत करण्याकरीता या चिन्हावर क्लिक करा"
-
-#: ../src/applet-device-wifi.c:1076
-#| msgid "Click on this icon to connect to a wireless network"
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "वायरलेस नेटवर्कशी जोडणी स्थापीत करण्याकरीता नेटवर्क मेन्यूचा वापर करा"
 
-#: ../src/applet-device-wifi.c:1079 ../src/applet.c:805
-msgid "Don't show this message again"
-msgstr "हा संदेश पुन्हा दाखवू नका"
-
-#: ../src/applet-device-wifi.c:1271
+#: ../src/applet-device-wifi.c:1364
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "तुम्ही आता वायरलेस नेटवर्क '%s' शी जुळले आहात."
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "तुम्ही आता वाइ-फाइ नेटवर्क '%s' सह जुळले आहात."
 
-#: ../src/applet-device-wifi.c:1302
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "वायरलेस नेटवर्क जोडणी '%s' बनवत आहे..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "नेटवर्क जोडणी '%s' बनवत आहे..."
 
-#: ../src/applet-device-wifi.c:1305
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "वायरलेस नेटवर्क जोडणी '%s' संयोजीत करत आहे..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "वायर्ड नेटवर्क जोडणी '%s' संयोजीत करत आहे..."
 
-#: ../src/applet-device-wifi.c:1308
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "वायरलेस नेटवर्क '%s' करीता वापरकर्त्याची ओळख पटवणे आवश्यक आहे..."
 
-#: ../src/applet-device-wifi.c:1311
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "'%s' करीता वायरलेस नेटवर्क पत्ता विनंतीकृत करत आहे..."
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "'%s' करीता नेटवर्क पत्तासाठी विनंती करत आहे..."
 
-#: ../src/applet-device-wifi.c:1332
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "वायरलेस नेटवर्क जोडणी '%s' सक्रीय आहे: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1337
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "वायरलेस नेटवर्क जोडणी '%s' सक्रीय आहे"
-
-#: ../src/applet-device-wimax.c:231
-#, c-format
-#| msgid "Mobile Broadband (%s)"
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX मोबाईल ब्रॉडबँड (%s)"
-
-#: ../src/applet-device-wimax.c:233
-#| msgid "Mobile Broadband"
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX मोबाइल ब्रॉडबँड"
-
-#: ../src/applet-device-wimax.c:259
-#| msgid "wireless is disabled"
-msgid "WiMAX is disabled"
-msgstr "WiMAX बंद केले"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "करीता वायर्ड नेटवर्क जोडणी '%s' सक्रीय आहे"
 
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX हार्डवेअर स्विचद्वारे असमर्थीत आहे"
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "PAN जोडणी निर्माण करणे अशक्य: %s"
 
-#: ../src/applet-device-wimax.c:428
-#| msgid "You are now connected to the CDMA network."
-msgid "You are now connected to the WiMAX network."
-msgstr "तुम्ही आता WiMAX नेटवर्कशी जुळले आहात."
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "नवीन जोडणी संपादीत करणे अशक्य"
 
-#: ../src/applet-dialogs.c:56
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "जोडणी माहिती प्रदर्शित करतेवेळी त्रुटी आढळली:"
 
-#: ../src/applet-dialogs.c:108
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/wireless-dialog.c:946
-#: ../src/wireless-security/wireless-security.c:392
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:110
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "गतिक WEP"
 
-#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
-#: ../src/applet-dialogs.c:223
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:219
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "पत्ते"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/wireless-dialog.c:903
-#| msgctxt "No wifi security used"
-#| msgid "None"
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "काहीच नाही"
 
-#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "1 (पूर्वनिर्धारीत)"
+
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
-#| msgid "Unknown"
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "अपरिचीत"
 
-#: ../src/applet-dialogs.c:342
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:344
-#| msgid "Unknown"
-msgctxt "WiMAX CINR"
-msgid "unknown"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
 msgstr "अपरिचीत"
 
-#: ../src/applet-dialogs.c:356
-#| msgid "Unknown"
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP पत्ता:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "ब्रॉडकास्ट पत्ता:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
 msgstr "अपरिचीत"
 
-#: ../src/applet-dialogs.c:391
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "सबनेट मास्क:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "इथरनेट (%s)"
 
-#: ../src/applet-dialogs.c:394
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:401
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:403
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:407
-#, c-format
-#| msgid "CDMA (%s)"
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "सर्वसामान्य"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "संवाद:"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "हार्डवेअर पत्ता:"
 
 #. Driver
-#: ../src/applet-dialogs.c:441
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ड्राइवर:"
 
-#: ../src/applet-dialogs.c:470
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "गती:"
 
-#: ../src/applet-dialogs.c:480
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "सुरक्षा:"
 
-#: ../src/applet-dialogs.c:493
-#| msgid "PI_N:"
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:506
-#| msgid "_BSSID:"
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:523
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:534 ../src/applet-dialogs.c:641
-msgid "IP Address:"
-msgstr "IP पत्ता:"
-
-#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
-#| msgid "Unknown"
-msgctxt "Address"
-msgid "Unknown"
-msgstr "अपरिचीत"
-
-#: ../src/applet-dialogs.c:550
-msgid "Broadcast Address:"
-msgstr "ब्रॉडकास्ट पत्ता:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:559
-msgid "Subnet Mask:"
-msgstr "सबनेट मास्क:"
-
-#: ../src/applet-dialogs.c:561
-#| msgid "Unknown"
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "अपरिचीत"
-
-#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "पूर्वनिर्धारीत मार्ग:"
 
-#: ../src/applet-dialogs.c:581
-msgid "Primary DNS:"
-msgstr "पहिले DNS:"
-
-#: ../src/applet-dialogs.c:590
-msgid "Secondary DNS:"
-msgstr "दुसरे DNS:"
-
-#: ../src/applet-dialogs.c:600
-#| msgid "Secondary DNS:"
-msgid "Ternary DNS:"
-msgstr "तिसरे DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:615
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:624
-#| msgid "Ignore"
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "दुर्लक्ष केले"
 
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "प्रकार (_T):"
+
+#: ../src/applet-dialogs.c:822
+#, fuzzy
+msgid "VPN Gateway:"
+msgstr "गेटवे"
+
+#: ../src/applet-dialogs.c:828
+#, fuzzy
+msgid "VPN Username:"
+msgstr "वापरकर्त्याचे नाव (_U):"
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "जोडणी (_n):"
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr "अपरिचीत"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:732
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "वैध सक्रीय जोडणी आढळली नाही!"
 
-#: ../src/applet-dialogs.c:785
-#| msgid ""
-#| "Copyright © 2004-2008 Red Hat, Inc.\n"
-#| "Copyright © 2005-2008 Novell, Inc."
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -647,499 +937,824 @@ msgstr ""
 "सर्वहक्कस्वाधीन © 2005-2008 Novell, Inc.\n"
 "व अनेक इतर सामूहीक सहभागी व भाषांतरनकर्ता"
 
-#: ../src/applet-dialogs.c:788
-msgid "Notification area applet for managing your network devices and connections."
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
 msgstr "नेटवर्क साधन व जोडणी व्यवस्थापीत करण्याकरीता सूचना क्षेत्र ॲप्लेट."
 
-#: ../src/applet-dialogs.c:790
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager संकेतस्थळ"
 
-#: ../src/applet-dialogs.c:805
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "न आढळलेली स्त्रोत"
 
-#: ../src/applet-dialogs.c:830
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "मोबाइल ब्रॉडबँड नेटवर्क पासवर्ड"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' शी जोडणी स्थापीत करण्याकरीता पासवर्ड आवश्यक आहे."
 
-#: ../src/applet-dialogs.c:854
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "पासवर्ड:"
 
-#: ../src/applet.c:894
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "SIM PIN कुलूपबंद अशक्य करणे आवश्यक"
+
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "SIM PIN कुलूपबंद अशक्य करणे आवश्यक"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
-msgstr ""
-"\n"
-"नेटवर्क जोडणी अंतर्गत व्यत्यय आण्याल्यामुले VPN जोडणी '%s' अपयशी ठरली."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "वापर करण्यापूर्वी मोबाईल ब्रॉडबँड साधण '%s' यांस SIM PIN कोड आवश्यक आहे."
 
-#: ../src/applet.c:897
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "PIN कोड:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "PIN कोड दाखवा"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "SIM PUK कुलूपबंद अशक्य करणे आवश्यक"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "SIM PUK कुलूपबंद अशक्य करणे आवश्यक"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "वापर करण्यापूर्वी मोबाईल ब्रॉडबँड साधण '%s' यांस SIM PUK कोड आवश्यक आहे."
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "PUK कोड:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "नवीन PIN कोड:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "नवीन PIN कोड पुनः द्या:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
 msgstr ""
-"\n"
-"VPN सेवा अनपेक्षीतरित्या थांबविल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:900
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"VPN सेवाने अवैध संयोजना पुरविल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
+"IP पत्ते फक्त नेटवर्कवरील संगणक ओळखतात.  IP पत्ता समावेश करण्यासाठी \"Add\" बटणावर "
+"क्लिक करा."
 
-#: ../src/applet.c:903
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+#: ../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
+msgid "_Add"
 msgstr ""
-"\n"
-"जोडणी स्थापन प्रयत्न करीता वेळ संपल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:906
-#, c-format
+#. 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
+msgid "_Delete"
+msgstr "नष्ट करा (_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+#, 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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"VPN सेवा वेळे सुरू न झाल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
+"कार्यान्वीत असल्यास, ही जोडणी पूर्वनिर्धारीत नेटवर्क जोडणी नुरूप कधिच वापरली जाणार "
+"नाही."
 
-#: ../src/applet.c:909
-#, c-format
+#: ../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…"
+msgstr "निर्माण करा…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "VPN जोडणी प्रकार नीवडा"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"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."
 msgstr ""
-"\n"
-"VPN सेवा सुरू होण्यास अपयशी ठरल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
+"नवीन जोडणी करीता वापरण्याजोगी VPN चे प्रकार नीवडा.  पसंतीचे  VPN जोडणी यादीत न "
+"आढळल्यास, तुमच्याकडे योग्य VPN प्लगइन प्रतिष्ठापीत नसावे."
 
-#: ../src/applet.c:912
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr "राऊंड-रॉबिन"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr "सक्रीय बॅकअप"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr "XOR"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr "ब्रॉडकास्ट"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr "802.3ad"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr "अडॅप्टिव्ह ट्रांस्मिट लोड बॅलेंसिंग"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr "अडॅप्टिव्ह लोड बॅलेंसिंग"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr "MII (शिफारसीय)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr "ARP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+msgid "Bonded _connections:"
+msgstr "बाँड संपन्न जोडण्या (_c):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "संपादित करा (_E)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr "फ्रिक्वेंसी नियंत्रीत करा (_f):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:"
+msgstr "संवाद नाव (_I):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr "_Link Monitoring:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr "ARP लक्ष्य (_t):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"वैध VPN गोपनीयता न आढळल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
+"दुवा स्थिती तपासतेवेळी शोधण्याजोगी एक IP पत्ता, किंवा IP पत्त्यांची स्वल्पविराम-विभाजीत "
+"सूची."
 
-#: ../src/applet.c:915
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr "लिंक अप विलंब (_u):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr "लिंक डाउन विलंब (_d):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "पहिले DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
 msgstr ""
-"\n"
-"वैध VPN गोपनीयता न आढळल्यामुळे VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:922
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+#: ../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:"
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "बाइटस्"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
 msgstr ""
-"\n"
-"VPN जोडणी '%s' अपयशी ठरली."
 
-#: ../src/applet.c:940
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "सुरक्षा (_S):"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
 msgstr ""
-"\n"
-"नेटवर्क जोडणीत व्यत्यय आणल्यामुळे VPN जोडणी '%s' तुटली."
 
-#: ../src/applet.c:943
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "वायर्ड जोडणी %d"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "नेटवर्क कार्यान्वीत करा (_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr ""
-"\n"
-"VPN सेवा थांबविल्यामुळे VPN जोडणी '%s' तुटली."
 
-#: ../src/applet.c:949
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "स्वयं"
+
+#: ../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
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+msgid "default"
+msgstr "पूर्वनिर्धारीत"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"\n"
-"VPN जोडणी '%s' तुटली."
 
-#: ../src/applet.c:983
-msgid "VPN Login Message"
-msgstr "VPN प्रवेश संदेश"
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "पत्ता"
 
-#: ../src/applet.c:989 ../src/applet.c:997 ../src/applet.c:1047
-msgid "VPN Connection Failed"
-msgstr "VPN जोडणी अपयशी"
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "पत्ता"
 
-#: ../src/applet.c:1054
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+msgid "invalid %s for %s (%s)"
 msgstr ""
-"\n"
-"VPN सेवा सुरू होण्यास अपयशी ठरल्यामुळे VPN जोडणी '%s' तुटली.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1057
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+msgid "invalid %s (%s)"
 msgstr ""
-"\n"
-"VPN जोडणी '%s' सुरू होण्यास अपयशी.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1377
-msgid "device not ready (firmware missing)"
-msgstr "साधन सज्ज नाही (फर्मवेअर आढळले नाही)"
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:1379
-msgid "device not ready"
-msgstr "साधन सज्ज नाही"
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
 
-#: ../src/applet.c:1405
-msgid "Disconnect"
-msgstr "जोडणी मोडा"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "कुठलेही साधण"
 
-#: ../src/applet.c:1419
-msgid "device not managed"
-msgstr "साधन व्यवस्थापीत केले गेले नाही"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "अपरिचीत त्रुटीमुळे जोडणी गोपणीयता अद्ययावत करण्यास अपयशी."
 
-#: ../src/applet.c:1463
-msgid "No network devices available"
-msgstr "नेटवर्क साधन उपलब्ध नाही"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "या जोडणी करीता 802.1X सुरक्षा वापरा"
 
-#: ../src/applet.c:1551
-msgid "_VPN Connections"
-msgstr "VPN जोडणी (_V)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
 
-#: ../src/applet.c:1608
-msgid "_Configure VPN..."
-msgstr "VPN संरचीत करा (_C)..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/applet.c:1612
-msgid "_Disconnect VPN"
-msgstr "VPN खंडीत करा (_D)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1710
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager कार्यरत नाही..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1715 ../src/applet.c:2508
-msgid "Networking disabled"
-msgstr "नेटवर्क बंद केले"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:1936
-msgid "Enable _Networking"
-msgstr "नेटवर्क कार्यान्वीत करा (_N)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:1945
-msgid "Enable _Wireless"
-msgstr "वायरलेस कार्यान्वीत करा (_W)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1954
-msgid "Enable _Mobile Broadband"
-msgstr "मोबाइल ब्रॉडबँड सुरू करा (_M)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:1963
-#| msgid "Enable _Mobile Broadband"
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMAX मोबाइल ब्रॉडबँड सुरू करा (_X)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#. Toggle notifications item
-#: ../src/applet.c:1974
-msgid "Enable N_otifications"
-msgstr "सूचना सुरू करा (_o)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#. 'Connection Information' item
-#: ../src/applet.c:1985
-msgid "Connection _Information"
-msgstr "जोडणी विषयी माहिती (_I)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:1995
-msgid "Edit Connections..."
-msgstr "जोडणी संपादीत करा..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2009
-msgid "_Help"
-msgstr "मदत (_H)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2018
-msgid "_About"
-msgstr "विषयी (_A)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#: ../src/applet.c:2195
-msgid "Disconnected"
-msgstr "जोडणी मोडली"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#: ../src/applet.c:2196
-msgid "The network connection has been disconnected."
-msgstr "नेटवर्क जोडणी मोडली."
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#: ../src/applet.c:2377
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "नेटवर्क जोडणी '%s' बनवत आहे..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#: ../src/applet.c:2380
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "नेटवर्क जोडणी '%s' करीता वापरकर्त्याची ओळ पटवणे आवश्यक आहे..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#: ../src/applet.c:2386
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "नेटवर्क जोडणी '%s' सक्रीय आहे"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#: ../src/applet.c:2464
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "VPN जोडणी '%s' सुरू करत आहे..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.c:2467
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN जोडणी '%s' करीता वापरकर्त्याची ओळ पटवणे आवश्यक आहे..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2470
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "'%s' करीता VPN पत्ता विनंतीकृत करत आहे..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2473
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN जोडणी '%s' सक्रीय आहे"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2512
-msgid "No network connection"
-msgstr "नेटवर्क जोडणी आढळली नाही"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:3161
-msgid "NetworkManager Applet"
-msgstr "NetworkManager ॲप्लेट"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:3167 ../src/wired-dialog.c:127
-#| msgid ""
-#| "The NetworkManager Applet could not find some required resources (the "
-#| "glade file was not found)."
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr "NetworkManager ॲप्लेटला काहिक आवश्यक स्त्रोत आढळले नाही (.ui फाइल आढळले नाही)."
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.ui.h:1 ../src/connection-editor/ce-vpn-wizard.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-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
 
-#: ../src/applet.ui.h:2
-#| msgid "Network Connections"
-msgid "Active Network Connections"
-msgstr "सक्रीय नेटवर्क जोडणी"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
 
-#: ../src/applet.ui.h:3
-msgid "C_onnect"
-msgstr "जुळवा (_o)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
 
-#: ../src/applet.ui.h:4
-msgid "C_onnection:"
-msgstr "जोडणी (_n):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.ui.h:5
-msgid "Connection Information"
-msgstr "जोडणी माहिती"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/applet.ui.h:6
-msgid "Other Wireless Network..."
-msgstr "इतर वायरलेस नेटवर्क..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/applet.ui.h:7
-msgid "Wireless _adapter:"
-msgstr "वायरलेस अडॅप्टर (_a):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/applet.ui.h:8
-msgid "_Network name:"
-msgstr "नेटवर्कचे नाव (_N):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/applet.ui.h:9
-msgid "_Unlock"
-msgstr "कुलूपबंद अशक्य करा (_U)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/applet.ui.h:10
-msgid "Wireless _security:"
-msgstr "वायरलेस सुरक्षा (_W):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/applet.ui.h:11
-msgid "label"
-msgstr "लेबल"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:67
-msgid "automatic"
-msgstr "स्वयं"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "अपरिचीत त्रुटीमुळे जोडणी गोपणीयता अद्ययावत करण्यास अपयशी."
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:2
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "Sho_w password"
-msgstr "पासवर्ड दाखवा (_w)"
+msgid "_Username:"
+msgstr "वापरकर्त्याचे नाव (_U):"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Password:"
-msgstr "पासवर्ड (_P):"
-
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "सर्व्हिस (_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../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:4
+#: ../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
-msgid "_Username:"
-msgstr "वापरकर्त्याचे नाव (_U):"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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
-#| msgid "Address"
-msgid "Addresses"
-msgstr "पत्ते"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
-#: ../src/connection-editor/page-ip6.c:136
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
+#: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "स्वयं"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-msgid "Automatic with manual DNS settings"
-msgstr "स्वयं तसेच स्वहस्ते DNS सेटिंग्स् सह"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "ट्विस्टेड पैर (TP)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-msgid "D_HCP client ID:"
-msgstr "DHCP क्लाऐंट ID (_H):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "अटॅचमेंट युनिट इंटरफेसय़ (AUI)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "मिडीया इंडिपेंडंट इंटरफेस (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "पोर्ट (_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "गती (_S):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "फूल ड्युप्लेक्स् (_x)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "स्वमध्यस्थी (_o)"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "सर्व्हिस (_S):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#, fuzzy
+msgid "C_loned MAC address:"
+msgstr "क्लोंड MAC पत्ता (_C):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid ""
-"Domains used when resolving host names. Use commas to separate multiple "
-"domains."
+"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-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
 msgstr ""
-"IP पत्ते फक्त नेटवर्कवरील संगणक ओळखतात.  IP पत्ता समावेश करण्यासाठी \"Add\" बटणावर "
-"क्लिक करा."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-msgid ""
-"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-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "पूर्वनिर्धारीत"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "दुर्लक्ष करा"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
 msgstr ""
-"यजमान नावांचे निवारण करण्यासाठी वापरण्याजोगी डोमेन नेम सर्व्हर्स्चे IP पत्ते.  एकापेक्षा "
-"जास्त डोमेन नेम सर्व्हर पत्ते वेगळे करण्यासाठी स्वल्पविरामचा वापर करा."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "ब्रॉडकास्ट पत्ता:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "प्राइव्हेट कि पासवर्ड (_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
-"कार्यान्वीत असल्यास, ही जोडणी पूर्वनिर्धारीत नेटवर्क जोडणी नुरूप कधिच वापरली जाणार "
-"नाही."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-msgid "Ig_nore automatically obtained routes"
-msgstr "स्वयंरित्या प्राप्त राऊटसकडे दुर्लक्ष करा (_n)"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-#| msgid "Link-Local Only"
-msgid "Link-Local"
-msgstr "दुवा-स्थानीय"
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, fuzzy
+msgid "All _users may connect to this network"
+msgstr "तुम्ही आता वायर्ड नेटवर्कशी जुळले आहात."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/page-ip4.c:163
-#: ../src/connection-editor/page-ip6.c:185
+#: ../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.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr "डाटाग्राम"
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+msgid "Connected"
+msgstr "जोडणी केली"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr "स्वयं तसेच स्वहस्ते DNS सेटिंग्स् सह"
+
+#: ../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 "मॅन्यूअल"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-msgid "Require IPv4 addressing for this connection to complete"
-msgstr "जोडणी पूर्ण करण्यासाठी IPv4 पत्ता आवश्यक आहे"
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
+msgstr "दुवा-स्थानीय"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:205
+#: ../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
 msgid "Shared to other computers"
 msgstr "इतर संगणकाशी सहभागीय केले"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "_Method:"
+msgstr "पद्धत (_M):"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Addresses"
+msgstr "पत्ते"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1148,44 +1763,93 @@ msgstr ""
 "DHCP क्लाएंट आयडेंटिफायर नेटवर्क प्रशासकाला संगणाची संरचना पसंतीचे करण्यास परवानगी देतो.  "
 "DHCP क्लाएंट आयडेंटिफायरचा वापर करायचे असल्यास, येथे एन्टर करा."
 
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+"यजमान नावांची निवारण करतेवेळी वापरण्याजोगी क्षेत्र. एकापेक्षा जास्त क्षेत्र वेगळे करण्यासाठी "
+"स्वल्पविरामचा वापर करा."
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr "DHCP क्लाऐंट ID (_H):"
+
+#: ../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
+#, fuzzy
+msgid "S_earch domains:"
+msgstr "क्षेत्र शोधा (_S):"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "Use this c_onnection only for resources on its network"
-msgstr "फक्त नेटवर्कवरील स्त्रोत करीता या जोडणीचा वापर करा (_o)"
+#: ../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:"
+msgstr "DNS सर्व्हर्स् (_D):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
-"When connecting to IPv6-capable networks, allows the connection to complete "
-"if IPv4 configuration fails but IPv6 configuration succeeds."
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses."
 msgstr ""
-"IPv6-सक्षम नेटवर्क्ससह जोडणी करतेवेळी, IPv4 संरचना अपयशी परंतु IPv6 संरचना यशस्वी "
-"झाल्यास, जोडणी संपन्न होण्यासाठी विनंती स्वीकारली जाते."
+"यजमान नावांचे निवारण करण्यासाठी वापरण्याजोगी डोमेन नेम सर्व्हर्स्चे IP पत्ते.  एकापेक्षा "
+"जास्त डोमेन नेम सर्व्हर पत्ते वेगळे करण्यासाठी स्वल्पविरामचा वापर करा."
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "DNS ser_vers:"
-msgstr "DNS सर्व्हर्स् (_D):"
+#, fuzzy
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr "जोडणी पूर्ण करण्यासाठी IPv4 पत्ता आवश्यक आहे"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:18
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "_Method:"
-msgstr "पद्धत (_M):"
+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:19
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "राऊट्स् (_R)…"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:20
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "बंद"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 पत्ते.  एकापेक्षा "
+"जास्त डोमेन नेम सर्व्हर पत्ते वेगळे करण्यासाठी स्वल्पविरामचा वापर करा."
+
 #: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "_Search domains:"
-msgstr "क्षेत्र शोधा (_S):"
+msgid "IPv6 _privacy extensions:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#, fuzzy
+msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "जोडणी पूर्ण होण्यासाठी IPv6 पत्ता आवश्यक आहे"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1194,502 +1858,905 @@ msgstr ""
 "झाल्यास, जोडणी संपन्न होण्यासाठी विनंती स्वीकारली जाते."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
+msgid "Basic"
+msgstr "मूळ"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
+msgid "Nu_mber:"
+msgstr "क्रमांक (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-#| msgid "<b>Advanced</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "प्रगत"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Allow roaming if home network is not available"
-msgstr "होम नेटवर्क उपलब्ध नसल्यास रोमींग स्वीकारा"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Any"
-msgstr "कुठलेही"
-
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Basic"
-msgstr "मूळ"
+msgid "_APN:"
+msgstr "APN (_A):"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "बदल करा..."
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "N_etwork ID:"
 msgstr "नेटवर्क ID (_e):"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr "बदल करा..."
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "Nu_mber:"
-msgstr "क्रमांक (_m):"
+msgid "P_IN:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "PI_N:"
-msgstr "PIN (_N):"
+#, fuzzy
+msgid "Allow _roaming if home network is not available"
+msgstr "होम नेटवर्क उपलब्ध नसल्यास रोमींग स्वीकारा"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:11
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE) शिफारसीय"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA) शिफारसीय"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "Sho_w passwords"
 msgstr "पासवर्डस् दाखवा (_w)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
-msgstr "APN (_A):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "_Type:"
-msgstr "प्रकार (_T):"
-
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
-msgstr "BSD डाटा संकोचन स्वीकारा (_B)"
+msgid "Authentication"
+msgstr "ओळख पटवा"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
-msgstr "डिफ्लेट डाटा संकोचन स्वीकारा (_D)"
+msgid "Allowed methods:"
+msgstr "स्वीकार्य पद्धती:"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:3
-#| msgid "<b>Allowed Authentication Methods</b>"
-msgid "Allowed Authentication Methods"
-msgstr "स्वीकार्य ओळख पटवण्याच्या पद्धती"
+msgid "Configure _Methods…"
+msgstr "पद्धती संरचीत करा (_M)…"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "Allowed methods:"
-msgstr "स्वीकार्य पद्धती:"
+msgid "Compression"
+msgstr "संकोचन"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:5
-#| msgid "_Authentication:"
-msgid "Authentication"
-msgstr "ओळख पटवा"
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr "पॉईंट-टू-पॉईंट एनक्रिप्शन (MPPE) चा वापर करा (_U)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:6
-msgid "C_HAP"
-msgstr "CHAP (_H)"
+msgid "_Require 128-bit encryption"
+msgstr "128-बीट एनक्रिप्शन आवश्यक (_R)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:7
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "चॅलेंज हँडशेक ऑथेंटिकेशन प्रोटोकॉल"
+msgid "Use _stateful MPPE"
+msgstr "स्तरीय MPPE चा वापर करा (_s)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:8
-#| msgid "<b>Compression</b>"
-msgid "Compression"
-msgstr "संकोचन"
+msgid "Allow _BSD data compression"
+msgstr "BSD डाटा संकोचन स्वीकारा (_B)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Configure _Methods…"
-msgstr "पद्धती संरचीत करा (_M)…"
+msgid "Allow _Deflate data compression"
+msgstr "डिफ्लेट डाटा संकोचन स्वीकारा (_D)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Echo"
-msgstr "एको"
+msgid "Use TCP _header compression"
+msgstr "TCP हेडर संकोचनचा वापर करा (_h)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "Extensible Authentication Protocol"
-msgstr "एक्सटेंसीबल ऑथेंटीकेशन प्रोटोकॉल"
+msgid "Echo"
+msgstr "एको"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
-#| msgid ""
-#| "<i>In most cases, the provider's PPP servers will support all "
-#| "authentication methods.  If connections fail, try disabling support for "
-#| "some methods.</i>"
-msgid ""
-"In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods."
+msgid "Send PPP _echo packets"
+msgstr "PPP echo पॅकेट्स् पाठवा (_e)"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
 msgstr ""
-"बहुतांश उदाहरणांत, PPP सर्वर सर्व ओळख पटवण्याचे पद्धती करीता समर्थन पुरवितो.  जोडणी "
-"अपयशी ठरल्यास, काहिक पद्धतीकरीता समर्थन अकार्यान्वीत करण्याचा प्रयत्न करा."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:13
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v2 (_2)"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:14
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Microsoft चॅलेंज हँडशेक ऑथेंटिकेशन प्रोटोकॉल"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "जोडणी (_n):"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:15
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft चॅलेंज हँडशेक ऑथेंटिकेशन प्रोटोकॉल वर्जन 2"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:16
-msgid "Password Authentication Protocol"
-msgstr "पासवर्ड ऑथेंटिकेशन प्रोटोकॉल"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+msgid "_Parent interface:"
+msgstr "पॅरेंट संवाद (_P):"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:17
-msgid "Send PPP _echo packets"
-msgstr "PPP echo पॅकेट्स् पाठवा (_e)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:18
-msgid "Use TCP _header compression"
-msgstr "TCP हेडर संकोचनचा वापर करा (_h)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "क्लोंड MAC पत्ता (_C):"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:19
-msgid "Use _stateful MPPE"
-msgstr "स्तरीय MPPE चा वापर करा (_s)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr "VLAN id (_i):"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:20
-msgid "_EAP"
-msgstr "EAP (_E)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:21
-msgid "_MSCHAP"
-msgstr "MSCHAP (_M)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:22
-msgid "_PAP"
-msgstr "PAP (_P)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:23
-msgid "_Require 128-bit encryption"
-msgstr "128-बीट एनक्रिप्शन आवश्यक (_R)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:24
-msgid "_Use point-to-point encryption (MPPE)"
-msgstr "पॉईंट-टू-पॉईंट एनक्रिप्शन (MPPE) चा वापर करा (_U)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-#| msgid "%u Mb/s"
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
+msgstr "साधन नाव + क्रमांक"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr "\"vlan\" + क्रमांक"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-#| msgid "Mb/s"
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "सुरक्षा:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-#| msgid "%u Mb/s"
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
+msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
-msgstr "अटॅचमेंट युनिट इंटरफेसय़ (AUI)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
+msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
-msgstr "स्वमध्यस्थी (_o)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
-msgstr "BNC"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "Full duple_x"
-msgstr "फूल ड्युप्लेक्स् (_x)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr "ॲडहॉक"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "MT_U:"
-msgstr "MTU (_U):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
-msgstr "मिडीया इंडिपेंडंट इंटरफेस (MII)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr "ट्रान्समिशन पावर (_w):"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-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-wifi.ui.h:14
+msgid "Mb/s"
+msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"हा पर्याय येथील दिलेल्या MAC पत्ता द्वारे निर्देशीत नेटवर्क साधणकरीता ही जोडणी कुलूपबंद "
-"करतो.  उदाहरणार्थ: 00:11:22:33:44:55"
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr "दर (_R):"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-msgid "Twisted Pair (TP)"
-msgstr "ट्विस्टेड पैर (TP)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-msgid "_Cloned MAC address:"
-msgstr "क्लोंड MAC पत्ता (_C):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr "मार्ग (_h):"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
-msgid "_Device MAC address:"
-msgstr "साधनाचे MAC पत्ता (_M):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr "बॅन्ड (_d):"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Port:"
-msgstr "पोर्ट (_P):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-msgid "_Speed:"
-msgstr "गती (_S):"
+#: ../src/connection-editor/ce-polkit-button.c:74
+msgid "No polkit authorization to perform the action"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:19
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "bytes"
-msgstr "बाइटस्"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+msgid "Allowed Authentication Methods"
+msgstr "स्वीकार्य ओळख पटवण्याच्या पद्धती"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#| msgid "%u (%u MHz)"
-msgid "A (5 GHz)"
-msgstr "A (5 GHz)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr "EAP (_E)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
-msgid "Ad-hoc"
-msgstr "ॲडहॉक"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr "एक्सटेंसीबल ऑथेंटीकेशन प्रोटोकॉल"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "B/G (2.4 GHz)"
-msgstr "B/G (2.4 GHz)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr "PAP (_P)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
-msgid "Ban_d:"
-msgstr "बॅन्ड (_d):"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr "पासवर्ड ऑथेंटिकेशन प्रोटोकॉल"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "C_hannel:"
-msgstr "मार्ग (_h):"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr "CHAP (_H)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-#| msgid ""
-#| "Infrastructure\n"
-#| "Ad-hoc"
-msgid "Infrastructure"
-msgstr "मांडणी"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "चॅलेंज हँडशेक ऑथेंटिकेशन प्रोटोकॉल"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "M_ode:"
-msgstr "पद्धत (_o):"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr "MSCHAP (_M)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "Mb/s"
-msgstr "Mb/s"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft चॅलेंज हँडशेक ऑथेंटिकेशन प्रोटोकॉल"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v2 (_2)"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft चॅलेंज हँडशेक ऑथेंटिकेशन प्रोटोकॉल वर्जन 2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
 msgstr ""
-"येथील दिलेल्या BSSID द्वारे निर्देशीत वायरलेस ऍक्सेस् पॉईंट (AP) करीता हा पर्याय ही जोडणी "
-"कुलूपबंद करतो.  उदाहरणार्थ: 00:11:22:33:44:55"
+"बहुतांश उदाहरणांत, PPP सर्वर सर्व ओळख पटवण्याचे पद्धती करीता समर्थन पुरवितो.  जोडणी "
+"अपयशी ठरल्यास, काहिक पद्धतीकरीता समर्थन अकार्यान्वीत करण्याचा प्रयत्न करा."
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
-msgid "Transmission po_wer:"
-msgstr "ट्रान्समिशन पावर (_w):"
+#: ../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"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid "_BSSID:"
-msgstr "BSSID (_B):"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_Rate:"
-msgstr "दर (_R):"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "_SSID:"
-msgstr "SSID (_S):"
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "DSL"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:21
-msgid "mW"
-msgstr "mW"
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+msgid "Team"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
-msgstr "सुरक्षा (_S):"
+#: ../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
+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"
+msgstr "VLAN"
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-#| msgid "VPN Connection Failed"
-msgid "Choose a VPN Connection Type"
-msgstr "VPN जोडणी प्रकार नीवडा"
+#: ../src/connection-editor/connection-helpers.c:196
+msgid "Hardware"
+msgstr "हार्डवेअर:"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Create…"
-msgstr "निर्माण करा…"
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr "वर्च्युअल"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-#| msgid ""
-#| "<span weight=\"bold\" size=\"larger\">Choose a VPN Connection Type</"
-#| "span>\n"
-#| "\n"
-#| "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."
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+msgid "Import a saved VPN configuration..."
+msgstr "साठविलेली VPN संरचना आयात करा..."
+
+#: ../src/connection-editor/connection-helpers.c:323
 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 प्लगइन प्रतिष्ठापीत नसावे."
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "अपरिचीत त्रुटीमुळे जोडणी संपादक संवाद प्रारंभ करणे अशक्य."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:506
-#: ../src/connection-editor/ip6-routes-dialog.c:464
-#: ../src/connection-editor/page-ip4.c:733
-#: ../src/connection-editor/page-ip6.c:718
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "नवीन जोडणी निर्माण करणे अशक्य"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "जोडणी नष्ट करणे अपयशी"
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "तुम्हाला नक्की जोडणी %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
 msgid "Address"
 msgstr "पत्ता"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:522
-#: ../src/connection-editor/page-ip4.c:750
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "नेटमास्क"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:538
-#: ../src/connection-editor/ip6-routes-dialog.c:496
-#: ../src/connection-editor/page-ip4.c:767
-#: ../src/connection-editor/page-ip6.c:752
+#: ../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
 msgid "Gateway"
 msgstr "गेटवे"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:554
-#: ../src/connection-editor/ip6-routes-dialog.c:512
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "मेट्रीक"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:480
-#: ../src/connection-editor/page-ip6.c:735
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "प्रिफीक्स्"
 
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "%s संपादीत करत आहे"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "विनावी जोडणी संपादीत करत आहे"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "जोडणी नाव (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "संपादक प्रारंभ करतेवेळी त्रुटी"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "जोडणी समावेश करणे अपयशी"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+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:419
+msgid "_Save"
+msgstr "साठवा (_S)"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "या जोडणीकरीता कार्यान्वीत केलेले कुठलेही बदल साठवा."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "या मशीन वरील सर्व वापरकर्त्यांकरीता ही जोडणी साठवण्यासाठी ओळख पटवा."
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not create connection"
+msgstr "जोडणी निर्माण करणे अशक्य"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "जोडणी संपादीत करणे अशक्य"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr "जोडणी संपादक संवाद निर्माण करतेवेळी त्रुटी आढळली."
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "संपादक प्रारंभ करतेवेळी त्रुटी"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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-list.c:1444
-msgid "DSL"
-msgstr "DSL"
+msgid "Connection _name:"
+msgstr "जोडणी नाव (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
+msgstr "एक्सपोर्ट करा (_E)..."
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "कधिच नाही"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "आता"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d वर्ष पूर्वी"
+msgstr[1] "%d वर्षांपूर्वी"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "नाव"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "शेवटच्यावेळी वापरले"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "नीवडलेली जोडणी संपादीत करा"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "नीवडलेली जोडणी संपादीत करण्याकरीता ओळख पटवा"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "नीवडलेली जोडणी नष्ट करा"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "नीवडलेली जोडणी नष्ट करण्याकरीता ओळख पटवा"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "नवीन '%s' जोडणी कसे निर्माण करायचे, ते माहिती नाही"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "जोडणी निर्माण करतेवेळी त्रुटी आढळली"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr "जोडणी संपादीत करतेवेळी त्रुटी"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "UUID '%s' सह जोडणी आढळली नाही"
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "802.1x सुरक्षा"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "WiFi सुरक्षा वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: ../src/connection-editor/page-8021x-security.c:125
+#, fuzzy
+msgid "Use 802.1_X security for this connection"
+msgstr "या जोडणी करीता 802.1X सुरक्षा वापरा"
+
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "ब्ल्यूटूथ साधण आढळले नाही."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "वायर्ड जोडणी %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "नेटवर्क कार्यान्वीत करा (_N)"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "वायरलेस "
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
+msgstr "बाँड वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "पहिले DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, c-format
+msgid "Bond connection %d"
+msgstr "बाँड जोडणी %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "वायर्ड जोडणी %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "DSL वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-dsl.c:229
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL जोडणी %d"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:126
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"हा पर्याय येथील दिलेल्या MAC पत्ता द्वारे निर्देशीत नेटवर्क साधणकरीता ही जोडणी कुलूपबंद "
+"करतो.  उदाहरणार्थ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "इथरनेट (%s)"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "क्लोंड MAC पत्ता (_C):"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "पूर्वनिर्धारीत"
+
+#: ../src/connection-editor/page-general.c:52
+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 कार्यरत नाही..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr "इंफिनिबँड वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "इंफिनिबँड जोडणी %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "स्वयं (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:127
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "फक्त स्वयं (VPN) पत्ते"
 
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:130
-msgid "Automatic (PPP)"
-msgstr "स्वयं (PPP)"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "स्वयं, फत्त पत्ते"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:131
-msgid "Automatic (PPP) addresses only"
-msgstr "फक्त स्वयं (PPP) पत्ते"
-
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip6.c:132
 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:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "फक्त स्वयं (PPPoE) पत्ते"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "स्वयं (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "फक्त स्वयं (DHCP) पत्ते"
 
-#: ../src/connection-editor/page-ip4.c:175
-#: ../src/connection-editor/page-ip6.c:198
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "फक्त स्थानीयशी जुळवा"
 
-#: ../src/connection-editor/page-ip4.c:191
-msgid "Disabled"
-msgstr "बंद"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "DNS सर्व्हर्स् (_D):"
 
-#: ../src/connection-editor/page-ip4.c:699
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "क्षेत्र शोधा (_S):"
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s करीता IPv4 मार्ग संपादीत करत आहे"
 
-#: ../src/connection-editor/page-ip4.c:810
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 संयोजना"
 
-#: ../src/connection-editor/page-ip4.c:812
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic, addresses only"
-msgstr "स्वयं, फत्त पत्ते"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:149
-#: ../src/wireless-security/eap-method.c:285
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "दुर्लक्ष करा"
 
-#: ../src/connection-editor/page-ip6.c:173
-#| msgid "Automatic (DHCP)"
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "स्वयं, फक्त DHCP"
 
-#: ../src/connection-editor/page-ip6.c:684
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s करीता IPv6 राऊट्स् संपादीत करत आहे"
 
-#: ../src/connection-editor/page-ip6.c:793
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 सेटिंग्स्"
 
-#: ../src/connection-editor/page-ip6.c:795
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-mobile.c:374
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr "%s स्लेव्ह %d"
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "मोबाईल ब्रॉडबँड वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "असमर्थीत मोबाइल ब्रॉडबँड जोडणी प्रकार."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:632
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "मोबाइल ब्रॉडबँड प्रोव्हइडर प्रकार नीवडा"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1697,426 +2764,267 @@ msgstr ""
 "मोबाईल ब्रॉडबँड प्रोव्हाइडर द्वारे वापरण्याजोगी विज्ञान नीवडा.  खात्री नसल्यास, "
 "प्रोव्हाइडरशी संपर्क साधा."
 
-#: ../src/connection-editor/page-mobile.c:664
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "माझे प्रोव्हाइडर GSM-आधारीत विज्ञानाचा (म्हणजेच GPRS, EDGE, UMTS, HSDPA) वापर "
 "करतात (_G)"
 
-#: ../src/connection-editor/page-mobile.c:671
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr "माझे प्रोव्हाइडर CDMA-आधारीत विज्ञानाचा (म्हणजेच 1xRTT, EVDO) वापर करतात (_D)"
+msgstr ""
+"माझे प्रोव्हाइडर CDMA-आधारीत विज्ञानाचा (म्हणजेच 1xRTT, EVDO) वापर करतात (_D)"
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:232
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-peap.c:248
-#: ../src/wireless-security/eap-method-ttls.c:264
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:248
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "काहिच नाही"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:281
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP संयोजना"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-vpn.c:107
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1440
-msgid "VPN"
-msgstr "VPN"
+#: ../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 "आयात करण्याजोगी फाइल नीवडा"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "वायर्ड जोडणी %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "नेटवर्क जोडणी आढळली नाही"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "IPv4 वापरकर्ता संवाद लोड करणे अशक्य."
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN जोडणी %d"
 
-#: ../src/connection-editor/page-vpn.c:109
-#| msgid "Could not load PPP user interface."
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-vpn.c:124
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' करीता VPN प्लगइन सेवा आढळली नाही."
 
-#: ../src/connection-editor/page-vpn.c:218
-#: ../src/connection-editor/nm-connection-list.c:881
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN जोडणी %d"
 
-#: ../src/connection-editor/page-wired.c:211
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1428
-msgid "Wired"
-msgstr "वार्यर्ड"
-
-#: ../src/connection-editor/page-wired.c:213
-msgid "Could not load wired user interface."
-msgstr "वायर्ड वापरकर्ता संवाद लोड करणे अशक्य."
-
-#: ../src/connection-editor/page-wired.c:348
-#, c-format
-msgid "Wired connection %d"
-msgstr "वायर्ड जोडणी %d"
+#: ../src/connection-editor/page-vpn.c:229
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
+"VPN प्लगइन VPN जोडणी योग्यरित्या आयात करण्यास अपयशी ठरले\n"
+"\n"
+"त्रुटी: VPN सेवा प्रकार आढळले नाही."
 
-#: ../src/connection-editor/page-wired-security.c:114
-msgid "802.1x Security"
-msgstr "802.1x सुरक्षा"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "VPN जोडणी प्रकार नीवडा"
 
-#: ../src/connection-editor/page-wired-security.c:116
-#| msgid "Could not load WiFi security user interface."
-msgid "Could not load Wired Security security user interface."
-msgstr "वायर्ड सेक्युरिटि सुरक्षा वापरकर्ता संवाद लोड करणे अशक्य."
+#: ../src/connection-editor/page-vpn.c:255
+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 प्लगइन प्रतिष्ठापीत नसावे."
 
-#: ../src/connection-editor/page-wired-security.c:130
-msgid "Use 802.1X security for this connection"
-msgstr "या जोडणी करीता 802.1X सुरक्षा वापरा"
+#: ../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 द्वारे निर्देशीत वायरलेस ऍक्सेस् पॉईंट (AP) करीता हा पर्याय ही जोडणी "
+"कुलूपबंद करतो.  उदाहरणार्थ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:147
-#: ../src/connection-editor/page-wireless.c:151
-#: ../src/connection-editor/page-wireless.c:172
-#, c-format
-msgid "default"
-msgstr "पूर्वनिर्धारीत"
+#: ../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)\""
+msgstr ""
+"हा पर्याय येथील दिलेल्या MAC पत्ता द्वारे निर्देशीत नेटवर्क साधणकरीता ही जोडणी कुलूपबंद "
+"करतो.  उदाहरणार्थ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:176
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:396
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1432
-msgid "Wireless"
-msgstr "वायरलेस"
-
-#: ../src/connection-editor/page-wireless.c:398
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "WiFi वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/page-wireless.c:562
-#, c-format
-msgid "Wireless connection %d"
-msgstr "वायरलेस जोडणी %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "कुठलेही साधण"
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "वायर्ड जोडणी %d"
 
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/wireless-dialog.c:920
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:272
-#: ../src/wireless-dialog.c:929
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit गोपनीयता"
 
-#: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/wireless-dialog.c:959
+#: ../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)"
 msgstr "गतिक WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/wireless-dialog.c:973
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 खाजगी"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/wireless-dialog.c:987
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 एन्टरप्राइज"
 
-#: ../src/connection-editor/page-wireless-security.c:359
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "WiFi सुरक्षा वापरकर्ता संवाद लोड करणे अशक्य; WiFi संयोजना आढळली नाही."
 
-#: ../src/connection-editor/page-wireless-security.c:368
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "वायरलेस सुरक्षा"
 
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
 msgstr "WiFi सुरक्षा वापरकर्ता संवाद लोड करणे अशक्य."
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Editing %s"
-msgstr "%s संपादीत करत आहे"
-
-#: ../src/connection-editor/nm-connection-editor.c:105
-msgid "Editing un-named connection"
-msgstr "विनावी जोडणी संपादीत करत आहे"
-
-#: ../src/connection-editor/nm-connection-editor.c:292
-#| msgid ""
-#| "The connection editor could not find some required resources (the glade "
-#| "file was not found)."
-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:395
-msgid "Error creating connection editor dialog."
-msgstr "जोडणी संपादक संवाद बनवतेवेळी त्रुटी आढळली."
-
-#: ../src/connection-editor/nm-connection-editor.c:407
-msgid "_Save"
-msgstr "साठवा (_S)"
-
-#: ../src/connection-editor/nm-connection-editor.c:408
-msgid "Save any changes made to this connection."
-msgstr "या जोडणीकरीता कार्यान्वीत केलेले कुठलेही बदल साठवा."
-
-#: ../src/connection-editor/nm-connection-editor.c:409
-msgid "_Save..."
-msgstr "साठवा (_S)..."
-
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "या मशीन वरील सर्व वापरकर्त्यांकरीता ही जोडणी साठवण्यासाठी ओळख पटवा."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "A_vailable to all users"
-msgstr "सर्व वापरकर्त्यांकरीता उपलब्ध"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "स्वयं जुळवा (_a)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
-msgstr "जोडणी नाव (_n):"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "E_xport"
-msgstr "स्वरूप बदला (_x)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "_Import"
-msgstr "आयात करा (_I)"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "कधिच नाही"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "आता"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d मिनीट पूर्वी"
-msgstr[1] "%d मिनीटं पूर्वी"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d तास पूर्वी"
-msgstr[1] "%d तास पूर्वी"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d दिवस पूर्वी"
-msgstr[1] "%d दिवसांपूर्वी"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d महिना पूर्वी"
-msgstr[1] "%d महिन्यांपूर्वी"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d वर्ष पूर्वी"
-msgstr[1] "%d वर्षांपूर्वी"
-
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "जोडणी समावेश करणे अपयशी"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-#| msgid "Error displaying connection information:"
-msgid "Error saving connection"
-msgstr "जोडणी साठवतेवेळी त्रुटी"
-
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-#| msgid "Error editing connection: property '%s' / '%s' invalid: %d"
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "गुणधर्म '%s' / '%s' अवैध आहे: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
-msgid "An unknown error occurred."
-msgstr "अपरिचीत त्रुटी आढळली."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:683
-msgid "Error initializing editor"
-msgstr "संपादक प्रारंभ करतेवेळी त्रुटी"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:700
-#: ../src/connection-editor/nm-connection-list.c:867
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
-msgstr "अपरिचीत त्रुटीमुळे जोडणी संपादक संवाद प्रारंभ करणे अशक्य."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "नवीन जोडणी निर्माण करणे अशक्य"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "नवीन जोडणी संपादीत करणे अशक्य"
-
-#: ../src/connection-editor/nm-connection-list.c:714
-msgid "Could not edit connection"
-msgstr "जोडणी संपादीत करणे अशक्य"
-
-#: ../src/connection-editor/nm-connection-list.c:744
-msgid "Connection delete failed"
-msgstr "जोडणी नष्ट करणे अपयशी"
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:776
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "तुम्हाला नक्की जोडणी %s नष्ट करायची?"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:911
-#: ../src/connection-editor/vpn-helpers.c:227
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN जोडणी आयात करणे अशक्य"
 
-#: ../src/connection-editor/nm-connection-list.c:913
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"VPN प्लगइन VPN जोडणी योग्यरित्या आयात करण्यास अपयशी ठरले\n"
-"\n"
-"त्रुटी: VPN सेवा प्रकार आढळले नाही."
-
-#: ../src/connection-editor/nm-connection-list.c:926
-msgid "Could not edit imported connection"
-msgstr "आयात केलेली जोडणी आयात करणे अशक्य"
-
-#: ../src/connection-editor/nm-connection-list.c:1069
-msgid "Name"
-msgstr "नाव"
-
-#: ../src/connection-editor/nm-connection-list.c:1081
-msgid "Last Used"
-msgstr "शेवटच्यावेळी वापरले"
-
-#: ../src/connection-editor/nm-connection-list.c:1197
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr "VPN प्लगइन अनुपलब्ध. कृपया बटन सुरू करण्यासठी एक प्रतिष्ठापीत करा."
-
-#: ../src/connection-editor/nm-connection-list.c:1208
-#| msgid "Edit"
-msgid "_Edit"
-msgstr "संपादित करा (_E)"
-
-#: ../src/connection-editor/nm-connection-list.c:1209
-msgid "Edit the selected connection"
-msgstr "नीवडलेली जोडणी संपादीत करा"
-
-#: ../src/connection-editor/nm-connection-list.c:1210
-#| msgid "Edit..."
-msgid "_Edit..."
-msgstr "संपादित करा (_E)..."
-
-#: ../src/connection-editor/nm-connection-list.c:1211
-msgid "Authenticate to edit the selected connection"
-msgstr "नीवडलेली जोडणी संपादीत करण्याकरीता ओळख पटवा"
-
-#: ../src/connection-editor/nm-connection-list.c:1226
-#| msgid "Delete"
-msgid "_Delete"
-msgstr "नष्ट करा (_D)"
-
-#: ../src/connection-editor/nm-connection-list.c:1227
-msgid "Delete the selected connection"
-msgstr "नीवडलेली जोडणी नष्ट करा"
-
-#: ../src/connection-editor/nm-connection-list.c:1228
-#| msgid "Delete..."
-msgid "_Delete..."
-msgstr "नष्ट करा (_D)..."
-
-#: ../src/connection-editor/nm-connection-list.c:1229
-msgid "Authenticate to delete the selected connection"
-msgstr "नीवडलेली जोडणी नष्ट करण्याकरीता ओळख पटवा"
-
-#: ../src/connection-editor/nm-connection-list.c:1500
-#| msgid "Error creating connection editor dialog."
-msgid "Error creating connection"
-msgstr "जोडणी निर्माण करतेवेळी त्रुटी आढळली"
-
-#: ../src/connection-editor/nm-connection-list.c:1501
-#, c-format
-#| msgid "Could not create new connection"
-msgid "Don't know how to create '%s' connections"
-msgstr "नवीन '%s' जोडणी कसे निर्माण करायचे, ते माहिती नाही"
-
-#: ../src/connection-editor/nm-connection-list.c:1555
-#: ../src/connection-editor/nm-connection-list.c:1567
-#| msgid "Editing un-named connection"
-msgid "Error editing connection"
-msgstr "जोडणी संपादीत करतेवेळी त्रुटी"
-
-#: ../src/connection-editor/nm-connection-list.c:1556
-#, c-format
-#| msgid "Could not edit connection"
-msgid "Don't know how to edit '%s' connections"
-msgstr "नवीन '%s' जोडणी कसे संपादित करायचे, ते माहिती नाही"
-
-#: ../src/connection-editor/nm-connection-list.c:1568
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "UUID '%s' सह जोडणी आढळली नाही"
-
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2129,29 +3037,30 @@ msgstr ""
 "\n"
 "त्रुटी: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:261
-msgid "Select file to import"
-msgstr "आयात करण्याजोगी फाइल नीवडा"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "अपरिचीत"
 
-#: ../src/connection-editor/vpn-helpers.c:309
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" नामांकीत फाइल आधिपासूनच अस्तित्वात आहे."
 
-#: ../src/connection-editor/vpn-helpers.c:311
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "बदलवा (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:349
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN जोडणीचे स्वरूप बदलवणे अशक्य"
 
-#: ../src/connection-editor/vpn-helpers.c:351
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2162,212 +3071,59 @@ msgstr ""
 "\n"
 "त्रुटी: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:385
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN जोडणीचे स्वरूप बदला..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:218
-#, c-format
-#| msgid "Could not create new connection"
-msgid "Failed to create PAN connection: %s"
-msgstr "PAN जोडणी निर्माण करणे अशक्य: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:223
-#: ../src/gnome-bluetooth/bt-widget.c:491
-msgid "Your phone is now ready to use!"
-msgstr "तुमचे फोन आत्ता वापरणीस सज्ज आहे!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:247
-#, c-format
-msgid "%s Network"
-msgstr "%s नेटवर्क"
-
-#: ../src/gnome-bluetooth/bt-widget.c:373
-#, c-format
-msgid "Error: %s"
-msgstr "त्रुटी: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:486
-#, c-format
-#| msgid "Could not create new connection"
-msgid "Failed to create DUN connection: %s"
-msgstr "DUN जोडणी निर्माण करणे अशक्य: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:509
-msgid "Mobile wizard was canceled"
-msgstr "मोबाईल सहाय्यक रद्द केले"
-
-#: ../src/gnome-bluetooth/bt-widget.c:518
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "अपरिचीत फोन साधण प्रकार (GSM किंवा CDMA नाही)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:712
-#: ../src/gnome-bluetooth/bt-widget.c:718
-msgid "failed to connect to the phone."
-msgstr "फोनशी जोडणी करण्यास अपयशी."
-
-#: ../src/gnome-bluetooth/bt-widget.c:751
-msgid "unexpectedly disconnected from the phone."
-msgstr "अनपेक्षीतरित्या फोनशी जोडणी खंडीत केले."
-
-#: ../src/gnome-bluetooth/bt-widget.c:760
-msgid "timed out detecting phone details."
-msgstr "फोनचे तपशील ओळखतेवेळी वेळ समाप्ती आढळली."
-
-#: ../src/gnome-bluetooth/bt-widget.c:772
-msgid "Detecting phone configuration..."
-msgstr "फोन संरचना ओळखत आहे..."
-
-#: ../src/gnome-bluetooth/bt-widget.c:838
-msgid "could not find the Bluetooth device."
-msgstr "ब्ल्यूटूथ साधण आढळले नाही."
-
-#: ../src/gnome-bluetooth/bt-widget.c:971
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"डायल-अप-नेटवर्किंग जोडणी सेट करण्यापूर्वी पूर्वनिर्धारीत Bluetooth अडॅप्टर सुरू करणे आवश्यक "
-"आहे."
+"NetworkManager ॲप्लेटला काहिक आवश्यक स्त्रोत आढळले नाही (.ui फाइल आढळले नाही)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1003
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "Bluetooth संरचना शक्य नाही (D-Bus सह जोडणी अशक्य: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1013
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "Bluetooth संरचना शक्य नाही (D-Bus प्रॉक्सीचे निर्माण अशक्य)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-#, c-format
-msgid "Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "Bluetooth संरचना शक्य नाही (NetworkManager शोधतेवेळी त्रुटी: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1085
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "मोबाईल फोनला नेटवर्क साधण (PAN/NAP) म्हणून वापर करा"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1094
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "मोबाईल फोन (DUN) चा वापर करून इंटरनेटकरीता प्रवेश प्राप्त करा"
-
-#: ../src/main.c:70
-msgid "Usage:"
-msgstr "वापर:"
-
-#: ../src/main.c:72
-msgid ""
-"This program is a component of NetworkManager (https://wiki.gnome.org/"
-"Projects/NetworkManager/)."
-msgstr "हे कार्यक्रम NetworkManager चे घटक आहे (https://wiki.gnome.org/Projects/NetworkManager/)."
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "कुलूपबंद अशक्य करा (_U)"
 
-#: ../src/main.c:73
-msgid ""
-"It is not intended for command-line interaction but instead runs in the "
-"GNOME desktop environment."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
 msgstr ""
-"हे आदेश-ओळ संवाद करीता लागू होत नाही परंतु त्याऐवजी GNOME डेस्कटॉप एन्वार्यनमेंट मध्ये "
-"चालवले जाते."
-
-#: ../src/mb-menu-item.c:57
-msgid "EVDO"
-msgstr "EVDO"
-
-#: ../src/mb-menu-item.c:61
-msgid "GPRS"
-msgstr "GPRS"
-
-#: ../src/mb-menu-item.c:63
-msgid "EDGE"
-msgstr "EDGE"
-
-#: ../src/mb-menu-item.c:65
-msgid "UMTS"
-msgstr "UMTS"
-
-#: ../src/mb-menu-item.c:67
-msgid "HSDPA"
-msgstr "HSDPA"
-
-#: ../src/mb-menu-item.c:69
-msgid "HSUPA"
-msgstr "HSUPA"
-
-#: ../src/mb-menu-item.c:71
-msgid "HSPA"
-msgstr "HSPA"
-
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../src/mb-menu-item.c:109
-msgid "not enabled"
-msgstr "सुरू केले नाही"
-
-#: ../src/mb-menu-item.c:115
-msgid "not registered"
-msgstr "नोंदणीकृत नाही"
-
-#: ../src/mb-menu-item.c:133
-#, c-format
-msgid "Home network (%s)"
-msgstr "होम नेटवर्क (%s)"
-
-#: ../src/mb-menu-item.c:135
-#, c-format
-msgid "Home network"
-msgstr "होम नेटवर्क"
 
-#: ../src/mb-menu-item.c:143
-msgid "searching"
-msgstr "शोधत आहे"
-
-#: ../src/mb-menu-item.c:146
-msgid "registration denied"
-msgstr "नोंदणी नकारली"
-
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
-#, c-format
-msgid "%s (%s roaming)"
-msgstr "%s (%s रोमींग)"
-
-#: ../src/mb-menu-item.c:153 ../src/mb-menu-item.c:159
-#, c-format
-msgid "%s (roaming)"
-msgstr "%s (रोमींग)"
-
-#: ../src/mb-menu-item.c:162
-#, c-format
-msgid "Roaming network (%s)"
-msgstr "रोमींग नेटवर्क (%s)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "जोडणी माहिती"
 
-#: ../src/mb-menu-item.c:164
-#, c-format
-msgid "Roaming network"
-msgstr "रोमींग नेटवर्क"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "सक्रीय नेटवर्क जोडणी"
 
-#: ../src/utils/mobile-wizard.c:196
-msgid "Your mobile broadband connection is configured with the following settings:"
+#: ../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/utils/mobile-wizard.c:203
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "तुमचे साधण:"
 
 #. Provider
-#: ../src/utils/mobile-wizard.c:214
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "तुमचे प्रोव्हाइडर:"
 
 #. Plan and APN
-#: ../src/utils/mobile-wizard.c:225
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "तुमचे प्लॅन:"
 
-#: ../src/utils/mobile-wizard.c:246
+#: ../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 "
@@ -2380,23 +3136,28 @@ msgstr ""
 "तपासा.  मबाईल ब्रॉडबँड जोडणीच्या सेटिंग्स् संपादीत करण्यासाठी, System >> Preferences "
 "मेन्यू पासून \"Network Connections\" नीवडा."
 
-#: ../src/utils/mobile-wizard.c:258
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "मोबाइल ब्रॉडबँड सेटिंग्स्ची खात्री करा"
 
-#: ../src/utils/mobile-wizard.c:319
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "सूचीत नाही"
 
-#: ../src/utils/mobile-wizard.c:437
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "तुमचे प्लॅन नीवडा (_S):"
 
-#: ../src/utils/mobile-wizard.c:461
+#: ../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/utils/mobile-wizard.c:480
+#: ../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"
@@ -2408,70 +3169,83 @@ msgstr ""
 "\n"
 "प्लॅन विषयी खात्री नसल्यास कृपया प्रोव्हाइडरला तुमच्या प्लॅन APN विषयी विचारा."
 
-#: ../src/utils/mobile-wizard.c:487
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "तुमचे बिलींग प्लॅन नीवडा"
 
-#: ../src/utils/mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "माजे प्लॅन सूचीत नाही..."
 
-#: ../src/utils/mobile-wizard.c:688
+#: ../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/utils/mobile-wizard.c:701
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "प्रोव्हाइडर"
 
-#: ../src/utils/mobile-wizard.c:726
+#: ../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/utils/mobile-wizard.c:737
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "प्रोव्हाइडर:"
 
-#: ../src/utils/mobile-wizard.c:761
+#: ../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/utils/mobile-wizard.c:767
+#: ../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/utils/mobile-wizard.c:778
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "आपली प्राइव्हेट कि नीवडा"
 
-#: ../src/utils/mobile-wizard.c:1024
-#| msgid "Country List:"
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "देश किंवा प्रांताची सूची:"
 
-#: ../src/utils/mobile-wizard.c:1036
-#| msgid "Country List:"
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "देश किंवा प्रांत"
 
-#: ../src/utils/mobile-wizard.c:1043
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "माझे देश सूचीत नाही"
 
-#: ../src/utils/mobile-wizard.c:1089
-#| msgid "Choose your Provider's Country"
+#: ../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/utils/mobile-wizard.c:1143
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "प्रतिष्ठापीत GSM साधन"
 
-#: ../src/utils/mobile-wizard.c:1146
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "प्रतिष्ठापीत CDMA साधन"
 
-#: ../src/utils/mobile-wizard.c:1314
+#: ../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."
@@ -2479,181 +3253,503 @@ msgstr ""
 "सहाय्यक तुम्हाला मोबाईल ब्रॉडबँड जोडणी सेल्यूलर (3G) नेटवर्ककरीता सेट अप करण्यास मदत "
 "करतो."
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "तुम्हाला खालील माहितीची आवश्यकता आहे:"
 
-#: ../src/utils/mobile-wizard.c:1330
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "तुमच्या ब्रॉडबँड प्रोव्हाइडरचे नवा"
 
-#: ../src/utils/mobile-wizard.c:1336
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "तुमच्या ब्रॉडबँड बिलींग प्लॅनचे नाव"
 
-#: ../src/utils/mobile-wizard.c:1342
+#: ../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/utils/mobile-wizard.c:1369
+#: ../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 "या मोबाइल ब्रॉडबँड साधण करीता जोडणी निर्माण करा (_t):"
 
-#: ../src/utils/mobile-wizard.c:1384
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "कुठलेही साधण"
 
-#: ../src/utils/mobile-wizard.c:1397
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "मोबाइल ब्रॉडबँड जोडणी सेटअप करा"
 
-#: ../src/utils/mobile-wizard.c:1561
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "नवीन मोबाइल ब्रॉडबँड जोडणी"
 
-#: ../src/utils/nmn-mobile-providers.c:78
-msgid "United Kingdom"
-msgstr "युनाइटेड किंगडम"
+#: ../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/utils/nmn-mobile-providers.c:510
-msgid "Default"
-msgstr "पूर्वनिर्धारीत"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/wired-dialog.c:97
-msgid "Wired 802.1X authentication"
-msgstr "Wired 802.1X ओळख पटवा"
+#: ../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/wireless-dialog.c:454
+#: ../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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "पासवर्ड (_P):"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "पासवर्ड (_P):"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "पासवर्डस् दाखवा (_w)"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "नवीन..."
 
-#: ../src/wireless-dialog.c:1074
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "काहीच नाही"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "बनवा (_r)"
 
-#: ../src/wireless-dialog.c:1152
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "वायरलेस नेटवर्क '%s' करीता प्रवेश प्राप्त करण्यासाठी पासवर्ड किंवा एनक्रीपसन कि आवश्यक "
 "आहे."
 
-#: ../src/wireless-dialog.c:1154
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "वायरलेस नेटवर्क ओळख पटवणे आवश्यक"
 
-#: ../src/wireless-dialog.c:1156
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "वायरलेस नेटवर्क द्वारे ओळख पटवणे आवश्यक आहे"
 
-#: ../src/wireless-dialog.c:1161
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "नवीन वायरलेस नेटवर्क बनवा"
 
-#: ../src/wireless-dialog.c:1163
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "नवीन वायरलेस नेटवर्क"
 
-#: ../src/wireless-dialog.c:1164
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "पसंतीचे वायरलेस नेटवर्क करीता नाव प्रविष्ट करा."
 
-#: ../src/wireless-dialog.c:1166
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "लपवलेले वायरलेस नेटवर्कशी जुळवा"
 
-#: ../src/wireless-dialog.c:1168
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "लपविलेले वायरलेस नेटवर्क"
 
-#: ../src/wireless-dialog.c:1169
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "पसंतीचे लपविलेले वायरलेस नेटवर्कशी जोडणी स्थापीत करण्याकरीता नाव व सुरक्षा तपशील प्रविष्ट "
 "करा."
 
-#: ../src/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
-msgstr "सर्टिफिकेट अथॉरिटि प्रमाणपत्र निवडले नाही"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "वायरलेस सुरक्षा (_W):"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+msgid "C_onnection:"
+msgstr "जोडणी (_n):"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "वायरलेस अडॅप्टर (_a):"
+
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:280
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr "वापर:"
+
+#: ../src/main.c:44
 msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
 msgstr ""
-"सर्टिफिकेट अथॉरिटि (CA) प्रमाणपत्र याचा वापर न केल्यास जोडणी असुरक्षीत, सदोषीत "
-"वायरलेस नेटवर्क करीता कारणीभूत ठरू शकते.  तुम्हाला सर्टिफिकेट अथॉरिटि प्रमाणपत्र "
-"नीवडायचे?"
+"हे कार्यक्रम NetworkManager चे घटक आहे (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
-msgstr "CA प्रमाणपत्र नीवडा"
+#: ../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
+msgid "EVDO"
+msgstr "EVDO"
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr "GPRS"
 
-#: ../src/wireless-security/eap-method.c:627
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr "EDGE"
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr "UMTS"
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr "HSDPA"
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr "HSUPA"
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr "सुरू केले नाही"
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr "नोंदणीकृत नाही"
+
+#: ../src/mb-menu-item.c:141
+#, c-format
+msgid "Home network (%s)"
+msgstr "होम नेटवर्क (%s)"
+
+#: ../src/mb-menu-item.c:143
+#, c-format
+msgid "Home network"
+msgstr "होम नेटवर्क"
+
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr "शोधत आहे"
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr "नोंदणी नकारली"
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr "%s (रोमींग)"
+
+#: ../src/mb-menu-item.c:170
+#, c-format
+msgid "Roaming network (%s)"
+msgstr "रोमींग नेटवर्क (%s)"
+
+#: ../src/mb-menu-item.c:172
+#, c-format
+msgid "Roaming network"
+msgstr "रोमींग नेटवर्क"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "PIN कोड आवश्यक आहे"
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "मोबाइल ब्रॉडबँड साधन करीता PIN कोड आवश्यक आहे"
+
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "मोबाइल ब्रॉडबँड जोडणी '%s' सक्रीय आहे: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "रोमींग"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "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/wireless-security/eap-method.c:452
+#, 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:630
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER किंवा PEM प्रमाणपत्र (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:264
-#: ../src/wireless-security/wireless-security.c:368
-msgid "MD5"
-msgstr "MD5"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:349
-#: ../src/wireless-security/eap-method-tls.c:419
-#: ../src/wireless-security/eap-method-ttls.c:349
-msgid "Choose a Certificate Authority certificate..."
-msgstr "सर्टिफिकेट अथॉरिटि प्रमाणपत्र नीवडा..."
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr "PAC फाइल पसंत करा..."
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr "PAC फाइल्स (*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr "सर्व फाइल्स"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "निनावी ओळख (_m):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "ओळख पटवा"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
 msgstr "निनावी ओळख (_m):"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "C_A certificate:"
-msgstr "CA प्रमाणपत्र (_A):"
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file:"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
-msgid "I_nner authentication:"
+#: ../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
+#, fuzzy
+msgid "_Inner authentication:"
 msgstr "आंतरीक ओळख पटवा (_n):"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+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 "सर्टिफिकेट अथॉरिटि प्रमाणपत्र नीवडा..."
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
 msgstr "आवृत्ती 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:4
 msgid "Version 1"
 msgstr "आवृत्ती 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "_PEAP version:"
+#: ../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 "CA प्रमाणपत्र (_A):"
+
+#: ../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
+msgid "No CA certificate is _required"
+msgstr "CA प्रमाणपत्र आवश्यक नाही (_r)"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#, fuzzy
+msgid "PEAP _version:"
 msgstr "PEAP आवृत्ती (_P):"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-msgid "As_k for this password every time"
-msgstr "प्रत्येकवेळी या पासवर्डकरीता विचारा (_k)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "CA प्रमाणपत्र (_A):"
 
-#: ../src/wireless-security/eap-method-tls.c:250
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "एनक्रिप्टेड प्राइव्हेट किज् असुरक्षीत आहेत"
 
-#: ../src/wireless-security/eap-method-tls.c:253
+#: ../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 "
@@ -2666,92 +3762,398 @@ msgstr ""
 "\n"
 "(तुम्ही openssl सह प्राइव्हेट किला पासवर्ड-सुरक्षीत करू शकता)"
 
-#: ../src/wireless-security/eap-method-tls.c:413
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "तुमचे खाजगी प्रमापत्र नीवडा..."
 
-#: ../src/wireless-security/eap-method-tls.c:425
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "तुमची प्राइव्हेट कि नीवडा..."
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "ओळख (_d):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "प्राइव्हेट कि (_k):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "प्राइव्हेट कि पासवर्ड (_P):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_User certificate:"
-msgstr "वापरकर्त्याचे प्रमाणपत्र (_U):"
+#: ../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/wireless-security.c:380
+#: ../src/wireless-security/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:404
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr "FAST"
+
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "टनल्ड् TLS"
 
-#: ../src/wireless-security/wireless-security.c:415
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "प्रोटेक्टेड EAP (PEAP)"
 
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:2
 #: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
-msgid "_Authentication:"
+#, fuzzy
+msgid "Au_thentication:"
 msgstr "ओळख पटवा (_A):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-#| msgid ""
-#| "1 (Default)\n"
-#| "2\n"
-#| "3\n"
-#| "4"
-msgid "1 (Default)"
-msgstr "1 (पूर्वनिर्धारीत)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
-#| msgid ""
-#| "Open System\n"
-#| "Shared Key"
 msgid "Open System"
 msgstr "ओपन प्रणाली"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-#| msgid ""
-#| "Open System\n"
-#| "Shared Key"
 msgid "Shared Key"
 msgstr "शेअर्ड् कि"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "कि (_K):"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
 msgid "Sho_w key"
 msgstr "कि दाखवा (_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "WEP इंडेक्स् (_x):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
-msgid "_Key:"
-msgstr "कि (_K):"
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "प्रकार (_T):"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "नवीन मोबाइल ब्रॉडबँड (CDMA) जोडणी..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "तुम्ही आता CDMA जाळाशी जुळले आहात."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "नवीन मोबाइल ब्रॉडबँड (GSM) जोडणी..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "तुम्ही आता GSM नेटवर्कशी जुळले आहात."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "वायरलेस नेटवर्क्स् (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "वायरलेस नेटवर्क (%s)"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "वायरलेस बंद केले"
+
+#~| msgid "wireless is disabled"
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "वायरलेस हार्डवेअर स्विचद्वारे बंद केले आहे"
+
+#~ msgid "Click on this icon to connect to a wireless network"
+#~ msgstr "वायरलेस नेटवर्कशी जोडणी स्थापीत करण्याकरीता या चिन्हावर क्लिक करा"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "वायरलेस नेटवर्क जोडणी '%s' बनवत आहे..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "वायरलेस नेटवर्क जोडणी '%s' संयोजीत करत आहे..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "'%s' करीता वायरलेस नेटवर्क पत्ता विनंतीकृत करत आहे..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "वायरलेस नेटवर्क जोडणी '%s' सक्रीय आहे"
+
+#~| msgid "Mobile Broadband (%s)"
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX मोबाईल ब्रॉडबँड (%s)"
+
+#~| msgid "Mobile Broadband"
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX मोबाइल ब्रॉडबँड"
+
+#~| msgid "You are now connected to the CDMA network."
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "तुम्ही आता WiMAX नेटवर्कशी जुळले आहात."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~| msgid "Unknown"
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "अपरिचीत"
+
+#~| msgid "CDMA (%s)"
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~| msgid "PI_N:"
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~| msgid "_BSSID:"
+#~ 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)"
+
+#~ msgid "_Help"
+#~ msgstr "मदत (_H)"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "इतर वायरलेस नेटवर्क..."
+
+#~ msgid "label"
+#~ msgstr "लेबल"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "Any"
+#~ msgstr "कुठलेही"
+
+#~ msgid "PI_N:"
+#~ msgstr "PIN (_N):"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE) शिफारसीय"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA) शिफारसीय"
+
+#~ msgid "MT_U:"
+#~ msgstr "MTU (_U):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "साधनाचे MAC पत्ता (_M):"
+
+#~| msgid ""
+#~| "Infrastructure\n"
+#~| "Ad-hoc"
+#~ msgid "Infrastructure"
+#~ msgstr "मांडणी"
+
+#~ msgid "_SSID:"
+#~ msgstr "SSID (_S):"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "स्वयं (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "फक्त स्वयं (PPP) पत्ते"
+
+#~| msgid "Could not load WiFi security user interface."
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "वायर्ड सेक्युरिटि सुरक्षा वापरकर्ता संवाद लोड करणे अशक्य."
+
+#~ msgid "Wireless"
+#~ msgstr "वायरलेस"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "वायरलेस जोडणी %d"
+
+#~ msgid "_Save..."
+#~ msgstr "साठवा (_S)..."
+
+#~ 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 "जोडणी साठवतेवेळी त्रुटी"
+
+#~| msgid "Error editing connection: property '%s' / '%s' invalid: %d"
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "गुणधर्म '%s' / '%s' अवैध आहे: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "अपरिचीत त्रुटी आढळली."
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "आयात केलेली जोडणी आयात करणे अशक्य"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr "VPN प्लगइन अनुपलब्ध. कृपया बटन सुरू करण्यासठी एक प्रतिष्ठापीत करा."
+
+#~| msgid "Edit..."
+#~ msgid "_Edit..."
+#~ msgstr "संपादित करा (_E)..."
+
+#~| msgid "Delete..."
+#~ msgid "_Delete..."
+#~ msgstr "नष्ट करा (_D)..."
+
+#~| msgid "Could not edit connection"
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "नवीन '%s' जोडणी कसे संपादित करायचे, ते माहिती नाही"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "तुमचे फोन आत्ता वापरणीस सज्ज आहे!"
+
+#~ msgid "%s Network"
+#~ msgstr "%s नेटवर्क"
+
+#~ 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 "मोबाईल सहाय्यक रद्द केले"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "अपरिचीत फोन साधण प्रकार (GSM किंवा CDMA नाही)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "फोनशी जोडणी करण्यास अपयशी."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "अनपेक्षीतरित्या फोनशी जोडणी खंडीत केले."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "फोनचे तपशील ओळखतेवेळी वेळ समाप्ती आढळली."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "फोन संरचना ओळखत आहे..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "डायल-अप-नेटवर्किंग जोडणी सेट करण्यापूर्वी पूर्वनिर्धारीत Bluetooth अडॅप्टर सुरू करणे "
+#~ "आवश्यक आहे."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr "Bluetooth संरचना शक्य नाही (D-Bus सह जोडणी अशक्य: %s)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "Bluetooth संरचना शक्य नाही (D-Bus प्रॉक्सीचे निर्माण अशक्य)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr "Bluetooth संरचना शक्य नाही (NetworkManager शोधतेवेळी त्रुटी: %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "मोबाईल फोनला नेटवर्क साधण (PAN/NAP) म्हणून वापर करा"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "मोबाईल फोन (DUN) चा वापर करून इंटरनेटकरीता प्रवेश प्राप्त करा"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "United Kingdom"
+#~ msgstr "युनाइटेड किंगडम"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "सर्टिफिकेट अथॉरिटि प्रमाणपत्र निवडले नाही"
 
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "सर्टिफिकेट अथॉरिटि (CA) प्रमाणपत्र याचा वापर न केल्यास जोडणी असुरक्षीत, सदोषीत "
+#~ "वायरलेस नेटवर्क करीता कारणीभूत ठरू शकते.  तुम्हाला सर्टिफिकेट अथॉरिटि प्रमाणपत्र "
+#~ "नीवडायचे?"
diff --git a/po/ms.po b/po/ms.po
index f1a2d0e7..63067a53 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2011-11-12 10:53+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,665 +19,924 @@ msgstr ""
 "X-Poedit-Language: Malay\n"
 "X-Poedit-Country: MALAYSIA\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+msgid "Network"
+msgstr "Rangkaian"
+
+#: ../nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr "Urus sambungan-sambungan rangkaian anda"
 
-#: ../nm-applet.desktop.in.h:2
-msgid "Network"
-msgstr "Rangkaian"
+#: ../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.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr "Lumpuhkan Cipta WiFi"
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "Urus dan pinda tetapan sambungan rangkaian anda"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "Lumpuhkan pemberitahuan apabila telah tersambung"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, 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
 msgid "Disable disconnected notifications"
 msgstr "Lumpuhkan pemberitahuan apabila telah terputus"
 
-#: ../nm-applet.schemas.in.h:4
-msgid "Set this to TRUE to disable notifications when connecting to a network."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
-"Set ini ke TRUE untuk mematikan pemberitahuan apabila menyambung kepada "
-"rangkaian"
+"Set ini ke TRUE untuk mematikan pemberitahuan apabila memutuskan dari "
+"rangkaian."
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Lumpuhkan pemberitahuan apabila telah tersambung"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
 msgstr ""
 "Set ini ke TRUE untuk mematikan pemberitahuan apabila memutuskan dari "
 "rangkaian."
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "Redam notifikasi rangkaian tersedia"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Set ini ke TRUE untuk mematikan pemberitahuan apabila rangkaian wayarles "
 "boleh didapati."
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr "Cop"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+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 WiFi Create"
+msgstr "Lumpuhkan Cipta WiFi"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Set ke TRUE untuk mematikan penciptaan rangkaian Adhoc apabila menggunakan "
 "applet."
 
-#: ../nm-applet.schemas.in.h:8
-msgid "Stamp"
-msgstr "Cop"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
-msgstr "Redam notifikasi rangkaian tersedia"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:10
-msgid "Used to determine whether settings should be migrated to a new version."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Pilih sijil CA"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
 msgstr ""
-"Diguna untuk menentukan sama ada tetapan sedia ada patut dipindahkan ke "
-"versi baharu."
 
-#: ../nm-connection-editor.desktop.in.h:1
-msgid "Manage and change your network connection settings"
-msgstr "Urus dan pinda tetapan sambungan rangkaian anda"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "Network Connections"
-msgstr "Sambungan-sambungan Rangkaian"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Pengurus Rangkaian"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:875 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "Tersedia"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Pengurus Rangkaian"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "S_ambung"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "_Nama Rangkain:"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "Gagal mencipta sambungan PAN: %s"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "Tidak diketahui"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "Gagal menambah sambungan"
+
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "terputus"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "Terputus"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "Gagal menambah sambungan"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "Jangan paparkan mesej ini lagi"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "Anda sekarang sambung ke '%s'."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"Sambungan VPN '%s' gagal kerana terganggu."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1280 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "Sambungan Ditubuhkan"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"Sambungan VPN '%s' gagal kerana servis VPN tiba-tiba terhenti. "
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "Anda telah tersambung ke rangkaian jalurlebar mudahalih."
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"Sambungan VPN '%s' gagal kerana servis VPN mempunyai konfigurasi tidak sah."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "Menyediakan sambungan jalurlebar mudahalih '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"Sambungan VPN '%s' gagal kerana telah tamat masa menyambung."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "Mengkonfigurasi sambungan jalurlebar mudahalih '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"Sambungan VPN '%s' gagal kerana servis VPN tidak dimulakan tepat pada masa."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
 msgstr ""
-"Pengesahan pengguna diperlukan untuk sambungan jalurlebar mudahalih '%s'..."
+"\n"
+"Sambungan VPN '%s' gagal keranan servis VPN gagal dimulakan."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2479
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "Meminta alamat rangkaian untuk '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"Sambungan VPN '%s' gagal kerana tiada rahsia-rahsia VPN yang sah."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "Sambungan jalurlebar mudahalih '%s' aktif"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"Sambungan VPN '%s' gagal kerana rahsia-rahsia VPN tidak sah."
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"Sambungan VPN '%s' gagal."
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
-#: ../src/applet-dialogs.c:430
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Jalurlebar Mudahalih (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"Sambungan VPN '%s' terputus disebabkan oleh sambungan rangkaian telah "
+"diganggu."
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1474
-msgid "Mobile Broadband"
-msgstr "Jalurlebar Mudahalih"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"Sambungan VPN '%s' terputus disebabkan oleh servis VPN berhenti."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Sambungan Jalurlebar Mudahalih (CDMA) baharu..."
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"Sambungan VPN '%s' terputus."
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "Anda telah tersambung ke rangkaian CDMA."
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "Mesej Logmasuk VPN"
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "Sambungan VPN Gagal"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:990
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Sambungan jalurlebar mudahalih '%s' aktif: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Sambungan VPN '%s' gagal kerana servis VPN gagal dimulakan.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "merantau"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Sambungan VPN '%s' gagal dimulakan.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-msgid "CDMA network."
-msgstr "Rangkaian CDMA."
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "peranti tidak sedia (perisian tegar tiada)"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
-msgid "You are now registered on the home network."
-msgstr "Anda telah didaftarkan pada rangkaian rumah."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "peranti belum bersedia"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
-msgid "You are now registered on a roaming network."
-msgstr "Anda telah didaftarkan pada rangkaian perantauan."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "terputus"
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "Putuskan"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:459
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Sambungan Jalurlebar Mudahalih (GSM) baharu..."
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "peranti tidak diuruskan"
 
-#: ../src/applet-device-gsm.c:493
-msgid "You are now connected to the GSM network."
-msgstr "Anda telah tersambung ke rangkaian (GSM)."
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "Tiada peranti rangkaian tersedia"
 
-#: ../src/applet-device-gsm.c:654
-msgid "PIN code required"
-msgstr "Kod PIN diperlukan"
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "Sambungan _VPN"
 
-#: ../src/applet-device-gsm.c:662
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "Kod PIN diperlukan untuk peranti jalurlebar mudahalih"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "_Konfigur VPN..."
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "_Putuskan VPN"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager tidak berjalan..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "Rangkaian dilumpuhkan"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "Benarkan Ra_ngkaian"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "Benarkan _Wayarles"
 
-#: ../src/applet-device-gsm.c:783
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "Benarkan Jalurlebar _Mudahalih"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "Benarkan _Pemberitahuan"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "Maklumat Sambungan"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "Edit Sambungan..."
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_Mengenai"
+
+#: ../src/applet.c:2179
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "Kod PIN untuk kad SIM '%s' on '%s'"
+msgid "You are now connected to '%s'."
+msgstr "Anda sekarang sambung ke '%s'."
 
-#: ../src/applet-device-gsm.c:875
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Kod PIN salah; sila hubungi pembekal peranti."
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "Terputus"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "Sambungan rangkaian telah diputuskan."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Menyediakan sambungan rangkaian '%s'..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "Pengesahan pengguna diperlukan untuk sambungan rangkaian '%s'..."
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Meminta alamat rangkaian untuk '%s'..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "Sambungan rangkaian '%s' aktif"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Memulakan sambungan VPN '%s'..."
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "Pengesahan pengguna diperlukan untuk sambungan VPN '%s'..."
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Meminta satu alamat VPN untuk '%s'..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "Sambungan VPN '%s' aktif"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "Tiada sambungan rangkaian"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "Aplet NetworkManager"
+
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Kod PUK salah; sila hubungi pembekal peranti."
 
+#: ../src/applet-device-broadband.c:201
+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-gsm.c:925
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Menghantar kod membuka kunci..."
 
-#: ../src/applet-device-gsm.c:988
-msgid "SIM PIN unlock required"
-msgstr "PIN nyahkunci SIM diperlukan"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Jalurlebar Mudahalih (%s)"
 
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN Unlock Required"
-msgstr "PIN Nyahkunci SIM Diperlukan"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "Jalurlebar Mudahalih"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"Peranti jalurlebar mudahalih '%s' memerlukan kod PIN SIM sebelum boleh "
-"digunakan."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Tersedia"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
-msgid "PIN code:"
-msgstr "Kod PIN:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "Sambungan Baharu Jalurlebar Mudahalih"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
-msgid "Show PIN code"
-msgstr "Tunjuk kod PIN"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Sambungan Ditubuhkan"
 
-#: ../src/applet-device-gsm.c:1000
-msgid "SIM PUK unlock required"
-msgstr "PUK nyahkunci SIM diperlukan"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "Anda telah tersambung ke rangkaian jalurlebar mudahalih."
 
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK Unlock Required"
-msgstr "PUK Nyahkunci SIM Diperlukan"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "Kata laluan rangkaian jalurlebar mudahalih "
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"Peranti jalurlebar mudahalih '%s' memerlukan kod PUK SIM sebelum boleh "
-"digunakan."
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "Anda telah didaftarkan pada rangkaian rumah."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
-msgid "PUK code:"
-msgstr "Kod PUK:"
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "Anda telah didaftarkan pada rangkaian perantauan."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "New PIN code:"
-msgstr "PIN kod baru:"
+#: ../src/applet-device-bt.c:88
+msgid "You are now connected to the mobile broadband network."
+msgstr "Anda telah tersambung ke rangkaian jalurlebar mudahalih."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
-msgid "Re-enter new PIN code:"
-msgstr "Masukkan semula kod PIN baharu:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "Menyediakan sambungan jalurlebar mudahalih '%s'..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
-msgid "Show PIN/PUK codes"
-msgstr "Tunjukkan kod-kod PIN/PUK"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "Mengkonfigurasi sambungan jalurlebar mudahalih '%s'..."
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
-msgid "GSM network."
-msgstr "Rangkaian GSM."
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, 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:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "Sambungan jalurlebar mudahalih '%s' aktif"
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet Automatik"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "Rangkaian-rangkaian Berwayar (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "Rangkaian Berwayar (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "Rangkaian-rangkaian Berwayar"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "Rangkaian Berwayar"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1485
-msgid "disconnected"
-msgstr "terputus"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../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-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "Menyediakan sambungan rangkaian '%s'..."
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "Mengkonfigur sambungan rangkaian '%s'..."
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../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-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../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-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "Sambungan rangkaian '%s' aktif"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Pengesahan DSL"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Sambung ke Rangkaian Wayarles Tersembunyi... "
 
-#: ../src/applet-device-wifi.c:150
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "Cipta Rangkaian Wayarles _Baharu..."
 
-#: ../src/applet-device-wifi.c:294
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(tiada)"
 
-#: ../src/applet-device-wifi.c:803
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "Rangkaian-rangkaian Wayarles (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Rangkaian-rangkaian Berwayar (%s)"
 
-#: ../src/applet-device-wifi.c:805
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "Rangkaian Wayarles (%s) "
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Rangkaian Berwayar (%s)"
 
-#: ../src/applet-device-wifi.c:807
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Rangkaian Wayarles"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Rangkaian Berwayar"
 
-#: ../src/applet-device-wifi.c:840
-msgid "wireless is disabled"
-msgstr "wayarles dilumpuhkan"
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "WiMAX dilumpuhkan"
 
-#: ../src/applet-device-wifi.c:841
-msgid "wireless is disabled by hardware switch"
-msgstr "wayarles dilumpuhkan oleh suis perkakasan"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WiMAX dilumpuhkan oleh suis perkakasan"
 
-#: ../src/applet-device-wifi.c:902
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Lagi rangkaian-rangkain"
 
-#: ../src/applet-device-wifi.c:1081
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "Rangkaian Wayarles Tersedia"
 
-#: ../src/applet-device-wifi.c:1083
-msgid "Click on this icon to connect to a wireless network"
-msgstr "Klik pada ikon ini untuk sambung ke rangkaian wayarles"
-
-#: ../src/applet-device-wifi.c:1084
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, 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:1087 ../src/applet.c:901
-msgid "Don't show this message again"
-msgstr "Jangan paparkan mesej ini lagi"
-
-#: ../src/applet-device-wifi.c:1279
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, 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:1310
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Menyediakan sambungan rangkaian wayarles '%s'..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Menyediakan sambungan rangkaian '%s'..."
 
-#: ../src/applet-device-wifi.c:1313
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "Mengkonfigur sambungan rangkaian wayarles '%s'..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Mengkonfigur sambungan rangkaian '%s'..."
 
-#: ../src/applet-device-wifi.c:1316
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, 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:1319
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Meminta alamat rangkaian wayarles untuk '%s'..."
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "Meminta alamat rangkaian untuk '%s'..."
 
-#: ../src/applet-device-wifi.c:1340
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, 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:1345
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "Sambungan rangkaian wayarles '%s' aktif"
-
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Jalurlebar Mudahalih WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr "Jalurlebar Mudahalih WiMAX"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "WiMAX dilumpuhkan"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Sambungan rangkaian '%s' aktif"
 
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX dilumpuhkan oleh suis perkakasan"
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "Gagal mencipta sambungan PAN: %s"
 
-#: ../src/applet-device-wimax.c:428
-msgid "You are now connected to the WiMAX network."
-msgstr "Anda telah tersambungan ke rangkaian WiMAX."
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "Tidak dapat menyunting rangkaian baharu"
 
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Ralat memaparkan maklumat sambungan:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/libnm-gtk/nm-wireless-dialog.c:949
-#: ../src/wireless-security/wireless-security.c:396
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP Dinamik"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
-#: ../src/applet-dialogs.c:248
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:244
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Alamat-alamat"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/libnm-gtk/nm-wireless-dialog.c:906
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Tiada"
 
-#: ../src/applet-dialogs.c:352 ../src/applet-dialogs.c:490
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "1 (Piawai)"
+
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:354 ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: ../src/applet-dialogs.c:367
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Tidak diketahui"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Alamat IP:"
 
 #: ../src/applet-dialogs.c:369
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "tidak diketahui"
+msgid "Broadcast Address:"
+msgstr "Alamat Siar:"
 
+#. Prefix
 #: ../src/applet-dialogs.c:381
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "tidak diketahui"
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Tidak diketahui"
 
-#: ../src/applet-dialogs.c:416
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Tapisan Subrangkaian:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:426
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:428
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:432
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:438 ../src/applet-dialogs.c:797
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Am"
 
-#: ../src/applet-dialogs.c:442
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Antaramuka:"
 
-#: ../src/applet-dialogs.c:458
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Alamat Perkakasan:"
 
 #. Driver
-#: ../src/applet-dialogs.c:466
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Pemacu:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Kelajuan:"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Keselamatan:"
 
-#: ../src/applet-dialogs.c:518
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:531
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:559 ../src/applet-dialogs.c:666
-msgid "IP Address:"
-msgstr "Alamat IP:"
-
-#: ../src/applet-dialogs.c:561 ../src/applet-dialogs.c:577
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Tidak diketahui"
-
-#: ../src/applet-dialogs.c:575
-msgid "Broadcast Address:"
-msgstr "Alamat Siar:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:584
-msgid "Subnet Mask:"
-msgstr "Tapisan Subrangkaian:"
-
-#: ../src/applet-dialogs.c:586
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Tidak diketahui"
-
-#: ../src/applet-dialogs.c:594 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Pelayan Route:"
 
-#: ../src/applet-dialogs.c:606
-msgid "Primary DNS:"
-msgstr "DNS Utama:"
-
-#: ../src/applet-dialogs.c:615
-msgid "Secondary DNS:"
-msgstr "DNS Kedua:"
-
-#: ../src/applet-dialogs.c:625
-msgid "Ternary DNS:"
-msgstr "DNS Ketiga:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:649
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Diabaikan"
 
-#: ../src/applet-dialogs.c:802
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Jenis VPN:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Get laluan VPN:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Namapengguna VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Banner VPN:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Sambungan Asas:"
 
-#: ../src/applet-dialogs.c:829
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:892
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Tiada sambungan aktif yang sah ditemui!"
 
-#: ../src/applet-dialogs.c:945
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -686,475 +945,837 @@ msgstr ""
 "dan ramai lagi penyumbang-pemyumbang dari komuniti dan penterjemah-"
 "penterjemah"
 
-#: ../src/applet-dialogs.c:948
+#: ../src/applet-dialogs.c:988
 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:950
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Laman sesawang NetworkManager"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Sumber-sumber hilang"
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Kata laluan rangkaian jalurlebar mudahalih "
 
-#: ../src/applet-dialogs.c:999
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Kata laluan diperlukan untuk sambung ke '%s'."
 
-#: ../src/applet-dialogs.c:1018
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Katalaluan:"
 
-#: ../src/applet.c:990
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "PIN nyahkunci SIM diperlukan"
+
+#: ../src/applet-dialogs.c:1337
+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:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"Sambungan VPN '%s' gagal kerana terganggu."
+"Peranti jalurlebar mudahalih '%s' memerlukan kod PIN SIM sebelum boleh "
+"digunakan."
 
-#: ../src/applet.c:993
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "Kod PIN:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "Tunjuk kod PIN"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "PUK nyahkunci SIM diperlukan"
+
+#: ../src/applet-dialogs.c:1348
+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:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"Sambungan VPN '%s' gagal kerana servis VPN tiba-tiba terhenti. "
+"Peranti jalurlebar mudahalih '%s' memerlukan kod PUK SIM sebelum boleh "
+"digunakan."
 
-#: ../src/applet.c:996
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "Kod PUK:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "PIN kod baru:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "Masukkan semula kod PIN baharu:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
 msgstr ""
-"\n"
-"Sambungan VPN '%s' gagal kerana servis VPN mempunyai konfigurasi tidak sah."
 
-#: ../src/applet.c:999
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"Sambungan VPN '%s' gagal kerana telah tamat masa menyambung."
+"Alamat-alamat IP mengenalpasti komputer anda pada rangkaian. Klik butang "
+"\"Tambah\" untuk menambah alamat IP."
 
-#: ../src/applet.c:1002
-#, c-format
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Padam"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+#, 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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"Sambungan VPN '%s' gagal kerana servis VPN tidak dimulakan tepat pada masa."
+"Jika dipasang, sambungan ini tidak akan digunakan sebagai sambungan "
+"rangkaian lalai."
 
-#: ../src/applet.c:1005
-#, c-format
+#: ../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…"
+msgstr "Cipta..."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "Pilih Satu Jenis Sambungan VPN"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"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."
 msgstr ""
-"\n"
-"Sambungan VPN '%s' gagal keranan servis VPN gagal dimulakan."
+"Pilih jenis VPN yang anda ingin gunakan untuk sambungan baru. Jika jenis "
+"sambungan VPN anda mahu mencipta tidak muncul dalam senarai, anda mungkin "
+"tidak mempunyai plugin VPN yang betul dipasang."
 
-#: ../src/applet.c:1008
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "Alamat Siar:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Sambungan Asas:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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
+msgid "_Edit"
+msgstr "_Sunting"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "Antaramuka:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"Sambungan VPN '%s' gagal kerana tiada rahsia-rahsia VPN yang sah."
 
-#: ../src/applet.c:1011
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "DNS Utama:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+"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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "bytes"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "_Keselamatan:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Sambungan Asas:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Benarkan Ra_ngkaian"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
 msgstr ""
-"\n"
-"Sambungan VPN '%s' gagal kerana rahsia-rahsia VPN tidak sah."
 
-#: ../src/applet.c:1018
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "automatik"
+
+#: ../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
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+msgid "default"
+msgstr "piawai"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"\n"
-"Sambungan VPN '%s' gagal."
 
-#: ../src/applet.c:1036
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Alamat"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Alamat"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+msgid "invalid %s for %s (%s)"
 msgstr ""
-"\n"
-"Sambungan VPN '%s' terputus disebabkan oleh sambungan rangkaian telah "
-"diganggu."
 
-#: ../src/applet.c:1039
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+msgid "invalid %s (%s)"
 msgstr ""
-"\n"
-"Sambungan VPN '%s' terputus disebabkan oleh servis VPN berhenti."
 
-#: ../src/applet.c:1045
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+msgid "invalid interface-name for %s (%s)"
 msgstr ""
-"\n"
-"Sambungan VPN '%s' terputus."
 
-#: ../src/applet.c:1079
-msgid "VPN Login Message"
-msgstr "Mesej Logmasuk VPN"
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
 
-#: ../src/applet.c:1085 ../src/applet.c:1093 ../src/applet.c:1143
-msgid "VPN Connection Failed"
-msgstr "Sambungan VPN Gagal"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Mana-mana peranti"
 
-#: ../src/applet.c:1150
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
-"\n"
-"Sambungan VPN '%s' gagal kerana servis VPN gagal dimulakan.\n"
-"\n"
-"%s"
+"Gagal mengemaskini rahsia-rahsia sambungan disebabkan ralat yang tidak "
+"diketahui."
 
-#: ../src/applet.c:1153
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, 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
+msgid "FCoE"
 msgstr ""
-"\n"
-"Sambungan VPN '%s' gagal dimulakan.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1473
-msgid "device not ready (firmware missing)"
-msgstr "peranti tidak sedia (perisian tegar tiada)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/applet.c:1475
-msgid "device not ready"
-msgstr "peranti belum bersedia"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1501
-msgid "Disconnect"
-msgstr "Putuskan"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1515
-msgid "device not managed"
-msgstr "peranti tidak diuruskan"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.c:1559
-msgid "No network devices available"
-msgstr "Tiada peranti rangkaian tersedia"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.c:1647
-msgid "_VPN Connections"
-msgstr "Sambungan _VPN"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.c:1704
-msgid "_Configure VPN..."
-msgstr "_Konfigur VPN..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.c:1708
-msgid "_Disconnect VPN"
-msgstr "_Putuskan VPN"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.c:1806
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager tidak berjalan..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.c:1811 ../src/applet.c:2604
-msgid "Networking disabled"
-msgstr "Rangkaian dilumpuhkan"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2032
-msgid "Enable _Networking"
-msgstr "Benarkan Ra_ngkaian"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2041
-msgid "Enable _Wireless"
-msgstr "Benarkan _Wayarles"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2050
-msgid "Enable _Mobile Broadband"
-msgstr "Benarkan Jalurlebar _Mudahalih"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2059
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Benarkan Jalurlebar Mudahalih WiMA_X"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#. Toggle notifications item
-#: ../src/applet.c:2070
-msgid "Enable N_otifications"
-msgstr "Benarkan _Pemberitahuan"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2081
-msgid "Connection _Information"
-msgstr "Maklumat Sambungan"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2091
-msgid "Edit Connections..."
-msgstr "Edit Sambungan..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2105
-msgid "_Help"
-msgstr "_Bantuan"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2114
-msgid "_About"
-msgstr "_Mengenai"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.c:2291
-msgid "Disconnected"
-msgstr "Terputus"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2292
-msgid "The network connection has been disconnected."
-msgstr "Sambungan rangkaian telah diputuskan."
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2473
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "Menyediakan sambungan rangkaian '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2476
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "Pengesahan pengguna diperlukan untuk sambungan rangkaian '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:2482
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "Sambungan rangkaian '%s' aktif"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:2560
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "Memulakan sambungan VPN '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.c:2563
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "Pengesahan pengguna diperlukan untuk sambungan VPN '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
 
-#: ../src/applet.c:2566
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Meminta satu alamat VPN untuk '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
 
-#: ../src/applet.c:2569
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "Sambungan VPN '%s' aktif"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
 
-#: ../src/applet.c:2608
-msgid "No network connection"
-msgstr "Tiada sambungan rangkaian"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.c:3258
-msgid "NetworkManager Applet"
-msgstr "Aplet NetworkManager"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "Automatik kunci peranti ini"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "Buka k_unci"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Active Network Connections"
-msgstr "Sambungan-sangbungan Rangkaian Aktif"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Connection Information"
-msgstr "Maklumat Sambungan"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "Pengesahan 802.1X berwayar"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:4
-msgid "_Network name:"
-msgstr "_Nama Rangkain:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "automatik"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:310
-msgid "Failed to update connection secrets due to an unknown error."
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
 msgstr ""
-"Gagal mengemaskini rahsia-rahsia sambungan disebabkan ralat yang tidak "
-"diketahui."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 msgstr ""
-"Alamat-alamat IP mengenalpasti komputer anda pada rangkaian. Klik butang "
-"\"Tambah\" untuk menambah alamat IP."
 
-#: ../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:46
 msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+"Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
-"Jika dipasang, sambungan ini tidak akan digunakan sebagai sambungan "
-"rangkaian lalai."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "Ig_nore automatically obtained routes"
-msgstr "Abaikan route-route yang didapatkan secara automatik"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "Use this c_onnection only for resources on its network"
-msgstr "Guna s_ambungan ini hanya untuk sumber pada rangkaian terbabit"
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:2
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "Sho_w password"
-msgstr "_Tunjuk katalaluan"
+msgid "_Username:"
+msgstr "_Namapengguna:"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Password:"
-msgstr "_Katalaluan:"
-
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "_Servis:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../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:4
+#: ../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
-msgid "_Username:"
-msgstr "_Namapengguna:"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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
-msgid "Addresses"
-msgstr "Alamat-alamat"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
+#: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-msgid "Automatic with manual DNS settings"
-msgstr "Automatik dengan tetapan DNS manual"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Pasangan Terpiuh"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-msgid "D_HCP client ID:"
-msgstr "ID klien D_HCP:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "_Liang:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_Kelajuan:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "Duplek_s penuh"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "Runding aut_o"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "_Servis:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#, fuzzy
+msgid "C_loned MAC address:"
+msgstr "Alamat MAC _Diklon:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid ""
-"Domains used when resolving host names. Use commas to separate multiple "
-"domains."
+"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 ""
-"Domain-domain digunakan untuk menyelesaikan nama-nama hos. Guna koma untuk "
-"memisahkan domain-domain yang pelbagai."
+"Alamat MAC yang dibuat di sini akan digunakan sebagai alamat perkakasan "
+"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-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Piawai"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Abai"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Alamat Siar:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Katalaluan Kunci Persendirian:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
-"IP addresses of domain name servers used to resolve host names. Use commas "
-"to separate multiple domain name server addresses."
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 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:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "Link-Local"
-msgstr "Pautan-Lokal"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:191
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "S_ambung"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr "Automatik dengan tetapan DNS manual"
+
+#: ../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:10
-msgid "Require IPv4 addressing for this connection to complete"
-msgstr "Memerlukan alamat IPv4 untuk sambungan ini disempurnakan"
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
+msgstr "Pautan-Lokal"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/page-ip4.c:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../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
 msgid "Shared to other computers"
 msgstr "Dikongsi dengan komputer lain"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "_Method:"
+msgstr "_Kaedah:"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Addresses"
+msgstr "Alamat-alamat"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1164,39 +1785,93 @@ msgstr ""
 "konfigurasi komputer anda. Jika anda mahu menggunakan pengecam klient DHCP, "
 "masukkan di sini."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
-"When connecting to IPv6-capable networks, allows the connection to complete "
-"if IPv4 configuration fails but IPv6 configuration succeeds."
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
 msgstr ""
-"Apabila menyambung kepada rangkaian IPv6-mampu, membolehkan sambungan untuk "
-"melengkapkan jika IPv4 konfigurasi gagal tetapi konfigurasi IPv6 berjaya."
+"Domain-domain digunakan untuk menyelesaikan nama-nama hos. Guna koma untuk "
+"memisahkan domain-domain yang pelbagai."
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr "ID klien D_HCP:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-msgid "DNS ser_vers:"
-msgstr "_Pelayan-pelayan DNS:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
+#, fuzzy
+msgid "S_earch domains:"
+msgstr "_Cari domain:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "_Method:"
-msgstr "_Kaedah:"
+#: ../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:"
+msgstr "_Pelayan-pelayan DNS:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses."
+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:17
+#, 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:18
+msgid ""
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
+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:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Routes…"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "_Search domains:"
-msgstr "_Cari domain:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Dilumpuhkan"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 ""
+"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:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#, 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:11
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1205,274 +1880,262 @@ msgstr ""
 "melengkapkan jika konfigurasi IPv6 gagal tetapi IPv4 konfigurasi berjaya."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE"
+msgid "Basic"
+msgstr "Asas"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
+msgid "Nu_mber:"
+msgstr "No_mbor:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Lanjutan"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-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:5
-msgid "Any"
-msgstr "Mana-mana"
-
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Basic"
-msgstr "Asas"
+msgid "_APN:"
+msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "Tukar..."
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "N_etwork ID:"
 msgstr "ID Ra_ngkaian:"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr "Tukar..."
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "Nu_mber:"
-msgstr "No_mbor:"
+msgid "P_IN:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "PI_N:"
-msgstr "PI_N:"
+#, 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
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Utamakan  2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Utamakan 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "Sho_w passwords"
 msgstr "_Tunjuk katalaluan"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
-msgstr "_APN:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "_Type:"
-msgstr "_Jenis:"
-
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
-msgstr "Benarkan pemampatan data _BSD"
+msgid "Authentication"
+msgstr "Pengesahan"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
-msgstr "Benarkan _Mengempis pemampatan data"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Allowed methods:"
 msgstr "Kaedah-kaedah dibenarkan:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "Authentication"
-msgstr "Pengesahan"
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
+msgstr "Kaedah _Konfigur..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Compression"
 msgstr "Pemampatan"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr "_Guna enkripsi point-to-point (MPPE)"
+
 #: ../src/connection-editor/ce-page-ppp.ui.h:6
-msgid "Configure _Methods…"
-msgstr "Kaedah _Konfigur..."
+msgid "_Require 128-bit encryption"
+msgstr "Memerlukan enkripsi 128-bit"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:7
-msgid "Echo"
-msgstr "Gema"
+msgid "Use _stateful MPPE"
+msgstr "Guna MPPE stateful"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:8
-msgid "Send PPP _echo packets"
-msgstr "Hantar peket-peket g_ema PPP"
+msgid "Allow _BSD data compression"
+msgstr "Benarkan pemampatan data _BSD"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Use TCP _header compression"
-msgstr "Guna _pemampatan pengepala TCP"
+msgid "Allow _Deflate data compression"
+msgstr "Benarkan _Mengempis pemampatan data"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Use _stateful MPPE"
-msgstr "Guna MPPE stateful"
+msgid "Use TCP _header compression"
+msgstr "Guna _pemampatan pengepala TCP"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "_Require 128-bit encryption"
-msgstr "Memerlukan enkripsi 128-bit"
+msgid "Echo"
+msgstr "Gema"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
-msgid "_Use point-to-point encryption (MPPE)"
-msgstr "_Guna enkripsi point-to-point (MPPE)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+msgid "Send PPP _echo packets"
+msgstr "Hantar peket-peket g_ema PPP"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Sambungan Asas:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
-msgstr "Runding aut_o"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "Antaramuka:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
-msgstr "BNC"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "Full duple_x"
-msgstr "Duplek_s penuh"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "Alamat MAC _Diklon:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-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"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
 msgstr ""
-"Alamat MAC yang dibuat di sini akan digunakan sebagai alamat perkakasan "
-"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-wired.ui.h:13
-msgid "Twisted Pair (TP)"
-msgstr "Pasangan Terpiuh"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid "_Cloned MAC address:"
-msgstr "Alamat MAC _Diklon:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-msgid "_Device MAC address:"
-msgstr "Alamat MAC _Peranti: "
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-msgid "_Port:"
-msgstr "_Liang:"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Speed:"
-msgstr "_Kelajuan:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "bytes"
-msgstr "bytes"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "Keselamatan:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
-msgid "Ad-hoc"
-msgstr "Ad hoc"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
-msgid "Ban_d:"
-msgstr "J_alur:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "C_hannel:"
-msgstr "Salura_n:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "Infrastructure"
-msgstr "Infrastruktur"
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "M_ode:"
-msgstr "M_od:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr "mW"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr "Kuasa Trans_misi:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-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/ce-page-wireless.ui.h:13
-msgid "Transmission po_wer:"
-msgstr "Kuasa Trans_misi:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr "_Kadar:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
-msgid "_Rate:"
-msgstr "_Kadar:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr "Salura_n:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_SSID:"
-msgstr "_SSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr "J_alur:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "mW"
-msgstr "mW"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
-msgstr "_Keselamatan:"
+#: ../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:1
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
 msgid "Allowed Authentication Methods"
 msgstr "Kaedah-kaedah Pengesahan Yang Dibenarkan"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr "_EAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr "Protokol Pengesahan Boleh Perluas"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr "_PAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr "Protokol Pengesahan Katalaluan"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protokol Pengesahan Handshake Challange"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
-msgid "Extensible Authentication Protocol"
-msgstr "Protokol Pengesahan Boleh Perluas"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Protokol Pengesahan Handshake Microsoft Challange"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+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
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1481,204 +2144,650 @@ msgstr ""
 "pengesahan. Jika sambungan gagal, cuba melumpuhkan sokongan untuk beberapa "
 "kaedah."
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+#: ../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 Automatik"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Protokol Pengesahan Handshake Microsoft Challange"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Protokol Pengesahan Handshake Microsoft Challange versi 2"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-msgid "Password Authentication Protocol"
-msgstr "Protokol Pengesahan Katalaluan"
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "DSL"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "_EAP"
-msgstr "_EAP"
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
+msgid "InfiniBand"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
+#: ../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
+msgid "Bond"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid "_PAP"
-msgstr "_PAP"
+#: ../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
+msgid "Team"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:1 ../src/libnm-gtk/wifi.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/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
+msgid "Bridge"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "Pilih Satu Jenis Sambungan VPN"
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Create…"
-msgstr "Cipta..."
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "Alamat Perkakasan:"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "Eksport sambungan VPN..."
+
+#: ../src/connection-editor/connection-helpers.c:323
 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."
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
 msgstr ""
-"Pilih jenis VPN yang anda ingin gunakan untuk sambungan baru. Jika jenis "
-"sambungan VPN anda mahu mencipta tidak muncul dalam senarai, anda mungkin "
-"tidak mempunyai plugin VPN yang betul dipasang."
+"Dialog penyunting sambungan tidak dapat dimulakan kerana ralat yang tidak "
+"diketahui."
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "Tidak dapat mencipta sambungan baharu"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "Gagal memadam sambungan"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:901
-#: ../src/connection-editor/page-ip6.c:867
+#: ../src/connection-editor/connection-helpers.c:517
+#, 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:804
+#: ../src/connection-editor/ip6-routes-dialog.c:746
+#: ../src/connection-editor/page-ip4.c:1068
+#: ../src/connection-editor/page-ip6.c:1066
 msgid "Address"
 msgstr "Alamat"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:918
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Topeng Internet"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:935
-#: ../src/connection-editor/page-ip6.c:901
+#: ../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
 msgid "Gateway"
 msgstr "Get laluan"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrik"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:884
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Awalan"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "Menyunting %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "Menyunting sambungan yang tidak dinamakan"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Nama _sambungan:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Ralat memulakan penyunting"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Gagal menambah sambungan"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr ""
+"Editor sambungan tidak dapat mencari beberapa sumber yang diperlukan (fail. "
+"Ui adalah tidak dijumpai)."
+
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "_Save"
+msgstr "_Simpan"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+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:421
+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:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "Tidak dapat mencipta sambungan baharu"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "Tidak dapat menyunting rangkaian"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+msgid "Unknown error creating connection editor dialog."
+msgstr "Ralat mencipta dialog penyunting sambungan."
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "Ralat memulakan penyunting"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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-list.c:1482
-msgid "DSL"
-msgstr "DSL"
+msgid "Connection _name:"
+msgstr "Nama _sambungan:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "E_ksport"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "jangan sesekali"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "sekarang"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d tahun yang lalu"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "Nama"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "Kali Terakhir Digunakan"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "Sunting sambungan dipilih"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "Sahkan untuk menyunting sambungan dipilih"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "Padam sambungan yang dipilih"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "Sahkan untuk memadam sambungan dipilih"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, 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:933
+msgid "Error creating connection"
+msgstr "Ralat mencipta sambungan"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr "Ralat semasa menyunting sambungan"
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/nm-connection-list.c:956
+#, 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
+msgid "802.1x Security"
+msgstr "Keselamatan 802.1x"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna keselamatan WiFi."
+
+#: ../src/connection-editor/page-8021x-security.c:125
+#, 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
+msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:125
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "tidak dapat mencari peranti Bluetooth."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Sambungan berwayar %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Benarkan Ra_ngkaian"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Rangkaian Wayarles"
+
+#: ../src/connection-editor/page-bond.c:447
+#, fuzzy
+msgid "Could not load bond user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "DNS Utama:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "Sambungan berwayar %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+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
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna DSL."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna DSL."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Sambungan DSL %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+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:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, 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
+#, fuzzy
+msgid "cloned MAC"
+msgstr "Alamat MAC _Diklon:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "Piawai"
+
+#: ../src/connection-editor/page-general.c:52
+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 tidak berjalan..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+#, fuzzy
+msgid "Could not load InfiniBand user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna WiFi."
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "Sambungan berwayar %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatik (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Alamat-alamat automatik (VPN) sahaja "
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Automatik (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Alamat-alamat (PPP) automatik sahaja"
+msgid "Automatic, addresses only"
+msgstr "Automatik, alamat sahaja"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatik (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Alamat-alamat (PPoE) automatik sahaja"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatik (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Alamat automatik (DHCP) sahaja"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Pautan-Lokal Sahaja"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Dilumpuhkan"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "_Pelayan-pelayan DNS:"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "_Cari domain:"
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Menyunting route IPv4 untuk %s"
 
-#: ../src/connection-editor/page-ip4.c:982
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Tetapan IPv4"
 
-#: ../src/connection-editor/page-ip4.c:984
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna IPv4."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "Automatik, alamat sahaja"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:285
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Abai"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatik, DHCP sahaja"
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Menyunting route IPv6 untuk %s"
 
-#: ../src/connection-editor/page-ip6.c:946
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Tetapan IPv6"
 
-#: ../src/connection-editor/page-ip6.c:948
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna IPv6."
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Tidak dapat memuatkan "
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:327
 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:639
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Pilih Jenis Pembekal Jalurlebar Mudahalih"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1686,424 +2795,270 @@ msgstr ""
 "Pilih teknologi pembekal jalur lebar mudah alih anda menggunakan. Jika anda "
 "tidak pasti, tanya pembekal anda."
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Pembekal saya menggunakan teknologi berasaskan _GSM-(iaitu GPRS, EDGE, UMTS, "
 "HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:568
 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-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "tiada"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Tetapan PPP"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna PPP."
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1478
-msgid "VPN"
-msgstr "VPN"
+#: ../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 "Pilih fail untuk diimport"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+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:151
+msgid "Team Port"
+msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+msgid "Could not load team port user interface."
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Tiada sambungan rangkaian"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "Tidak dapat memuatkan antaramuka pengguna IPv4."
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "Sambungan VPN %d"
+
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna IPv4."
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Tidak dapat jumpa pemalam servis VPN untuk '%s'."
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:884
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Sambungan VPN %d"
 
-#: ../src/connection-editor/page-wired.c:88
-#: ../src/connection-editor/page-wireless.c:93
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 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-wired.c:267
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1466
-msgid "Wired"
-msgstr "Berwayar"
-
-#: ../src/connection-editor/page-wired.c:269
-msgid "Could not load wired user interface."
-msgstr "Tidak dapat memuatkan antaramuka pengguna sambungan berwayar."
-
-#: ../src/connection-editor/page-wired.c:444
-#, c-format
-msgid "Wired connection %d"
-msgstr "Sambungan berwayar %d"
+"Plugin VPN gagal untuk mengimport sambungan VPN betul \n"
+"\n"
+"Ralat: tiada jenis perkhidmatan VPN."
 
-#: ../src/connection-editor/page-wired-security.c:116
-msgid "802.1x Security"
-msgstr "Keselamatan 802.1x"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "Pilih Satu Jenis Sambungan VPN"
 
-#: ../src/connection-editor/page-wired-security.c:118
-msgid "Could not load Wired Security security user interface."
-msgstr "Tidak dapat memuatkan sekuriti antaramuka Sekuriti Rangkaian Berwayar."
+#: ../src/connection-editor/page-vpn.c:255
+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 ""
+"Pilih jenis VPN yang anda ingin gunakan untuk sambungan baru. Jika jenis "
+"sambungan VPN anda mahu mencipta tidak muncul dalam senarai, anda mungkin "
+"tidak mempunyai plugin VPN yang betul dipasang."
 
-#: ../src/connection-editor/page-wired-security.c:136
-msgid "Use 802.1X security for this connection"
-msgstr "Guna sekuriti 802.1X untuk sambungan ini"
+#: ../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 ""
+"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-wireless.c:166
-#: ../src/connection-editor/page-wireless.c:170
-#: ../src/connection-editor/page-wireless.c:191
-#, c-format
-msgid "default"
-msgstr "piawai"
+#: ../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)\""
+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-wireless.c:195
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:452
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1470
-msgid "Wireless"
-msgstr "Wayarles"
-
-#: ../src/connection-editor/page-wireless.c:454
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna WiFi."
 
-#: ../src/connection-editor/page-wireless.c:658
-#, c-format
-msgid "Wireless connection %d"
-msgstr "Sambungan wayarles %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Mana-mana peranti"
 
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/libnm-gtk/nm-wireless-dialog.c:923
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Sambungan berwayar %d"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:272
-#: ../src/libnm-gtk/nm-wireless-dialog.c:932
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Frasalaluan WEP 128-bit"
 
-#: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/libnm-gtk/nm-wireless-dialog.c:962
+#: ../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)"
 msgstr "WEP (802.1x) Dinamik"
 
-#: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/libnm-gtk/nm-wireless-dialog.c:976
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Peribadi"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:990
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Perusahaan"
 
-#: ../src/connection-editor/page-wireless-security.c:360
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Tidak dapat memuatkan antaramuka keselamatan pengguna WiFi; tetapan WiFi "
 "hilang."
 
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "Sekuriti Wayarles"
 
-#: ../src/connection-editor/page-wireless-security.c:372
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
 msgstr "Tidak dapat memuatkan antaramuka pengguna keselamatan WiFi."
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Editing %s"
-msgstr "Menyunting %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:105
-msgid "Editing un-named connection"
-msgstr "Menyunting sambungan yang tidak dinamakan"
-
-#: ../src/connection-editor/nm-connection-editor.c:288
-msgid ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
+msgid "missing SSID"
 msgstr ""
-"Editor sambungan tidak dapat mencari beberapa sumber yang diperlukan (fail. "
-"Ui adalah tidak dijumpai)."
-
-#: ../src/connection-editor/nm-connection-editor.c:391
-msgid "Error creating connection editor dialog."
-msgstr "Ralat mencipta dialog penyunting sambungan."
-
-#: ../src/connection-editor/nm-connection-editor.c:403
-msgid "_Save"
-msgstr "_Simpan"
-
-#: ../src/connection-editor/nm-connection-editor.c:404
-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:405
-msgid "_Save..."
-msgstr "_Simpan..."
-
-#: ../src/connection-editor/nm-connection-editor.c:406
-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.ui.h:1
-msgid "A_vailable to all users"
-msgstr "Tersedia untuk semua pengguna"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "Sambung secara _automatik"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
-msgstr "Nama _sambungan:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "E_xport"
-msgstr "E_ksport"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "_Import"
-msgstr "_Import"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "jangan sesekali"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "sekarang"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minit yang lalu"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d jam yang lalu"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d hari yang lalu"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d bulan yang lalu"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d tahun yang lalu"
-
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "Gagal menambah sambungan"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "Ralat menyimpan sambungan"
 
-#: ../src/connection-editor/nm-connection-list.c:516
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Nilai '%s' / '%s' tidak sah: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
-msgid "An unknown error occurred."
-msgstr "Ralat tidak dikenalpasti telah berlaku."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "Error initializing editor"
-msgstr "Ralat memulakan penyunting"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:703
-#: ../src/connection-editor/nm-connection-list.c:870
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
+msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
-"Dialog penyunting sambungan tidak dapat dimulakan kerana ralat yang tidak "
-"diketahui."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "Tidak dapat mencipta sambungan baharu"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "Tidak dapat menyunting rangkaian baharu"
-
-#: ../src/connection-editor/nm-connection-list.c:717
-msgid "Could not edit connection"
-msgstr "Tidak dapat menyunting rangkaian"
 
-#: ../src/connection-editor/nm-connection-list.c:747
-msgid "Connection delete failed"
-msgstr "Gagal memadam sambungan"
-
-#: ../src/connection-editor/nm-connection-list.c:779
-#, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "Anda pasti hendak membuang sambungan %s?"
-
-#: ../src/connection-editor/nm-connection-list.c:914
-#: ../src/connection-editor/vpn-helpers.c:227
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Tidak dapat mengimport sambungan VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:916
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"Plugin VPN gagal untuk mengimport sambungan VPN betul \n"
-"\n"
-"Ralat: tiada jenis perkhidmatan VPN."
-
-#: ../src/connection-editor/nm-connection-list.c:929
-msgid "Could not edit imported connection"
-msgstr "Tidak dapat menyunting sambungan yang diimport"
-
-#: ../src/connection-editor/nm-connection-list.c:1099
-msgid "Name"
-msgstr "Nama"
-
-#: ../src/connection-editor/nm-connection-list.c:1111
-msgid "Last Used"
-msgstr "Kali Terakhir Digunakan"
-
-#: ../src/connection-editor/nm-connection-list.c:1227
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr ""
-"Tiada pemalam VPN tersedia. Sila pasang satu untuk membenarkan butang ini."
-
-#: ../src/connection-editor/nm-connection-list.c:1238
-msgid "_Edit"
-msgstr "_Sunting"
-
-#: ../src/connection-editor/nm-connection-list.c:1239
-msgid "Edit the selected connection"
-msgstr "Sunting sambungan dipilih"
-
-#: ../src/connection-editor/nm-connection-list.c:1240
-msgid "_Edit..."
-msgstr "_Sunting"
-
-#: ../src/connection-editor/nm-connection-list.c:1241
-msgid "Authenticate to edit the selected connection"
-msgstr "Sahkan untuk menyunting sambungan dipilih"
-
-#: ../src/connection-editor/nm-connection-list.c:1256
-msgid "_Delete"
-msgstr "_Padam"
-
-#: ../src/connection-editor/nm-connection-list.c:1257
-msgid "Delete the selected connection"
-msgstr "Padam sambungan yang dipilih"
-
-#: ../src/connection-editor/nm-connection-list.c:1258
-msgid "_Delete..."
-msgstr "_Padam..."
-
-#: ../src/connection-editor/nm-connection-list.c:1259
-msgid "Authenticate to delete the selected connection"
-msgstr "Sahkan untuk memadam sambungan dipilih"
-
-#: ../src/connection-editor/nm-connection-list.c:1538
-msgid "Error creating connection"
-msgstr "Ralat mencipta sambungan"
-
-#: ../src/connection-editor/nm-connection-list.c:1539
-#, 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:1594
-#: ../src/connection-editor/nm-connection-list.c:1606
-msgid "Error editing connection"
-msgstr "Ralat semasa menyunting sambungan"
-
-#: ../src/connection-editor/nm-connection-list.c:1595
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "Tidak tahu bagaimana menyunting sambungan-sambungan '%s'"
-
-#: ../src/connection-editor/nm-connection-list.c:1607
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "Tidak menjumpai sambungan dengan UUID '%s'"
-
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2116,31 +3071,32 @@ msgstr ""
 "\n"
 "Ralat: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:262
-msgid "Select file to import"
-msgstr "Pilih fail untuk diimport"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "tidak diketahui"
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Fail dengan nama \"%s\" sudah wujud."
 
-#: ../src/connection-editor/vpn-helpers.c:315
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Ganti"
 
-#: ../src/connection-editor/vpn-helpers.c:317
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:353
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Tidak dapat mengeksport sambungan VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:355
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2151,98 +3107,36 @@ msgstr ""
 "\n"
 "Ralat: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:390
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Eksport sambungan VPN..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Gagal mencipta sambungan PAN: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "Telefon anda sedia untuk digunakan!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:249
-#, c-format
-msgid "%s Network"
-msgstr "%s Rangkaian"
-
-#: ../src/gnome-bluetooth/bt-widget.c:375
-#, c-format
-msgid "Error: %s"
-msgstr "Ralat: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:488
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Gagal mencipta sambungan DUN: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:511
-msgid "Mobile wizard was canceled"
-msgstr "Bestari Mudahalih dibatalkan"
-
-#: ../src/gnome-bluetooth/bt-widget.c:520
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Jenis peranti telefon tidak diketahui (bukan GSM atau CDMA)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
-msgid "failed to connect to the phone."
-msgstr "gagal menyambung ke telefon."
-
-#: ../src/gnome-bluetooth/bt-widget.c:753
-msgid "unexpectedly disconnected from the phone."
-msgstr "terputus dari telefon tanpa diduga."
-
-#: ../src/gnome-bluetooth/bt-widget.c:762
-msgid "timed out detecting phone details."
-msgstr "tamat masa mengesan perincian telefon."
-
-#: ../src/gnome-bluetooth/bt-widget.c:774
-msgid "Detecting phone configuration..."
-msgstr "Mengesan konfigurasi telefon..."
-
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "tidak dapat mencari peranti Bluetooth."
-
-#: ../src/gnome-bluetooth/bt-widget.c:980
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Adapter lalai Bluetooth mestilah digiatkan sebelum membuat tetapan sambungan "
-"rangkaian Dial-Up."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1012
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"Kongfigurasi Bluetooth tidak boleh (gagal untuk sambung kepada D-Bus: %s)."
+"Aplet NetworkManager tidak dapat mencari beberapa sumber-sumber yang "
+"diperlukan (fail .ui tidak dijumpai)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr ""
-"Konfigurasi Bluetooth tidak mungkin (gagal untuk mencipta proksi D-Bus)."
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "Buka k_unci"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1031
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "Kongfigurasi Bluetooth tidak boleh (ralat mencari NetworkManager: %s)."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "Automatik kunci peranti ini"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1098
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Guna telefon mudahalih anda sebagai peranti rangkaian (PAN/NAP)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Maklumat Sambungan"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1107
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Akses Internet menggunakan telefon mudah alih anda (DUN)"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "Sambungan-sangbungan Rangkaian Aktif"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
+#: ../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 ""
@@ -2250,21 +3144,25 @@ msgstr ""
 "berikut:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Peranti Anda:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Pengendali Anda:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Plan Anda:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
+#: ../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 "
@@ -2278,23 +3176,28 @@ msgstr ""
 "mengubah suai tetapan sambungan jalur lebar mudah alih anda, pilih "
 "\"Sambungan Rangkaian \" daripada Sistem>> Pilihan menu."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:264
+#: ../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/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Tidak tersenarai"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Pilih plan anda:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../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/libnm-gtk/nm-mobile-wizard.c:528
+#: ../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"
@@ -2306,69 +3209,85 @@ msgstr ""
 "\n"
 "Jika anda tidak pasti sila tanya pembekal plan APN anda."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../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/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Plan saya tidak disenaraikan..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Pilih pembekal anda dari _senarai:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Pengendali"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../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 ""
 "Saya tidak menjumpai nama pembekal saya dan memilih untuk memasukkannya "
 "secara _manual:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:789
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Pengendali:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../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 "Pembekal saya menggunakan teknoloji GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:819
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../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/libnm-gtk/nm-mobile-wizard.c:830
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Pilih pengendali anda"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1080
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1092
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Negara atau kawasan"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1099
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1145
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Plih Negara Pembekal anda atau Kawasan"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1199
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Terpasang peranti GSM"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1202
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Terpasang peranti CDMA"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1374
+#: ../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."
@@ -2376,117 +3295,218 @@ msgstr ""
 "Pembantu ini membantu anda untuk menetapkan sambungan broadban mudah alih ke "
 "rangkaian selular (3G)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1379
+#: ../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:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1394
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Nama pembekal jalurlebar anda"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1400
+#: ../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"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1406
+#: ../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 ""
 "(dalam sesetengah kes) Pelan bil APN (Access Point Name) jalurlebar anda"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Mana-mana peranti"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../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"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1625
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Sambungan Baharu Jalurlebar Mudahalih"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Katalaluan:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Katalaluan:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_Tunjuk katalaluan"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Baru..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1077
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Tiada"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_ipta"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1161
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Kata laluan atau kunci penyulitan diperlukan untuk mengakses rangkaian tanpa "
 "wayar '% s'."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1163
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "Pengesahan Rangkaian Wayarles Diperlukan"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1165
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "Pengesahan diperlukan oleh rangkaian wayarles"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1170
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "Cipta Sambungan Wayarles Baharu"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "Rangkaian wayarles baharu"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1173
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, 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/libnm-gtk/nm-wireless-dialog.c:1175
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Sambung ke Rangkaian Wayarles Tersembunyi"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "Rangkaian wayarles tersembunyi"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "Masukkan nama dan perincian keselamatan rangkaian tanpa wayar yang "
 "tersembunyi yang anda ingin sambungkan ke."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "Sekuriti _wayarles"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "S_ambungan:"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
 msgstr "Penyesuai w_ayarles:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _security:"
-msgstr "Sekuriti _wayarles"
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
 
-#: ../src/main.c:73
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Pengunaan:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"Program ini adalah komponen NetworkManager (https://wiki.gnome.org/"
-"Projects/NetworkManager/)."
+"Program ini adalah komponen NetworkManager (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -2494,174 +3514,286 @@ msgstr ""
 "Ia tidak bertujuan untuk interaksi baris arahan, tetapi sebaliknya berjalan "
 "dalam persekitaran desktop GNOME."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "tidak dihidupkan"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "tidak didaftarkan"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Rangkaian rumah (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Rangkaian rumah"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "mencari"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "pendaftaran dinafikan"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../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:153 ../src/mb-menu-item.c:159
+#: ../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:162
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Rangkaian perantaun (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Rangkaian perantaun"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "Piawai"
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "Kod PIN untuk kad SIM '%s' on '%s'"
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"Aplet NetworkManager tidak dapat mencari beberapa sumber-sumber yang "
-"diperlukan (fail .ui tidak dijumpai)."
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "Kod PIN diperlukan"
 
-#: ../src/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
-msgstr "Tiada sijil Penguasa Sijil dipilih"
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "Kod PIN diperlukan untuk peranti jalurlebar mudahalih"
 
-#: ../src/wireless-security/eap-method.c:280
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Sambungan jalurlebar mudahalih '%s' aktif: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "merantau"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Sambungan Asas:"
+
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"Tidak menggunakan sijil Sijil Authority (CA) boleh menyebabkan sambungan ke "
-"rangkaian tidak selamat, Rangkaian penyangak tanpa wayar. Adakah anda ingin "
-"untuk memilih perakuan Lembaga Sijil?"
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
-msgstr "Pilih sijil CA"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:648
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:651
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Sijil-sijil DER atau PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:372
-msgid "MD5"
-msgstr "MD5"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
-msgid "Choose a Certificate Authority certificate..."
-msgstr "Pilih sijil Penguasa Sijil..."
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "_Identiti tidak diketahui:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "Pengesahan"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
 msgstr "_Identiti tidak diketahui:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#: ../src/wireless-security/eap-method-ttls.ui.h:3
-msgid "C_A certificate:"
-msgstr "Sijil C_A"
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+msgid "PAC _file:"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
-msgid "I_nner authentication:"
+#: ../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
+#, fuzzy
+msgid "_Inner authentication:"
 msgstr "Pengesahan Dalaman:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+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 "Pilih sijil Penguasa Sijil..."
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
 msgid "Version 0"
 msgstr "Versi 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:4
 msgid "Version 1"
 msgstr "Versi 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "_PEAP version:"
+#: ../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 "Sijil C_A"
+
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "Sijil C_A"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#, fuzzy
+msgid "PEAP _version:"
 msgstr "_PEAP versi:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-msgid "As_k for this password every time"
-msgstr "_Tanya kata laluan ini setiap kali"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Sijil C_A"
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Kekunci peribadi tidak disulitkan adalah tidak selamat"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../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 "
@@ -2675,63 +3807,111 @@ msgstr ""
 "\n"
 "(Anda boleh kata laluan melindungi kunci persendirian anda dengan openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Pilih sijil peribadi anda..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Pilih kunci persendirian anda..."
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "I_dentiti:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "_Sijil pengesahan pengguna:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "_Kekunci peribadi"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "_Katalaluan Kunci Persendirian:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_User certificate:"
-msgstr "_Sijil pengesahan pengguna:"
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:384
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:408
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Terowong TLS"
 
-#: ../src/wireless-security/wireless-security.c:419
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Terlindung (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
-msgid "_Authentication:"
+#, fuzzy
+msgid "Au_thentication:"
 msgstr "_Pengesahan:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Piawai)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
 msgid "Open System"
@@ -2742,32 +3922,278 @@ msgid "Shared Key"
 msgstr "Kunci Dikongsi"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "_Kekunci"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
 msgid "Sho_w key"
 msgstr "T_unjuk Kunci"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "Inde_x WEP:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
-msgid "_Key:"
-msgstr "_Kekunci"
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Jenis:"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Sambungan Jalurlebar Mudahalih (CDMA) baharu..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Anda telah tersambung ke rangkaian CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "Rangkaian CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Sambungan Jalurlebar Mudahalih (GSM) baharu..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Anda telah tersambung ke rangkaian (GSM)."
+
+#~ msgid "GSM network."
+#~ msgstr "Rangkaian GSM."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Rangkaian-rangkaian Wayarles (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Rangkaian Wayarles (%s) "
+
+#~ msgid "wireless is disabled"
+#~ msgstr "wayarles dilumpuhkan"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "wayarles dilumpuhkan oleh suis perkakasan"
+
+#~ msgid "Click on this icon to connect to a wireless network"
+#~ msgstr "Klik pada ikon ini untuk sambung ke rangkaian wayarles"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Menyediakan sambungan rangkaian wayarles '%s'..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "Mengkonfigur sambungan rangkaian wayarles '%s'..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Meminta alamat rangkaian wayarles untuk '%s'..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "Sambungan rangkaian wayarles '%s' aktif"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Jalurlebar Mudahalih WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Jalurlebar Mudahalih WiMAX"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Anda telah tersambungan ke rangkaian WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "tidak diketahui"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ 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"
+
+#~ msgid "_Help"
+#~ msgstr "_Bantuan"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "Any"
+#~ msgstr "Mana-mana"
+
+#~ msgid "PI_N:"
+#~ msgstr "PI_N:"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Utamakan  2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Utamakan 3G (UMTS/HSPA)"
+
+#~ msgid "MT_U:"
+#~ msgstr "MT_U:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Alamat MAC _Peranti: "
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastruktur"
+
+#~ msgid "_SSID:"
+#~ msgstr "_SSID:"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Automatik (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Alamat-alamat (PPP) automatik sahaja"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr ""
+#~ "Tidak dapat memuatkan sekuriti antaramuka Sekuriti Rangkaian Berwayar."
+
+#~ msgid "Wireless"
+#~ msgstr "Wayarles"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "Sambungan wayarles %d"
+
+#~ msgid "_Save..."
+#~ msgstr "_Simpan..."
+
+#~ 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"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Nilai '%s' / '%s' tidak sah: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "Ralat tidak dikenalpasti telah berlaku."
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "Tidak dapat menyunting sambungan yang diimport"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr ""
+#~ "Tiada pemalam VPN tersedia. Sila pasang satu untuk membenarkan butang ini."
+
+#~ msgid "_Edit..."
+#~ msgstr "_Sunting"
+
+#~ msgid "_Delete..."
+#~ msgstr "_Padam..."
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "Tidak tahu bagaimana menyunting sambungan-sambungan '%s'"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Telefon anda sedia untuk digunakan!"
+
+#~ msgid "%s Network"
+#~ msgstr "%s Rangkaian"
+
+#~ 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"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Jenis peranti telefon tidak diketahui (bukan GSM atau CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "gagal menyambung ke telefon."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "terputus dari telefon tanpa diduga."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "tamat masa mengesan perincian telefon."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Mengesan konfigurasi telefon..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Adapter lalai Bluetooth mestilah digiatkan sebelum membuat tetapan "
+#~ "sambungan rangkaian Dial-Up."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr ""
+#~ "Kongfigurasi Bluetooth tidak boleh (gagal untuk sambung kepada D-Bus: %s)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr ""
+#~ "Konfigurasi Bluetooth tidak mungkin (gagal untuk mencipta proksi D-Bus)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr ""
+#~ "Kongfigurasi Bluetooth tidak boleh (ralat mencari NetworkManager: %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Guna telefon mudahalih anda sebagai peranti rangkaian (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Akses Internet menggunakan telefon mudah alih anda (DUN)"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Tiada sijil Penguasa Sijil dipilih"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Tidak menggunakan sijil Sijil Authority (CA) boleh menyebabkan sambungan "
+#~ "ke rangkaian tidak selamat, Rangkaian penyangak tanpa wayar. Adakah anda "
+#~ "ingin untuk memilih perakuan Lembaga Sijil?"
 
 #~ msgid "United Kingdom"
 #~ msgstr "United Kingdom"
 
-#~ msgid "Network Manager"
-#~ msgstr "Pengurus Rangkaian"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "Telah ada nm-applet sedang berjalan.\n"
 
 #~ msgid "Could not acquire the %s service. (%d)\n"
 #~ msgstr "Tidak dapat mencari servis %s. (%d)\n"
 
-#~ msgid "C_onnect"
-#~ msgstr "S_ambung"
-
 #, fuzzy
 #~ msgid "Other Wireless Network..."
 #~ msgstr "Monitor kualiti pautan rangkaian tanpa wayar"
diff --git a/po/nb.po b/po/nb.po
index b94db7c8..48f34a01 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 1.1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-11 19:35+0100\n"
+"POT-Creation-Date: 2016-04-05 14:02+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,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Nettverk"
 
@@ -126,46 +126,90 @@ msgstr ""
 "Sett denne til «true» for å slå av advarsler om CA-sertifikater i fase 2 av "
 "EAP-autentisering."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "NetworkManager panelprogram"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "NetworkManager panelprogram"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-autentisering"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "K_oble til"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Nettverksnavn:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Kunne ikke å legge til/slå på tilkobling"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1323 ../src/applet-device-wifi.c:1342
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1326
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Feil med tilkobling"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Frakobling av enhet feilet"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Feil ved frakobling"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Aktivering av tilkobling feilet"
 
-#: ../src/applet.c:953 ../src/applet-device-wifi.c:1045
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Ikke vis denne meldingen igjen"
 
-#: ../src/applet.c:1042
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -175,7 +219,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi nettverksforbindelsen ble avbrutt."
 
-#: ../src/applet.c:1045
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -184,7 +228,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten stoppet uventet."
 
-#: ../src/applet.c:1048
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -195,7 +239,7 @@ msgstr ""
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten returnerte ugyldig "
 "konfigurasjon."
 
-#: ../src/applet.c:1051
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -204,7 +248,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet pga tidsavbrudd for tilkoblingsforsøket."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -213,7 +257,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten ikke startet i tide."
 
-#: ../src/applet.c:1057
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -222,7 +266,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi VPN-tjenesten ikke klarte å starte opp."
 
-#: ../src/applet.c:1060
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -231,7 +275,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet fordi det ikke finnes gyldige VPN-passord."
 
-#: ../src/applet.c:1063
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -240,7 +284,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet pga ugyldig hemmelighet for VPN."
 
-#: ../src/applet.c:1070
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +293,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» feilet."
 
-#: ../src/applet.c:1088
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -259,7 +303,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» ble koblet fra fordi nettverkstilkoblingen ble avbrutt."
 
-#: ../src/applet.c:1091
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -268,7 +312,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» koblet fra fordi VPN-tjenesten stoppet."
 
-#: ../src/applet.c:1097
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -277,7 +321,7 @@ msgstr ""
 "\n"
 "VPN-tilkobling «%s» koblet fra."
 
-#: ../src/applet.c:1127
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -288,19 +332,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1129
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Etablering av VPN-tilkobling er fullført.\n"
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Påloggingsmelding for VPN"
 
-#: ../src/applet.c:1137 ../src/applet.c:1145 ../src/applet.c:1195
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN-tilkobling feilet"
 
-#: ../src/applet.c:1202
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -313,7 +357,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1205
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -326,841 +370,587 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "enheten er ikke klar (fastvare mangler)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "enheten er ikke klar"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "frakoblet"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "enheten er ikke håndtert"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Ingen nettverksenheter tilgjengelig"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN-tilkoblinger"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Sett opp VPN …"
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "Ko_ble fra VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager kjører ikke …"
 
-#: ../src/applet.c:1970 ../src/applet.c:2946
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Nettverk slått av"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Slå på _nettverk"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Slå på _trådløst"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Slå på _mobilt bredbånd"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Slå på WiMA_X mobilt bredbånd"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Slå på _varsling"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Tilkoblings_informasjon"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Rediger tilkoblinger …"
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "_Hjelp"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2520
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Du er nå koblet til «%s»."
 
-#: ../src/applet.c:2561
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Frakoblet"
 
-#: ../src/applet.c:2562
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Nettverksforbindelsen har blitt frakoblet."
 
-#: ../src/applet.c:2801
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Forbereder nettverkstilkobling «%s» …"
 
-#: ../src/applet.c:2804
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Brukerautentisering kreves for nettverkstilkobling «%s» …"
 
-#: ../src/applet.c:2807 ../src/applet-device-bt.c:137
-#: ../src/applet-device-wimax.c:446 ../src/mobile-helpers.c:592
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Ber om en nettverksadresse for «%s» …"
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Nettverkstilkobling «%s» er aktiv"
 
-#: ../src/applet.c:2900
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Starter VPN-tilkobling «%s» …"
 
-#: ../src/applet.c:2903
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Brukerautentisering kreves for VPN-tilkobling «%s» …"
 
-#: ../src/applet.c:2906
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Ber om en nettverksadresse på VPN for «%s» …"
 
-#: ../src/applet.c:2909
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-tilkobling «%s» er aktiv"
 
-#: ../src/applet.c:2951
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Ingen nettverksforbindelse"
 
-#: ../src/applet.c:3557
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager panelprogram"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:774 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:836 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Tilgjengelige"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:801 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1242 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Tilkoblingen er satt opp"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Du er nå tilkoblet bundet nettverk."
-
-#: ../src/applet-device-bond.c:115
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Forbereder bundet tilkobling «%s» …"
-
-#: ../src/applet-device-bond.c:118
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Konfigurerer bundet tilkobling «%s» …"
-
-#: ../src/applet-device-bond.c:121
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Brukerautentisering kreves for bundet tilkobling «%s» …"
-
-#: ../src/applet-device-bond.c:124 ../src/applet-device-bridge.c:124
-#: ../src/applet-device-infiniband.c:177 ../src/applet-device-team.c:120
-#: ../src/applet-device-vlan.c:238
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Ber om en nettverksadresse for «%s» …"
-
-#: ../src/applet-device-bond.c:128
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Bundet tilkobling «%s» er aktiv"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Du er nå tilkoblet nettverk med bro."
-
-#: ../src/applet-device-bridge.c:115
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Forbereder bro-tilkobling «%s» …"
-
-#: ../src/applet-device-bridge.c:118
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Konfigurerer bro-tilkobling «%s» …"
-
-#: ../src/applet-device-bridge.c:121
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Brukerautentisering kreves for bro-tilkobling «%s» …"
-
-#: ../src/applet-device-bridge.c:128
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Bro-tilkobling «%s» er aktiv"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:509
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Feil PUK-kode. Vennligst kontakt leverandøren."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:486
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:536
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Send kode for å låse opp …"
 
-#: ../src/applet-device-broadband.c:720 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:601
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilt bredbånd (%s)"
 
-#: ../src/applet-device-broadband.c:722 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/connection-helpers.c:125
-#: ../src/connection-editor/page-mobile.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobilt bredbånd"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Tilgjengelige"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:787
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Ny mobil bredbåndstilkobling …"
 
-#: ../src/applet-device-broadband.c:802
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Tilkoblingen er satt opp"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Du er nå koblet til mobilt bredbåndsnettverk."
 
-#: ../src/applet-device-broadband.c:937 ../src/applet-device-broadband.c:943
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobilt bredbåndsnettverk."
 
-#: ../src/applet-device-broadband.c:938 ../src/applet-device-cdma.c:407
-#: ../src/applet-device-gsm.c:666
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Du er nå registrert på hjemmenettverket."
 
-#: ../src/applet-device-broadband.c:944 ../src/applet-device-cdma.c:413
-#: ../src/applet-device-gsm.c:672
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Du er nå registrert på et roaming nettverk."
 
-#: ../src/applet-device-bt.c:103
+#: ../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:128 ../src/applet-device-wimax.c:437
-#: ../src/mobile-helpers.c:583
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Forbereder mobil bredbåndsforbindelse «%s» …"
 
-#: ../src/applet-device-bt.c:131 ../src/applet-device-wimax.c:440
-#: ../src/mobile-helpers.c:586
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Konfigurerer mobil bredbåndsforbindelse «%s» …"
 
-#: ../src/applet-device-bt.c:134 ../src/applet-device-wimax.c:443
-#: ../src/mobile-helpers.c:589
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Brukerautentisering kreves for mobil bredbåndsforbindelse «%s» …"
 
-#: ../src/applet-device-bt.c:141 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobil bredbåndsforbindelse «%s» er aktiv"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Ny mobil bredbåndstilkobling (CDMA) …"
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Du er nå tilkoblet CDMA-nettverk."
-
-#: ../src/applet-device-cdma.c:406 ../src/applet-device-cdma.c:412
-msgid "CDMA network."
-msgstr "CDMA-nettverk."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatisk Ethernet"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet-nettverk (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet-nettverk (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet-nettverk"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet-nettverk"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../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:172
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Forbereder ethernet-nettverkstilkobling til «%s» …"
 
-#: ../src/applet-device-ethernet.c:175
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Konfigurerer ethernet-nettverkstilkobling til «%s» …"
 
-#: ../src/applet-device-ethernet.c:178
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Brukeraautentisering kreves av ethernet-nettverksforbindelse «%s» …"
 
-#: ../src/applet-device-ethernet.c:181
+#: ../src/applet-device-ethernet.c:170
 #, 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:185
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Ethernet-nettverkforbindelse «%s» er aktiv"
 
-#: ../src/applet-device-ethernet.c:364
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-autentisering"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Ny tilkobling med mobilt bredbånd (GSM) …"
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Du er nå tilkoblet GSM-nettverk."
-
-#: ../src/applet-device-gsm.c:665 ../src/applet-device-gsm.c:671
-msgid "GSM network."
-msgstr "GSM-nettverk."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "Automatisk InfiniBand"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand-nettverk (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand-nettverk (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "InfiniBand-nettverk"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "InfiniBand-nettverk"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Du er nå tilkoblet InfiniBand-nettverk."
-
-#: ../src/applet-device-infiniband.c:168
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Forbereder InfiniBand-tilkobling «%s» …"
-
-#: ../src/applet-device-infiniband.c:171
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Konfigurerer InfiniBand-tilkobling «%s» …"
-
-#: ../src/applet-device-infiniband.c:174
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Brukerautentisering kreves for InfiniBand-tilkobling «%s» …"
-
-#: ../src/applet-device-infiniband.c:181
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand-tilkobling «%s» er aktiv"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Du er nå koblet til det sammenslåtte nettverket."
-
-#: ../src/applet-device-team.c:111
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Forbereder sammenslått tilkobling «%s» …"
-
-#: ../src/applet-device-team.c:114
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Konfigurerer sammenslått tilkobling «%s» …"
-
-#: ../src/applet-device-team.c:117
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Brukerautentisering kreves for sammenslått tilkobling «%s» …"
-
-#: ../src/applet-device-team.c:124
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Sammenslått tilkobling «%s» er aktiv"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Du er nå tilkoblet VLAN."
-
-#: ../src/applet-device-vlan.c:229
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Forbereder VPN-tilkobling «%s» …"
-
-#: ../src/applet-device-vlan.c:232
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Konfigurerer VPN-tilkobling «%s» …"
-
-#: ../src/applet-device-vlan.c:235
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Brukerautentisering kreves for VPN-tilkobling «%s» …"
-
-#: ../src/applet-device-vlan.c:242
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VPN-tilkobling «%s» er aktiv"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Koble til skjult Wi-Fi-nettverk …"
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Lag _nytt Wi-Fi-nettverk …"
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../src/applet-device-wifi.c:768
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi-nettverk (%s)"
 
-#: ../src/applet-device-wifi.c:770
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi-nettverk (%s)"
 
-#: ../src/applet-device-wifi.c:772
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi-nettverk"
 msgstr[1] "Wi-Fi-nettverk"
 
-#: ../src/applet-device-wifi.c:801
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi er slått av"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi er slått av med bryter"
 
-#: ../src/applet-device-wifi.c:863
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Flere nettverk"
 
-#: ../src/applet-device-wifi.c:1041
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi-nettverk er tilgjengelige"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1181
 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:1241
+#: ../src/applet-device-wifi.c:1364
 #, 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:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Forbereder Wi-Fi-nettverkstilkobling «%s» …"
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Konfigurerer Wi-Fi-nettverkstilkobling «%s» …"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Brukerautentisering kreves for Wi-Fi-nettverk «%s» …"
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, 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:1302
+#: ../src/applet-device-wifi.c:1419
 #, 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:1306
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi-nettverkforbindelse «%s» er aktiv"
 
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Kunne ikke å aktivere tilkobling"
 
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Klarte ikke å legge til ny tilkobling"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX mobilt bredbånd (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX mobilt bredbånd"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX er slått av"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX er slått av med bryter"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Du er nå tilkoblet WiMAX-nettverket."
-
-#: ../src/applet-device-wimax.c:455 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Mobil bredbåndsforbindelse «%s» er aktiv: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:458 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "roaming"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Feil under visning av tilkoblingsinformasjon:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:318
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adresser"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:270
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (forvalg)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:679
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "ukjent"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "ukjent"
-
 #. Address
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:408
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/applet-dialogs.c:387 ../src/applet-dialogs.c:473
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "IP-adresse:"
 
-#: ../src/applet-dialogs.c:409
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Kringkastingsadresse:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/applet-dialogs.c:424
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Subnettmaske:"
 
-#: ../src/applet-dialogs.c:440 ../src/applet-dialogs.c:489
-msgid "Default Route:"
-msgstr "Forvalgt rute:"
-
-#: ../src/applet-dialogs.c:587
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:590
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:597
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:599
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:603
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:609 ../src/applet-dialogs.c:909
-#: ../src/connection-editor/page-general.c:322
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/applet-dialogs.c:613
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Grensesnitt:"
 
-#: ../src/applet-dialogs.c:635
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Maskinvareadresse:"
 
 #. Driver
-#: ../src/applet-dialogs.c:649
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:684
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../src/applet-dialogs.c:699
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Sikkerhet:"
 
-#: ../src/applet-dialogs.c:717
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:735
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:757 ../src/applet-dialogs.c:950
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Forvalgt rute:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:777 ../src/applet-dialogs.c:972
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:786 ../src/applet-dialogs.c:981
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorert"
 
-#: ../src/applet-dialogs.c:914
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Type VPN:"
 
-#: ../src/applet-dialogs.c:921
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN-gateway:"
 
-#: ../src/applet-dialogs.c:927
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Brukernavn for VPN:"
 
-#: ../src/applet-dialogs.c:933
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN-topptekst:"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Grunntilkobling:"
 
-#: ../src/applet-dialogs.c:941 ../src/libnm-gtk/nm-ui-utils.c:348
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:1056
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Ingen gyldige aktive tilkoblinger funnet!"
 
-#: ../src/applet-dialogs.c:1084
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 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:1087
+#: ../src/applet-dialogs.c:988
 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:1089
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager nettsted"
 
-#: ../src/applet-dialogs.c:1104
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Mangler ressurser"
 
-#: ../src/applet-dialogs.c:1129
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Passord for tilkoblign med mobilt bredbånd"
 
-#: ../src/applet-dialogs.c:1138
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Et passord kreves for å koble til «%s»."
 
-#: ../src/applet-dialogs.c:1153
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/applet-dialogs.c:1434
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Du må låse opp PIN-koden for SIM"
 
-#: ../src/applet-dialogs.c:1435
+#: ../src/applet-dialogs.c:1337
 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:1437
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1169,25 +959,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:1439
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN-kode:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1443
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Vis PIN-kode"
 
-#: ../src/applet-dialogs.c:1445
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Du må låse opp PUK-kode for SIM"
 
-#: ../src/applet-dialogs.c:1446
+#: ../src/applet-dialogs.c:1348
 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:1448
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1196,27 +986,34 @@ 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:1450
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK-kode:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1453
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Ny PIN-kode:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1455
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Tast inn ny PIN-kode igjen:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1460
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Vis PIN/PUK-koder"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1226,18 +1023,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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Slett"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Overse automatisk i_nnhentede ruter"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1245,9 +1065,8 @@ msgstr ""
 "Hvis dette slås på vil tilkoblingen aldri bli brukt som forvalgt "
 "nettverkstilkobling."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1255,15 +1074,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Lag …"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1316,48 +1135,41 @@ msgid "Bonded _connections:"
 msgstr "Sammenkoblede _tilkoblinger:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "_Modus:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "M_odus:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:697
-msgid "_Edit"
-msgstr "R_ediger"
-
-#. Delete
 #: ../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:713
-msgid "_Delete"
-msgstr "_Slett"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "R_ediger"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Overvåkings_frekvens:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "Navn på grensesn_itt:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "Overvåking av ti_lkobling:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP-_mål:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1365,37 +1177,41 @@ 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Pause før tilkoblingen tas _opp:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Pause før tilkoblingen tas ne_d:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Primær:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
-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."
+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:24
+#: ../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:7
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
 msgid "_MTU:"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:25
+#: ../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:6
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "bytes"
 msgstr "bytes"
 
@@ -1404,7 +1220,7 @@ 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:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
@@ -1416,44 +1232,89 @@ msgstr "_Hårnålmodus:"
 msgid "Bridged _connections:"
 msgstr "Sammenkoblede _tilkoblinger:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "_Pause før videresending:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "Tid for _hallo:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Slå på _nettverk"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Slå på _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Maksimal alder:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_Aldringstid:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatisk"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "forvalg"
 
-#: ../src/connection-editor/ce-page.c:360
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adresse"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adresse"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Enhver enhet"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Klarte ikke å oppdatere hemmelighet for tilkobling på grunn av en ukjent "
@@ -1554,92 +1415,92 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Prioritetsflytkontroll"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 #, 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:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Prioritet:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Trafikk-klasse:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Streng båndbredde:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Prioritetsbåndbredde:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Gruppebåndbredde:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "Gruppe-ID:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 msgid "Enter the traffic class for each user priority."
 msgstr ""
 
@@ -1657,7 +1518,7 @@ 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:4
+#: ../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
@@ -1666,7 +1527,8 @@ msgstr "_Vis passord"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
 #: ../src/connection-editor/ce-page-mobile.ui.h:4
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1678,8 +1540,8 @@ msgstr "_Passord:"
 #: ../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:139
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatisk"
@@ -1734,18 +1596,18 @@ msgstr "F_orhandle automatisk"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "_MAC-adresse for enhet:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "Tjene_ste:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "K_lonet MAC-adresse:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1755,6 +1617,55 @@ 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-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Forvalg"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorer"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Kringkasting"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Passord for _privat nøkkel:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
 msgstr "Koble til _VPN automatisk når du bruker denne tilkoblingen"
@@ -1792,8 +1703,8 @@ msgstr "Automatisk med manuelle DNS-innstillinger"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:171
-#: ../src/connection-editor/page-ip6.c:196
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manuelt"
 
@@ -1804,8 +1715,8 @@ 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:216
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Delt med andre datamaskiner"
 
@@ -1819,7 +1730,7 @@ msgstr "_Metode:"
 msgid "Addresses"
 msgstr "Adresser"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1829,8 +1740,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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1838,25 +1749,25 @@ msgstr ""
 "Domener som brukes ved oppslag av vertsnavn. Bruk komma for å skille flere "
 "domener."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:309
-#: ../src/connection-editor/page-ip6.c:318
+#: ../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
 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:300
-#: ../src/connection-editor/page-ip6.c:309
+#: ../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:"
 msgstr "_DNS-tjenere"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1864,11 +1775,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1876,13 +1787,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Ruter …"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:198
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Slått av"
 
@@ -1894,22 +1805,25 @@ msgstr "Slått på (foretrekk offentlig adresse)"
 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.h:17
 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-adresse for navnetjenere som brukes for å slå opp vertsnavn. Bruk komma for å skille flere navnetjenere. Link-lokale adresser vil automatisk bli scopet til grensesnittet som kobles til."
+msgstr ""
+"IP-adresse for navnetjenere som brukes for å slå opp vertsnavn. Bruk komma "
+"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
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 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.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2018,32 +1932,54 @@ msgstr "Sammenkoblede _tilkoblinger:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
 #, fuzzy
-msgid "I_mport team configuration from a file..."
-msgstr "Importer en lagret VPN-tilkobling …"
+msgid "Im_port team configuration from a file..."
+msgstr "Importer en  …"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Opphavs-grensesnitt:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Navn på VLAN-grensesnitt:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Klonet MAC-adresse:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN-ID:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Enhetsnavn + tall"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "«vlan» + tall"
 
@@ -2060,94 +1996,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2,4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastruktur"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Overføringsst_yrke:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Rate:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "Ka_nal"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Bån_d:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "M_odus:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Tillatte autentiseringsmetoder"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2156,136 +2096,157 @@ msgstr ""
 "autentiseringsmetoder. Hvis tilkoblinger feiler kan du prøve å slå av støtte "
 "for noen metoder."
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-ethernet.c:240
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:123
-#: ../src/connection-editor/page-wifi.c:464 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:131
-#: ../src/connection-editor/page-wimax.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:332 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:132
-#: ../src/connection-editor/page-dsl.c:135
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:133
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:336
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:134
-#: ../src/connection-editor/page-bond.c:450 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Bond"
 msgstr "Koble sammen"
 
-#: ../src/connection-editor/connection-helpers.c:135
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:340
-#: ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Team"
 msgstr ""
 
-#: ../src/connection-editor/connection-helpers.c:136
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:342 ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../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
 msgid "Bridge"
 msgstr "Bro"
 
-#: ../src/connection-editor/connection-helpers.c:137
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:344
-#: ../src/libnm-gtk/nm-ui-utils.c:588
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:146
-#: ../src/connection-editor/connection-helpers.c:286
-#: ../src/connection-editor/page-vpn.c:112
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:232
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: ../src/connection-editor/connection-helpers.c:256
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: ../src/connection-editor/connection-helpers.c:324
-#: ../src/connection-editor/connection-helpers.c:326
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Importer en lagret VPN-tilkobling …"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: ../src/connection-editor/connection-helpers.c:323
 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:364
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Kunne ikke lage en ny tilkobling"
 
-#: ../src/connection-editor/connection-helpers.c:499
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Sletting av tilkobling feilet"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:925
-#: ../src/connection-editor/page-ip6.c:921
+#: ../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
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:942
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Nettmaske"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:959
-#: ../src/connection-editor/page-ip6.c:955
+#: ../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
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrisk"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:938
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:124
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Redigerer %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:128
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Redigerer tilkobling uten navn"
 
-#: ../src/connection-editor/nm-connection-editor.c:288
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Tilkoblings_navn:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Feil under initiering av redigering"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Klarte ikke å legge til tilkobling"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2318,157 +2279,185 @@ msgstr "Kunne ikke redigere tilkobling"
 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:573
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Feil under initiering av redigering"
 
-#: ../src/connection-editor/nm-connection-editor.c:912
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Klarte ikke å legge til tilkobling"
 
-#: ../src/connection-editor/nm-connection-editor.c:952
-msgid "Error saving connection"
-msgstr "Feil under lagring av tilkobling"
-
-#: ../src/connection-editor/nm-connection-editor.c:953
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Egenskap «%s» / «%s» er ugyldig: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "Tilkoblings_navn:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Eksporter …"
 
-#: ../src/connection-editor/nm-connection-list.c:145
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "aldri"
 
-#: ../src/connection-editor/nm-connection-list.c:156
-#: ../src/connection-editor/nm-connection-list.c:167
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "nå"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:178
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:190
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:196
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:200
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:641
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/connection-editor/nm-connection-list.c:654
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Sist brukt"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Rediger valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentiser for å redigere valgt tilkobling."
 
-#: ../src/connection-editor/nm-connection-list.c:714
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Slett valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:715
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentiser for å slette valgt tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Ingen VPN-tillegg er installert."
 
-#: ../src/connection-editor/nm-connection-list.c:952
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:954
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Feil under oppretting av tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:1010
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Feil under redigering av tilkobling"
 
-#: ../src/connection-editor/nm-connection-list.c:1011
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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:119
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x sikkerhet"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:111
 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:135
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Bruk 802.1_X-sikkerhet for denne tilkoblingen"
 
-#: ../src/connection-editor/page-bluetooth.c:108
-#: ../src/libnm-gtk/nm-ui-utils.c:328
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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:110
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for Bluetooth."
 
-#: ../src/connection-editor/page-bond.c:453
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Sammenkoblet tilkobling %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Ethernet-nettverk"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Wi-Fi-nettverk"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for sammenkobling."
 
-#: ../src/connection-editor/page-bond.c:619
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Primær:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Sammenkoblet tilkobling %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Kunne ikke laste brukergrensesnitt."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Sammenkoblet tilkobling %d"
@@ -2476,58 +2465,74 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Port for sammenkobling"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for port for sammenkobling."
 
-#: ../src/connection-editor/page-dcb.c:605
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:607
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for DSB."
 
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for DSL."
 
-#: ../src/connection-editor/page-dsl.c:229
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-tilkobling %d"
 
-#: ../src/connection-editor/page-ethernet.c:79
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:94
-#: ../src/connection-editor/page-wimax.c:59
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "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:242
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:385
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "K_lonet MAC-adresse:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:56
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Forvalg"
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2537,141 +2542,195 @@ 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:58
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD kjører ikke."
 
-#: ../src/connection-editor/page-general.c:325
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Kunne ikke laste generelt brukergrensesnitt."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:258
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-tilkobling %d"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatisk (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Kun automatiske (VPN) adresser"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automatisk, kun adresser"
 
-#: ../src/connection-editor/page-ip4.c:142
-#: ../src/connection-editor/page-ip6.c:144
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatisk (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143
-#: ../src/connection-editor/page-ip6.c:145
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Kunn automatiske (PPPoE) adresser"
 
-#: ../src/connection-editor/page-ip4.c:145
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatisk (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:146
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Kun automatiske (DHCP) adresser"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:209
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Kun lokal link"
 
-#: ../src/connection-editor/page-ip4.c:298
-#: ../src/connection-editor/page-ip6.c:307
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Flere _DNS-tjenere:"
 
-#: ../src/connection-editor/page-ip4.c:307
-#: ../src/connection-editor/page-ip6.c:316
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Flere søk_edomener:"
 
-#: ../src/connection-editor/page-ip4.c:857
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Rediger IPv4-ruter for %s"
 
-#: ../src/connection-editor/page-ip4.c:1009
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4-innstillinger"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv4"
 
-#: ../src/connection-editor/page-ip6.c:160
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/connection-editor/page-ip6.c:184
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatisk. Kun DHCP"
 
-#: ../src/connection-editor/page-ip6.c:853
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Rediger IPv6-ruter for %s"
 
-#: ../src/connection-editor/page-ip6.c:1004
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6-innstillinger"
 
-#: ../src/connection-editor/page-ip6.c:1006
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for IPv6."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Dupliserte slaver"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, 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:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
 "same physical device."
-msgstr "Slavene «%s» og «%s» brukes på forskjellige virtuelle porter («%s» og «%s») på samme fysiske enhet."
+msgstr ""
+"Slavene «%s» og «%s» brukes på forskjellige virtuelle porter («%s» og «%s») "
+"på samme fysiske enhet."
 
-#: ../src/connection-editor/page-master.c:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:320
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for mobilt bredbånd."
 
-#: ../src/connection-editor/page-mobile.c:337
+#: ../src/connection-editor/page-mobile.c:327
 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:556
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Velg type tilbyder for mobilt bredbånd"
 
-#: ../src/connection-editor/page-mobile.c:583
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2679,86 +2738,86 @@ msgstr ""
 "Velg tekonlogien din bredbåndstilbyder for mobil bruker. Spør tilbyderen "
 "hvis du er usikker."
 
-#: ../src/connection-editor/page-mobile.c:588
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:595
+#: ../src/connection-editor/page-mobile.c:568
 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:605 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:608 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:136
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:143
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ingen"
 
-#: ../src/connection-editor/page-ppp.c:203
+#: ../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:286
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP-innstillinger"
 
-#: ../src/connection-editor/page-ppp.c:288
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for PPP."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Velg fil som skal importeres"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Feil: filen inneholder ikke en gyldig JSON-konfigurasjon"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 #, fuzzy
 msgid "Could not load team user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for vlan."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, fuzzy, c-format
 msgid "Team connection %d"
 msgstr "DSL-tilkobling %d"
@@ -2766,12 +2825,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:157
+#: ../src/connection-editor/page-team-port.c:151
 #, fuzzy
 msgid "Team Port"
 msgstr "Port for sammenkobling"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 #, fuzzy
 msgid "Could not load team port user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for port for sammenkobling."
@@ -2779,36 +2838,45 @@ 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (via «%s»)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Ingen nettverksforbindelse"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for vlan."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-tilkobling %d"
 
-#: ../src/connection-editor/page-vpn.c:114
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Klarte ikke å laste brukergrensesnitt for VPN."
 
-#: ../src/connection-editor/page-vpn.c:129
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Fant ikke tjeneste for VPN-tillegg «%s»."
 
-#: ../src/connection-editor/page-vpn.c:216
-#: ../src/connection-editor/page-vpn.c:313
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-tilkobling %d"
 
-#: ../src/connection-editor/page-vpn.c:242
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2818,11 +2886,11 @@ msgstr ""
 "\n"
 "Feil: ingen type for VPN-tjeneste."
 
-#: ../src/connection-editor/page-vpn.c:267
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Velg type VPN-tilkobling"
 
-#: ../src/connection-editor/page-vpn.c:268
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2832,7 +2900,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:84
+#: ../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"
@@ -2840,73 +2908,93 @@ 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:200
+#: ../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)\""
+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
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:466
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:637
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Enhver enhet"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi-tilkobling %d"
 
-#: ../src/connection-editor/page-wifi-security.c:295
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:305
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:331
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Dynamisk WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:345
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 personlig"
 
-#: ../src/connection-editor/page-wifi-security.c:359
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:400
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Kunne ikke laste brukergrensesnitt for Wi-Fi-sikkerhet; mangler WiFi-"
 "innstilling."
 
-#: ../src/connection-editor/page-wifi-security.c:411
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi-sikkerhet"
 
-#: ../src/connection-editor/page-wifi-security.c:413
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Kunne ikke laste brukergrensesnitt for Wi-Fi-sikkerhet."
 
-#: ../src/connection-editor/page-wimax.c:126
-msgid "Could not load WiMAX user interface."
-msgstr "Kunne ikke laste brukergrensesnitt for WiMAX."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:222
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX-tilkobling %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Kan ikke importere VPN-tilkobling"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2919,25 +3007,30 @@ msgstr ""
 "\n"
 "Feil: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Ukjent feil"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "En fil med navn «%s» eksisterer allerede."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "E_rstatt"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Kan ikke eksportere VPN-tilkobling"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2948,108 +3041,22 @@ msgstr ""
 "\n"
 "Feil: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Eksporter VPN-tilkobling …"
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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 ""
 "NetworkManager fant ikke nødvendige ressurser (.ui-filen ble ikke funnet)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Konfigurasjon av Bluetooth er ikke mulig (klarte ikke å koble til D-Bus: "
-"(%s)%s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Konfigurasjon av Bluetooth er ikke mulig (klarte ikke å finne "
-"NetworkManager: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Bruk din mobiltelefon som en nettverksenhet (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Koble til internett med din mobiltelefon (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Feil: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Kunne ikke lage en DUN-tilkobling: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:952
-msgid "Your phone is now ready to use!"
-msgstr "Telefonen er klar til bruk!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Veiviser for mobil ble avbrutt"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Ukjent enhetstype for telefon (ikke GSM eller CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:721
-#: ../src/gnome-bluetooth/nma-bt-device.c:727
-msgid "failed to connect to the phone."
-msgstr "klarte ikke å koble til telefonen."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:740
-msgid "error getting bus connection"
-msgstr "feil ved tilkobling til buss"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
-msgid "unexpectedly disconnected from the phone."
-msgstr "koblet fra telefonen uventet."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:804
-msgid "timed out detecting phone details."
-msgstr "tidsavbrudd under henting av detaljer om telefonen."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:815
-msgid "Detecting phone configuration..."
-msgstr "Gjenkjenner telefonkonfigurasjon …"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:913
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Forvalgt Bluetooth-enhet må slås på før du setter opp en oppringt "
-"nettverkstilkobling."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:950
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Kunne ikke lage en PAN-tilkobling: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:971
-#, c-format
-msgid "%s Network"
-msgstr "%s nettverk:"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "Lås _opp"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Lås opp denne enheten automatisk"
 
@@ -3057,32 +3064,37 @@ msgstr "Lås opp denne enheten automatisk"
 msgid "Connection Information"
 msgstr "Tilkoblingsinformasjon"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Aktive nettverkstilkoblinger"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Din enhet:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Din plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3096,23 +3108,28 @@ msgstr ""
 "endre dine innstillinger for mobil bredbåndstilkobling kan du velge "
 "«Nettverkstilkoblinger» fra menyen System->Brukervalg."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Ikke listet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Velg din plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3124,67 +3141,83 @@ msgstr ""
 "\n"
 "Spør tilbyder om APN for ditt abonnement hvis du er usikker."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Min plan er ikke på listen …"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Tilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Jeg kan ikke finne min tilbyder og ønsker å oppgi denne _manuelt:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Tilbyder:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Velg din tilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Velg din tilbyders land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Installert GSM-enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installert CDMA-enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3192,86 +3225,109 @@ msgstr ""
 "Denne assistenten hjelper deg å sette opp en mobil bredbåndstilkobling til "
 "et mobilnettverk (3G)."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Du trenger følgende informasjon:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Navnet på din bredbåndstilbyder"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Navn på betalingsplan for bredbånd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(i enkelte tilfeller) APN (navn på aksesspunkt) for din betalingsplan for "
 "bredbånd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Lag en tilkobling for _denne mobile bredbåndsenheten:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Enhver enhet"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Sett opp en mobil bredbåndstilkobling"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Ny mobil bredbåndstilkobling"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:374
-msgid "Wired"
-msgstr "Kablet"
+#: ../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/libnm-gtk/nm-ui-utils.c:330
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:346
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:409
-msgid "PCI"
-msgstr "PCI"
+#: ../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/libnm-gtk/nm-ui-utils.c:411
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Sekundært passord:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:487 ../src/libnm-gtk/nm-ui-utils.c:507
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Sekundært passord:"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../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-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Ny …"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Lag:"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3279,66 +3335,90 @@ msgstr ""
 "Passord eller krypteringsnøkler er nødvendig for å koble til Wi-Fi-nettverk "
 "«%s»."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentisering for Wi-Fi-nettverk kreves"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentisering kreves av Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Lag et nytt Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nytt Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Koble til skjult Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Skjult Wi-Fi-nettverk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
 "Oppgi navnet til det skjulte Wi-Fi-nettverket du ønsker å koble deg til."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Sekundært passord:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "Vis pass_ord"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi-_sikkerhet:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Tilkobli_ng:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi-_kort:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3346,7 +3426,7 @@ msgstr ""
 "Dette programmet er en del av NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3354,138 +3434,151 @@ msgstr ""
 "Det er ikke ment brukt via kommandolinjen og kjører i stedet i "
 "skrivebordsmiljøet GNOME."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ikke slått på"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ikke registrert"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Hjemmenettverk (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Hjemmenettverk"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "søker"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrering nektet"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "\"Roaming\" nettverk (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "\"Roaming\" nettverk"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN-kode for SIM-kort «%s» på «%s»"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN-kode kreves"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kode kreves for enhet for mobilt bredbånd"
 
+#: ../src/mobile-helpers.c:619
+#, 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:622
+msgid "roaming"
+msgstr "roaming"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s-tilkobling"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Lagre passordet kun for denne br_ukeren"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "Lagre passordet for _alle brukere"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER eller PEM-sertifikater (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Velg en PAC-fil …"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Alle filer"
 
@@ -3521,15 +3614,32 @@ msgstr "_Indre autentisering:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillat automatisk PAC-pro_visjonering"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Velg et Certificate Authority-sertifikat …"
 
@@ -3557,15 +3667,46 @@ msgstr "CA-sertifikat k_reves ikke"
 msgid "PEAP _version:"
 msgstr "PEAP-_versjon:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Spør om dette passordet _hver gang"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A-sertifikat:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Private nøkler uten kryptering er ikke sikre"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3579,11 +3720,11 @@ msgstr ""
 "\n"
 "Du kan passordbeskytte din private nøkkel med openssl"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Velg ditt personlige sertifikat …"
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Velg din private nøkkel …"
 
@@ -3603,23 +3744,36 @@ msgstr "Privat nø_kkel:"
 msgid "_Private key password:"
 msgstr "Passord for _privat nøkkel:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunnelert TLS (TTLS)"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Beskyttet EAP (PEAP)"
 
@@ -3629,6 +3783,44 @@ msgstr "Beskyttet EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Au_tentisering:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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)"
@@ -3653,6 +3845,260 @@ msgstr "_Vis nøkkel"
 msgid "WEP inde_x:"
 msgstr "WEP-inde_ks:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Type:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Slå på WiMA_X mobilt bredbånd"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjelp"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Du er nå tilkoblet bundet nettverk."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Forbereder bundet tilkobling «%s» …"
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Konfigurerer bundet tilkobling «%s» …"
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Brukerautentisering kreves for bundet tilkobling «%s» …"
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Ber om en nettverksadresse for «%s» …"
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Bundet tilkobling «%s» er aktiv"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Du er nå tilkoblet nettverk med bro."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Forbereder bro-tilkobling «%s» …"
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Konfigurerer bro-tilkobling «%s» …"
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Brukerautentisering kreves for bro-tilkobling «%s» …"
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Bro-tilkobling «%s» er aktiv"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Ny mobil bredbåndstilkobling (CDMA) …"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Du er nå tilkoblet CDMA-nettverk."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA-nettverk."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Ny tilkobling med mobilt bredbånd (GSM) …"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Du er nå tilkoblet GSM-nettverk."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM-nettverk."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "Automatisk InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand-nettverk (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand-nettverk (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand-nettverk"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand-nettverk"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Du er nå tilkoblet InfiniBand-nettverk."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Forbereder InfiniBand-tilkobling «%s» …"
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Konfigurerer InfiniBand-tilkobling «%s» …"
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "Brukerautentisering kreves for InfiniBand-tilkobling «%s» …"
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand-tilkobling «%s» er aktiv"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Du er nå koblet til det sammenslåtte nettverket."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Forbereder sammenslått tilkobling «%s» …"
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Konfigurerer sammenslått tilkobling «%s» …"
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Brukerautentisering kreves for sammenslått tilkobling «%s» …"
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Sammenslått tilkobling «%s» er aktiv"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Du er nå tilkoblet VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Forbereder VPN-tilkobling «%s» …"
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Konfigurerer VPN-tilkobling «%s» …"
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Brukerautentisering kreves for VPN-tilkobling «%s» …"
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VPN-tilkobling «%s» er aktiv"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX mobilt bredbånd (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX mobilt bredbånd"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX er slått av"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX er slått av med bryter"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Du er nå tilkoblet WiMAX-nettverket."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "ukjent"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "ukjent"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Modus:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_MAC-adresse for enhet:"
+
+#, fuzzy
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "Importer en lagret VPN-tilkobling …"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastruktur"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Feil under lagring av tilkobling"
+
+#~ 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)."
+#~ msgstr ""
+#~ "Konfigurasjon av Bluetooth er ikke mulig (klarte ikke å koble til D-Bus: "
+#~ "(%s)%s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Konfigurasjon av Bluetooth er ikke mulig (klarte ikke å finne "
+#~ "NetworkManager: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Bruk din mobiltelefon som en nettverksenhet (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Koble til internett med din mobiltelefon (DUN)"
+
+#~ 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!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Veiviser for mobil ble avbrutt"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Ukjent enhetstype for telefon (ikke GSM eller CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "klarte ikke å koble til telefonen."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "feil ved tilkobling til buss"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "koblet fra telefonen uventet."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "tidsavbrudd under henting av detaljer om telefonen."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Gjenkjenner telefonkonfigurasjon …"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Forvalgt Bluetooth-enhet må slås på før du setter opp en oppringt "
+#~ "nettverkstilkobling."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Kunne ikke lage en PAN-tilkobling: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s nettverk:"
diff --git a/po/ne.po b/po/ne.po
index 43711d87..31ae6abb 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,749 +8,4080 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.network-manager-applet-0-6.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 03:30+0000\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n !=1\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../src/applet-compat.c:171 ../src/applet-dbus-info.c:937
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#, fuzzy
+msgid "Network"
+msgstr "सञ्जाल नाम:"
+
+#: ../nm-applet.desktop.in.h:2
+#, fuzzy
+msgid "Manage your network connections"
+msgstr "सञ्जाल जडान छैन"
+
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#, fuzzy
+msgid "Network Connections"
+msgstr "सञ्जाल जडान छैन"
+
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+msgid "Disable connected notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+msgid "Disable disconnected notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+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
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+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 WiFi Create"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "सञ्जालप्रबन्धक एप्लेट"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "सञ्जालप्रबन्धक एप्लेट"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "जडान गर्नुहोस्"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#, fuzzy
+msgid "_Network name:"
+msgstr "सञ्जाल नाम:"
+
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr ""
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "सक्रिय जडान छैन!"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr ""
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "भीपीएन जडान असफलता"
+
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "जडान विच्छेदन भयो"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "जडान विच्छेदन भयो"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "तार भएको सञ्जालमा जडान असफल भयो ।"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+#, fuzzy
+msgid "Don't show this message again"
+msgstr "मलाई फेरि नसम्झाउनुहोस्"
+
+#: ../src/applet.c:844
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
+
+#: ../src/applet.c:847
 #, c-format
-msgid "Passphrase for wireless network %s"
-msgstr "ताररहित सञ्जाल %s का लागि पासफ्रेज"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+
+#: ../src/applet.c:850
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"भीपीएन जडान '%s' सुरु गर्न सकेन किनभने भीपीएन सर्भरले एउटा उपयुक्त सञ्जाल कन्फिगरेसन "
+"फर्काउन सकेन ।"
+
+#: ../src/applet.c:853
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
 
-#: ../src/applet-dbus-devices.c:898
+#: ../src/applet.c:856
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"भीपीएन जडान '%s' सुरु गर्न सकेन किनभने भीपीएन सर्भरले एउटा उपयुक्त सञ्जाल कन्फिगरेसन "
+"फर्काउन सकेन ।"
+
+#: ../src/applet.c:859
 #, c-format
-msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-msgstr "तपाईँ हाल अहिले एड-हक ताररहित सञ्जाल '%s' मा जडान हुनुभयो ।"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
 
-#: ../src/applet-dbus-devices.c:903
+#: ../src/applet.c:862
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "तपाईँ हाल अहिले ताररहित सञ्जाल '%s' मा जडान हुनुभयो ।"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
 
-#: ../src/applet-dbus-devices.c:910
-msgid "You are now connected to the wired network."
-msgstr "तपाईँ हाल अहिले तार भएको सञ्जालमा जडान हुनुभयो ।"
+#: ../src/applet.c:865
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
 
-#: ../src/applet-dbus-devices.c:916
-msgid "Connection Established"
-msgstr "जडान स्थापना भयो"
+#: ../src/applet.c:872
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr "'%s' लाई भीपीएन जडान"
+
+#: ../src/applet.c:888
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
+
+#: ../src/applet.c:891
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
+
+#: ../src/applet.c:897
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr "सञ्जाल जडान विच्छेदन भयो ।"
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "भीपीएन लगइन सन्देश"
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+#, fuzzy
+msgid "VPN Connection Failed"
+msgstr "भीपीएन जडान असफलता"
+
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/applet.c:993
+#, fuzzy, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
+
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr ""
+
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr ""
+
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#, fuzzy
+msgid "disconnected"
+msgstr "जडान विच्छेदन भयो"
+
+#: ../src/applet.c:1308
+#, fuzzy
+msgid "Disconnect"
+msgstr "जडान विच्छेदन भयो"
+
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr ""
+
+#: ../src/applet.c:1395
+#, fuzzy
+msgid "No network devices available"
+msgstr "सञ्जाल यन्त्र फेला परेन"
 
-#: ../src/applet-dbus-devices.c:959
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "भीपीएन जडान"
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "भीपीएन कन्फिगर गर्नुहोस्..."
+
+#: ../src/applet.c:1508
+#, fuzzy
+msgid "_Disconnect VPN"
+msgstr "भीपीएन विच्छेदन गर्नुहोस्..."
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "सञ्जालप्रबन्धक चलिरहेको छैन..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "सञ्जालीकरण अक्षम गरियो"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "सञ्जालीकरण सक्षम पार्नुहोस्"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "ताररहित सक्षम पार्नुहोस्"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr ""
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "जडान जानकारी"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+#, fuzzy
+msgid "Edit Connections..."
+msgstr "भीपीएन जडान"
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "बारेमा"
+
+#: ../src/applet.c:2179
+#, fuzzy, c-format
+msgid "You are now connected to '%s'."
+msgstr "तपाईँ हाल अहिले ताररहित सञ्जाल '%s' मा जडान हुनुभयो ।"
+
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "जडान विच्छेदन भयो"
 
-#: ../src/applet-dbus-devices.c:960
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "सञ्जाल जडान विच्छेदन भयो ।"
 
-#: ../src/applet-dbus.c:274
+#: ../src/applet.c:2474
+#, fuzzy, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "तारसहित सञ्जाल जडान"
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, fuzzy, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "ताररहित सञ्जाल '%s' बाट सञ्जाल ठेगाना अनुरोध गर्दैछ..."
+
+#: ../src/applet.c:2483
+#, fuzzy, c-format
+msgid "Network connection '%s' active"
+msgstr "सञ्जाल जडान छैन"
+
+#: ../src/applet.c:2557
+#, fuzzy, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "भीपीएन जडान '%s' सुरुआत गर्न सक्दैन"
+
+#: ../src/applet.c:2560
 #, c-format
-msgid "Connection to the wireless network '%s' failed."
-msgstr "ताररहित सञ्जाल '%s' मा जडान असफल भयो ।"
+msgid "User authentication required for VPN connection '%s'..."
+msgstr ""
 
-#: ../src/applet-dbus.c:279
-msgid "Connection to the wired network failed."
-msgstr "तार भएको सञ्जालमा जडान असफल भयो ।"
+#: ../src/applet.c:2563
+#, fuzzy, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "ताररहित सञ्जाल '%s' बाट सञ्जाल ठेगाना अनुरोध गर्दैछ..."
+
+#: ../src/applet.c:2566
+#, fuzzy, c-format
+msgid "VPN connection '%s' active"
+msgstr "'%s' लाई भीपीएन जडान"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "सञ्जाल जडान छैन"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "सञ्जालप्रबन्धक एप्लेट"
+
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr ""
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr ""
+
+#: ../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
+msgid "Mobile Broadband"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr ""
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "जडान स्थापना भयो"
+
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "तपाईँ हाल अहिले तार भएको सञ्जालमा जडान हुनुभयो ।"
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:957
+#, fuzzy
+msgid "You are now registered on the home network."
+msgstr "तपाईँ हाल अहिले तार भएको सञ्जालमा जडान हुनुभयो ।"
+
+#: ../src/applet-device-broadband.c:963
+#, fuzzy
+msgid "You are now registered on a roaming network."
+msgstr "तपाईँ हाल अहिले तार भएको सञ्जालमा जडान हुनुभयो ।"
+
+#: ../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
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:30
+msgid "Auto Ethernet"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
+msgstr "तार भएको सञ्जाल (%s)"
+
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
+msgstr "तार भएको सञ्जाल (%s)"
+
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
+msgstr "तार भएको सञ्जाल"
+
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
+msgstr "तार भएको सञ्जाल"
+
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
+msgstr "तपाईँ हाल अहिले तार भएको सञ्जालमा जडान हुनुभयो ।"
+
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
+msgstr "ताररहित सञ्जाल '%s' का लागि %s यन्त्र तयार गरिँदैछ..."
+
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
+msgstr "'%s' (%d%%) मा ताररहित सञ्जाल जडान"
+
+#: ../src/applet-device-ethernet.c:167
+#, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr ""
+
+#: ../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
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
+msgstr "'%s' (%d%%) मा ताररहित सञ्जाल जडान"
+
+#: ../src/applet-device-ethernet.c:346
+#, fuzzy
+msgid "DSL authentication"
+msgstr "प्रमाणीकरण:"
+
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "अन्य ताररहित सञ्जालमा जडान गर्नुहोस्..."
+
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
+msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्..."
+
+#: ../src/applet-device-wifi.c:431
+msgid "(none)"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "तार भएको सञ्जाल (%s)"
+
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "तार भएको सञ्जाल (%s)"
+
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "तार भएको सञ्जाल"
+msgstr[1] "तार भएको सञ्जाल"
+
+#: ../src/applet-device-wifi.c:934
+msgid "Wi-Fi is disabled"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:996
+#, fuzzy
+msgid "More networks"
+msgstr "तार भएको सञ्जाल"
+
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
+msgstr "सञ्जालीकरण अक्षम गरियो"
 
-#: ../src/applet.c:186
+#: ../src/applet-device-wifi.c:1181
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1364
+#, fuzzy, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "तपाईँ हाल अहिले ताररहित सञ्जाल '%s' मा जडान हुनुभयो ।"
+
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "तारसहित सञ्जाल जडान"
+
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "तारसहित सञ्जाल जडान"
+
+#: ../src/applet-device-wifi.c:1405
+#, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "ताररहित सञ्जाल '%s' बाट सञ्जाल ठेगाना अनुरोध गर्दैछ..."
+
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr "'%s' (%d%%) मा ताररहित सञ्जाल जडान"
+
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "तारसहित सञ्जाल जडान"
+
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "सक्रिय जडान छैन!"
+
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "तारसहित सञ्जाल जडान"
+
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
 
-#: ../src/applet.c:204
-msgid "Could not find some required resources (the glade file)!"
-msgstr "केही आवश्यक संसाधनहरू फेला पार्न सकेन (ग्लेड फाइल)!"
+#: ../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
+msgid "LEAP"
+msgstr ""
 
-#: ../src/applet.c:215
-msgid "No active connections!"
-msgstr "सक्रिय जडान छैन!"
+#: ../src/applet-dialogs.c:74
+msgid "Dynamic WEP"
+msgstr "गतिशील WEP"
 
-#: ../src/applet.c:236
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
+msgid "WPA/WPA2"
+msgstr ""
+
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+msgid "More addresses"
+msgstr ""
+
+#: ../src/applet-dialogs.c:226
+msgid "WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, 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
 #, c-format
-msgid "Wired Ethernet (%s)"
+msgid "%u Mb/s"
+msgstr ""
+
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+msgctxt "Speed"
+msgid "Unknown"
+msgstr ""
+
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "आईपी ठेगाना:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "प्रशारण ठेगाना:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "सबनेट मास्क:"
+
+#: ../src/applet-dialogs.c:492
+#, fuzzy, c-format
+msgid "Ethernet (%s)"
 msgstr "तार भएको इथरनेट (%s)"
 
-#: ../src/applet.c:238
+#: ../src/applet-dialogs.c:495
 #, c-format
-msgid "Wireless Ethernet (%s)"
-msgstr "ताररहित इथरनेट (%s)"
+msgid "802.11 WiFi (%s)"
+msgstr ""
 
-#: ../src/applet.c:334 ../src/applet.c:360
-msgid "NetworkManager Applet"
-msgstr "सञ्जालप्रबन्धक एप्लेट"
+#: ../src/applet-dialogs.c:502
+#, c-format
+msgid "GSM (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:504
+#, c-format
+msgid "CDMA (%s)"
+msgstr ""
+
+#. --- General ---
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
+msgid "General"
+msgstr ""
+
+#: ../src/applet-dialogs.c:516
+msgid "Interface:"
+msgstr "इन्टरफेस:"
+
+#: ../src/applet-dialogs.c:536
+msgid "Hardware Address:"
+msgstr "हार्डवेयर ठेगाना:"
+
+#. Driver
+#: ../src/applet-dialogs.c:550
+msgid "Driver:"
+msgstr "ड्राइभर:"
+
+#: ../src/applet-dialogs.c:585
+msgid "Speed:"
+msgstr "गति:"
+
+#: ../src/applet-dialogs.c:600
+#, fuzzy
+msgid "Security:"
+msgstr "ताररहित सुरक्षा:"
 
-#: ../src/applet.c:336
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+msgid "IPv4"
+msgstr ""
+
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "पूर्वनिर्धारित राउट:"
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+msgid "IPv6"
+msgstr ""
+
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+msgid "Ignored"
+msgstr ""
+
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "प्रकार:"
+
+#: ../src/applet-dialogs.c:822
+msgid "VPN Gateway:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:828
+#, fuzzy
+msgid "VPN Username:"
+msgstr "प्रयोगकर्ता नाम:"
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "भीपीएन जडान"
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr ""
+
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:957
+#, fuzzy
+msgid "No valid active connections found!"
+msgstr "सक्रिय जडान छैन!"
+
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2006 Red Hat, Inc.\n"
-"Copyright © 2005-2006 Novell, Inc."
+"Copyright © 2004-2014 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.c:338 ../src/applet.c:364
-msgid "Notification area applet for managing your network devices and connections."
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
 msgstr "तपाईको सञ्जाल यन्त्रहरू र जडानहरू प्रबन्धको लागि सूचना क्षेत्र एप्लेट ।"
 
-#: ../src/applet.c:341 ../src/applet.c:368
-msgid "translator-credits"
-msgstr "श्यामकृष्ण बल"
+#: ../src/applet-dialogs.c:990
+#, fuzzy
+msgid "NetworkManager Website"
+msgstr "सञ्जालप्रबन्धक एप्लेट"
 
-#: ../src/applet.c:362
-msgid ""
-"Copyright © 2004-2005 Red Hat, Inc.\n"
-"Copyright © 2005-2006 Novell, Inc."
+#: ../src/applet-dialogs.c:1005
+msgid "Missing resources"
 msgstr ""
-"Copyright © 2004-2005 Red Hat, Inc.\n"
-"Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/applet.c:424
-msgid "VPN Login Failure"
-msgstr "भीपीएन लगइन असफलता"
+#: ../src/applet-dialogs.c:1030
+msgid "Mobile broadband network password"
+msgstr ""
 
-#: ../src/applet.c:425
+#: ../src/applet-dialogs.c:1039
 #, c-format
-msgid "Could not start the VPN connection '%s' due to a login failure."
-msgstr "लगइन असफलताको कारणले भीपीएन जडान '%s' सुरु गर्न सकेन ।"
+msgid "A password is required to connect to '%s'."
+msgstr ""
 
-#: ../src/applet.c:429
-msgid "VPN Start Failure"
-msgstr "भीपीएन सुरुआत असफलता"
+#: ../src/applet-dialogs.c:1054
+msgid "Password:"
+msgstr "पासवर्ड:"
+
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr ""
 
-#: ../src/applet.c:430
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"Could not start the VPN connection '%s' due to a failure launching the VPN "
-"program."
-msgstr "भीपीएन कार्यक्रम सुरुआत गर्दा असफलताका कारण भीपीएन जडान '%s' सुरु गर्न सकेन ।"
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
 
-#: ../src/applet.c:434 ../src/applet.c:444
-msgid "VPN Connect Failure"
-msgstr "भीपीएन जडान असफलता"
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr ""
 
-#: ../src/applet.c:435
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr ""
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
-msgid "Could not start the VPN connection '%s' due to a connection error."
-msgstr "जडान त्रुटिका कारण भीपीएन जडान '%s' सुरु गर्न सकेन ।"
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr ""
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr ""
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
+
+#: ../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
+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: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
+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: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
+msgid "_Delete"
+msgstr ""
 
-#: ../src/applet.c:439
-msgid "VPN Configuration Error"
-msgstr "भीपीएन कन्फिगरेसन त्रुटि"
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+msgid "Ig_nore automatically obtained routes"
+msgstr ""
 
-#: ../src/applet.c:440
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
+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
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr ""
+
+#: ../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…"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+msgid "Choose a Connection Type"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+msgid ""
+"Select the type of connection you wish to create.\n"
+"\n"
+"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."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "प्रशारण ठेगाना:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "PAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "सञ्जाल जडान छैन"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "इन्टरफेस:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "प्राथमिक डीएनएस:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+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.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "सक्रिय जडान छैन!"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "सञ्जालीकरण सक्षम पार्नुहोस्"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr ""
+
+#: ../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
-msgid "The VPN connection '%s' was not correctly configured."
-msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
+msgid "default"
+msgstr ""
 
-#: ../src/applet.c:445
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "आईपी ठेगाना:"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "आईपी ठेगाना:"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+msgid "device"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:591
+#, fuzzy
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "जडान त्रुटिका कारण भीपीएन जडान '%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.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"Could not start the VPN connection '%s' because the VPN server did not "
-"return an adequate network configuration."
-msgstr "भीपीएन जडान '%s' सुरु गर्न सकेन किनभने भीपीएन सर्भरले एउटा उपयुक्त सञ्जाल कन्फिगरेसन फर्काउन सकेन ।"
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
+msgstr ""
 
-#: ../src/applet.c:515
-msgid "VPN Login Message"
-msgstr "भीपीएन लगइन सन्देश"
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/applet.c:739 ../src/applet.c:2536 ../src/other-network-dialog.c:453
-#: ../src/passphrase-dialog.c:232
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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
+#, fuzzy
+msgid "_Username:"
+msgstr "प्रयोगकर्ता नाम:"
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+#, 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
+#, 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-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
+#, fuzzy
+msgid "Automatic"
+msgstr "स्वचालित (पूर्वानिर्धारण)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+#, fuzzy
+msgid "_Speed:"
+msgstr "गति:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr ""
+
+#: ../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
+msgid "_Device:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+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 ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
-msgstr "सञ्जाल प्रबन्धक एप्लेटले केही आवश्यक संसाधानहरू फेला पार्न सकेन (ग्लेड फाइल फेला परेन) ।"
+"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-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "पूर्वनिर्धारित राउट:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "प्रशारण ठेगाना:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+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.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "जडान गर्नुहोस्"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+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:186
+#: ../src/connection-editor/page-ip6.c:204
+msgid "Shared to other computers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#, fuzzy
+msgid "_Method:"
+msgstr "ईएपी विधि:"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#, fuzzy
+msgid "Addresses"
+msgstr "आईपी ठेगाना:"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr ""
+
+#: ../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
+msgid "S_earch domains:"
+msgstr ""
+
+#: ../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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+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:17
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+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
+msgid "Basic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "Nu_mber:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Advanced"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "_APN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#, fuzzy
+msgid "N_etwork ID:"
+msgstr "सञ्जाल नाम:"
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#, fuzzy
+msgid "Sho_w passwords"
+msgstr "पासवर्ड देखाउनुहोस्"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#, fuzzy
+msgid "Authentication"
+msgstr "प्रमाणीकरण:"
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
+msgid "Allowed methods:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+msgid "Compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
+msgid "_Require 128-bit encryption"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+msgid "Use _stateful MPPE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Allow _BSD data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
+msgid "Allow _Deflate data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Use TCP _header compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid "Send PPP _echo packets"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "सक्रिय जडान छैन!"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+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.h:3
+msgid "Cloned MAC _address:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
+msgid "Device name + number"
+msgstr ""
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "ताररहित सुरक्षा:"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
+msgstr ""
 
-#: ../src/applet.c:751
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Allowed Authentication Methods"
+msgstr "प्रमाणीकरण:"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#, fuzzy
+msgid "_MSCHAP"
+msgstr "MSCHAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#, fuzzy
+msgid "MSCHAP v_2"
+msgstr "MSCHAPV2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "हार्डवेयर ठेगाना:"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+msgid "Import a saved VPN configuration..."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:332
+#, fuzzy
+msgid "Could not create new connection"
+msgstr "सञ्जाल जडान छैन"
+
+#: ../src/connection-editor/connection-helpers.c:469
+#, fuzzy
+msgid "Connection delete failed"
+msgstr "जडान स्थापना भयो"
+
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr "सञ्जाल यन्त्र \"%s (%s)\" ले ताररहित स्क्यानिङलाई समर्थन गरेन ।"
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Address"
+msgstr "आईपी ठेगाना:"
 
-#: ../src/applet.c:759
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr ""
+
+#: ../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
+msgid "Gateway"
+msgstr ""
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr ""
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr "सञ्जाल यन्त्र \"%s (%s)\" ले लिङ्क अन्वेषणलाई समर्थन गरेन ।"
+msgid "Editing %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+msgid "Editor initializing..."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "जडान स्थापना भयो"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+#, 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:419
+msgid "_Save"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "सञ्जाल जडान छैन"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not edit connection"
+msgstr "सञ्जाल जडान छैन"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+#, fuzzy
+msgid "Connection add failed"
+msgstr "जडान स्थापना भयो"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
+msgid "_Close"
+msgstr ""
 
-#: ../src/applet.c:906
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+#, fuzzy
+msgid "Connection _name:"
+msgstr "जडान जानकारी"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr ""
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
-msgid "Preparing device %s for the wired network..."
-msgstr "तार भएको सञ्जालका लागि यन्त्र %s तयार गरिँदैछ..."
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/applet.c:908
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
-msgid "Preparing device %s for the wireless network '%s'..."
-msgstr "ताररहित सञ्जाल '%s' का लागि %s यन्त्र तयार गरिँदैछ..."
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/applet.c:916
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
-msgid "Configuring device %s for the wired network..."
-msgstr "तार भएको सञ्जालका लागि यन्त्र %s कन्फिगर गरिँदैछ..."
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/applet.c:918
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
-msgid "Attempting to join the wireless network '%s'..."
-msgstr "ताररहित सञ्जाल '%s' जडान गर्न प्रयास गरिँदैछ..."
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/applet.c:926
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
-msgid "Waiting for Network Key for the wireless network '%s'..."
-msgstr "ताररहित सञ्जाल '%s' का लागि सञ्जाल कुञ्जीका लागि प्रतिक्षा गर्देछ..."
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr ""
 
-#: ../src/applet.c:934 ../src/applet.c:944
-msgid "Requesting a network address from the wired network..."
-msgstr "तार भएको सञ्जालबाट सञ्जाल ठेगाना अनुरोध गर्दैछ..."
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr ""
 
-#: ../src/applet.c:936 ../src/applet.c:946
+#: ../src/connection-editor/nm-connection-list.c:684
+#, fuzzy
+msgid "Edit the selected connection"
+msgstr "तारसहित सञ्जाल जडान"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
-msgid "Requesting a network address from the wireless network '%s'..."
-msgstr "ताररहित सञ्जाल '%s' बाट सञ्जाल ठेगाना अनुरोध गर्दैछ..."
+msgid "Don't know how to create '%s' connections"
+msgstr ""
 
-#: ../src/applet.c:954
-msgid "Finishing connection to the wired network..."
-msgstr "तार भएको सञ्जालमा जडान समाप्त गर्दैछ..."
+#: ../src/connection-editor/nm-connection-list.c:933
+#, fuzzy
+msgid "Error creating connection"
+msgstr "सक्रिय जडान छैन!"
 
-#: ../src/applet.c:956
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "जडान जानकारी प्रदर्शन गर्दा त्रुटि:"
+
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
-msgid "Finishing connection to the wireless network '%s'..."
-msgstr "ताररहित सञ्जाल '%s' मा जडान समाप्त गर्दैछ..."
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
 
-#: ../src/applet.c:1073
-msgid "NetworkManager is not running"
-msgstr "सञ्जालप्रबन्धक संचालन भइरहेको छैन ।"
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr ""
 
-#: ../src/applet.c:1081 ../src/applet.c:1828
-msgid "Networking disabled"
-msgstr "सञ्जालीकरण अक्षम गरियो"
+#: ../src/connection-editor/page-8021x-security.c:111
+msgid "Could not load 802.1x Security user interface."
+msgstr ""
 
-#: ../src/applet.c:1086
-msgid "No network connection"
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr ""
+
+#: ../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
+msgid "Could not load Bluetooth user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "सञ्जाल जडान छैन"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "सञ्जालमा लगइन गर्नुहोस्"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "तार भएको सञ्जाल"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "प्राथमिक डीएनएस:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
 msgstr "सञ्जाल जडान छैन"
 
-#: ../src/applet.c:1091
-msgid "Wired network connection"
+#: ../src/connection-editor/page-bridge.c:213
+msgid "Could not load bridge user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "तारसहित सञ्जाल जडान"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+msgid "Could not load bridge port user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+msgid "Could not load DCB user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:129
+msgid "Could not load DSL user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:214
+#, fuzzy, c-format
+msgid "DSL connection %d"
+msgstr "'%s' लाई भीपीएन जडान"
+
+#: ../src/connection-editor/page-ethernet.c:74
+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:328
+msgid "Could not load ethernet user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:457
+msgid "Ethernet device"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+msgid "cloned MAC"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:465
+#, fuzzy
+msgid "Wake-on-LAN password"
+msgstr "पासवर्ड देखाउनुहोस्"
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, fuzzy, c-format
+msgid "Ethernet connection %d"
 msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet.c:1095
-msgid "Connected to an Ad-Hoc wireless network"
-msgstr "एउटा एड-हक ताररहित सञ्जालमा सम्पर्क स्थापना गरियो ।"
+#. 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
+#, fuzzy
+msgid "Default"
+msgstr "पूर्वनिर्धारित राउट:"
 
-#: ../src/applet.c:1097
+#: ../src/connection-editor/page-general.c:52
+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 "सञ्जालप्रबन्धक चलिरहेको छैन..."
+
+#: ../src/connection-editor/page-general.c:350
+msgid "Could not load General user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "'%s' (%d%%) मा ताररहित सञ्जाल जडान"
+msgid "InfiniBand connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
+#, fuzzy
+msgid "Automatic (VPN)"
+msgstr "स्वचालित (पूर्वानिर्धारण)"
+
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
+msgid "Automatic (VPN) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
+#, fuzzy
+msgid "Automatic (PPPoE)"
+msgstr "स्वचालित (पूर्वानिर्धारण)"
+
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
+msgid "Automatic (PPPoE) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:135
+#, fuzzy
+msgid "Automatic (DHCP)"
+msgstr "स्वचालित (पूर्वानिर्धारण)"
+
+#: ../src/connection-editor/page-ip4.c:136
+msgid "Automatic (DHCP) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
+msgid "Link-Local Only"
+msgstr ""
 
-#: ../src/applet.c:1118
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+msgid "Additional DNS ser_vers:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+msgid "Additional s_earch domains:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
-msgid "VPN connection to '%s'"
-msgstr "'%s' लाई भीपीएन जडान"
+msgid "Editing IPv4 routes for %s"
+msgstr ""
 
-#: ../src/applet.c:1126
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1160
+msgid "Could not load IPv4 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
-msgid "VPN connecting to '%s'"
-msgstr "'%s' मा भीपीएन जडान गर्दै"
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1539
-msgid "_Connect to Other Wireless Network..."
-msgstr "अन्य ताररहित सञ्जालमा जडान गर्नुहोस्..."
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1560
-msgid "Create _New Wireless Network..."
-msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्..."
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1683
-msgid "_VPN Connections"
-msgstr "भीपीएन जडान"
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1728
-msgid "_Configure VPN..."
-msgstr "भीपीएन कन्फिगर गर्नुहोस्..."
+#: ../src/connection-editor/page-ip6.c:148
+msgid "Ignore"
+msgstr ""
 
-#: ../src/applet.c:1732
-msgid "_Disconnect VPN..."
-msgstr "भीपीएन विच्छेदन गर्नुहोस्..."
+#: ../src/connection-editor/page-ip6.c:172
+#, fuzzy
+msgid "Automatic, DHCP only"
+msgstr "स्वचालित (पूर्वानिर्धारण)"
+
+#: ../src/connection-editor/page-ip6.c:964
+#, c-format
+msgid "Editing IPv6 routes for %s"
+msgstr ""
 
-#: ../src/applet.c:1754
-msgid "_Dial Up Connections"
-msgstr "जडान डायलअप गर्नुहोस्"
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1157
+msgid "Could not load IPv6 user interface."
+msgstr ""
 
-#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item
-#: ../src/applet.c:1765
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
-msgid "Connect to %s..."
-msgstr "%s मा जडान गर्नुहोस्..."
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1772
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
-msgid "Disconnect from %s..."
-msgstr "%s बाट विच्छेदन गर्नुहोस्..."
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:1822
-msgid "No network devices have been found"
-msgstr "सञ्जाल यन्त्र फेला परेन"
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/applet.c:2014
-msgid "NetworkManager is not running..."
-msgstr "सञ्जालप्रबन्धक चलिरहेको छैन..."
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2193
-msgid "Enable _Networking"
-msgstr "सञ्जालीकरण सक्षम पार्नुहोस्"
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2199
-msgid "Enable _Wireless"
-msgstr "ताररहित सक्षम पार्नुहोस्"
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
 
-#. 'Connection Information' item
-#: ../src/applet.c:2205
-msgid "Connection _Information"
-msgstr "जडान जानकारी"
+#: ../src/connection-editor/page-master.c:260
+#, c-format
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2216
-msgid "_Help"
-msgstr "मद्दत"
+#: ../src/connection-editor/page-master.c:385
+#, c-format
+msgid "%s slave %d"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2225
-msgid "_About"
-msgstr "बारेमा"
+#: ../src/connection-editor/page-mobile.c:310
+msgid "Could not load mobile broadband user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:327
+msgid "Unsupported mobile broadband connection type."
+msgstr ""
 
-#: ../src/applet.c:2697
+#. Fall back to just asking for GSM vs. CDMA
+#: ../src/connection-editor/page-mobile.c:529
+msgid "Select Mobile Broadband Provider Type"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
-"The NetworkManager applet could not find some required resources.  It cannot "
-"continue.\n"
-msgstr "सञ्जालप्रबन्धक एप्लेटले केही आवश्यक संसाधन फेला पार्न सकेन । यसले जारी राख्न सक्दैन ।\n"
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
 
-#: ../src/applet.glade.h:1
-msgid " "
-msgstr " "
+#: ../src/connection-editor/page-mobile.c:561
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+msgstr ""
 
-#: ../src/applet.glade.h:2
-msgid "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">जडान जानकारी सक्रिय पार्नुहोस्</span>"
+#: ../src/connection-editor/page-mobile.c:568
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr ""
 
-#: ../src/applet.glade.h:4
-#, no-c-format
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+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:258
+msgid "PAP"
+msgstr "PAP"
+
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
+#, fuzzy
+msgid "CHAP"
+msgstr "MSCHAP"
+
+#: ../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
+#, fuzzy
+msgid "MSCHAPv2"
+msgstr "MSCHAPV2"
+
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
+msgid "MSCHAP"
+msgstr "MSCHAP"
+
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:136
+msgid "none"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:196
+#, c-format
+msgid "Editing PPP authentication methods for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:281
+msgid "Could not load PPP user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+msgid "Could not load team user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "'%s' लाई भीपीएन जडान"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "सञ्जाल जडान छैन"
+
+#: ../src/connection-editor/page-vlan.c:596
+msgid "Could not load vlan user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "'%s' लाई भीपीएन जडान"
+
+#: ../src/connection-editor/page-vpn.c:103
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:118
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
+#, fuzzy, c-format
+msgid "VPN connection %d"
+msgstr "'%s' लाई भीपीएन जडान"
+
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
+"The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Error: no VPN service type."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">ताररहित सञ्जालद्वारा आवश्यक पासफ्रेज</span>\n"
-"\n"
-"ताररहित सञ्जाल'%"
-"s' पहुँच गर्न एउटा पासफ्रेज वा गुप्तिकरण कुञ्जीको आवश्यक पर्दछ ।"
 
-#: ../src/applet.glade.h:8
-#, no-c-format
+#: ../src/connection-editor/page-vpn.c:254
+#, fuzzy
+msgid "Choose a VPN Connection Type"
+msgstr "भीपीएन जडान"
+
+#: ../src/connection-editor/page-vpn.c:255
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
-"\n"
-"%s  It will not be completely functional."
+"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 ""
-"<span weight=\"bold\" size=\"larger\">सञ्जाल कार्यात्मकता </span> घटाउछ\n"
-"\n"
-"%s  यो पूर्ण कार्यात्मकता हुने छैन।"
 
-#: ../src/applet.glade.h:12
-#, no-c-format
+#: ../src/connection-editor/page-wifi.c:77
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
-"span>\n"
-"\n"
-"You have chosen to log in to the wireless network '%s'.  If you are sure "
-"that this wireless network is secure, click the checkbox below and "
-"NetworkManager will not require confirmation on subsequent log ins."
+"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
+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
+#, c-format
+msgid "%u (%u MHz)"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:450
+msgid "Could not load Wi-Fi user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+msgid "Wi-Fi device"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "'%s' लाई भीपीएन जडान"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+msgid "WEP 128-bit Passphrase"
+msgstr "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
+#, fuzzy
+msgid "Dynamic WEP (802.1x)"
+msgstr "गतिशील WEP"
+
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+#, fuzzy
+msgid "WPA & WPA2 Personal"
+msgstr "WPA2 व्यक्तिगत"
+
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+#, fuzzy
+msgid "WPA & WPA2 Enterprise"
+msgstr "WPA2 उद्यमशिलता"
+
+#: ../src/connection-editor/page-wifi-security.c:413
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
+msgstr "ताररहित सुरक्षा:"
+
+#: ../src/connection-editor/page-wifi-security.c:426
+msgid "Could not load Wi-Fi security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">ताररहित सञ्जाल लगइन स्वीकृति</span>\n"
+
+#: ../src/connection-editor/page-wifi-security.c:512
+#, c-format
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:138
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "भीपीएन जडान '%s' सुरुआत गर्न सक्दैन"
+
+#: ../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"
-"तपाईले ताररहित सञ्जाल '%s' मा लगइन छान्नु भएको छ। यदि तपाई निश्चिन्त हुनुहुन्छ कि "
-"ताररहित सञ्जाल सुरक्षित छ, तलको जाँच बाकसमा क्लिक गर्नुहोस् र सञ्जाल प्रबन्धकलाई अनुवर्ती लगइनहरूमा स्वीकृति आवश्यक पर्ने छैन ।"
+"Error: %s."
+msgstr ""
 
-#: ../src/applet.glade.h:15
-msgid "Anonymous Identity:"
-msgstr "बेनामी पहिचान:"
+#: ../src/connection-editor/vpn-helpers.c:141
+msgid "unknown error"
+msgstr ""
 
-#: ../src/applet.glade.h:16
-msgid "Authentication:"
-msgstr "प्रमाणीकरण:"
+#: ../src/connection-editor/vpn-helpers.c:215
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr ""
 
-#: ../src/applet.glade.h:17
-msgid "Broadcast Address:"
-msgstr "प्रशारण ठेगाना:"
+#: ../src/connection-editor/vpn-helpers.c:217
+msgid "_Replace"
+msgstr ""
 
-#: ../src/applet.glade.h:18
-msgid "CA Certificate File:"
-msgstr "सीए प्रमाणपत्र फाइल:"
+#: ../src/connection-editor/vpn-helpers.c:219
+#, c-format
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr ""
 
-#: ../src/applet.glade.h:19
-msgid "C_onnect"
-msgstr "जडान गर्नुहोस्"
+#: ../src/connection-editor/vpn-helpers.c:255
+#, fuzzy
+msgid "Cannot export VPN connection"
+msgstr "भीपीएन जडान '%s' सुरुआत गर्न सक्दैन"
+
+#: ../src/connection-editor/vpn-helpers.c:257
+#, fuzzy, c-format
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+msgstr "भीपीएन जडान '%s' सही तरीकाले कन्फिगर गरिएको थिएन ।"
 
-#: ../src/applet.glade.h:20
-msgid "Client Certificate File:"
-msgstr "क्लाइन्ट प्रमाणपत्र फाइल:"
+#: ../src/connection-editor/vpn-helpers.c:292
+#, fuzzy
+msgid "Export VPN connection..."
+msgstr "भीपीएन जडान"
 
-#: ../src/applet.glade.h:21
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
+#, fuzzy
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"सञ्जाल प्रबन्धक एप्लेटले केही आवश्यक संसाधानहरू फेला पार्न सकेन (ग्लेड फाइल फेला परेन) ।"
+
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr ""
+
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr ""
+
+#: ../src/info.ui.h:1
 msgid "Connection Information"
 msgstr "जडान जानकारी"
 
-#: ../src/applet.glade.h:22
-msgid "Default Route:"
-msgstr "पूर्वनिर्धारित राउट:"
-
-#: ../src/applet.glade.h:23
-msgid "Destination Address:"
-msgstr "गन्तब्य ठेगाना:"
+#: ../src/info.ui.h:3
+#, fuzzy
+msgid "Active Network Connections"
+msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet.glade.h:24
-msgid "Driver:"
-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/applet.glade.h:25
-msgid "EAP Method:"
-msgstr "ईएपी विधि:"
+#. Device
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+msgid "Your Device:"
+msgstr ""
 
-#: ../src/applet.glade.h:26
-msgid "Hardware Address:"
-msgstr "हार्डवेयर ठेगाना:"
+#. Provider
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
+msgid "Your Provider:"
+msgstr ""
 
-#: ../src/applet.glade.h:27
-msgid "IP Address:"
-msgstr "आईपी ठेगाना:"
+#. Plan and APN
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
+msgid "Your Plan:"
+msgstr ""
 
-#: ../src/applet.glade.h:28
-msgid "Identity:"
-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/applet.glade.h:29
-msgid "Interface:"
-msgstr "इन्टरफेस:"
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+msgid "Confirm Mobile Broadband Settings"
+msgstr ""
 
-#: ../src/applet.glade.h:30
-msgid "Key Type:"
-msgstr "कुञ्जी प्रकार:"
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
+msgstr ""
 
-#: ../src/applet.glade.h:31
-msgid "Key management:"
-msgstr "कुञ्जी व्यवस्थापन:"
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
+msgstr ""
 
-#: ../src/applet.glade.h:32
-msgid "Key:"
-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/applet.glade.h:33
+#: ../src/libnma/nma-mobile-wizard.c:500
+#: ../src/libnm-gtk/nm-mobile-wizard.c:501
 msgid ""
-"None\n"
-"WEP 128-bit Passphrase\n"
-"WEP 64/128-bit Hex\n"
-"WEP 64/128-bit ASCII\n"
+"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"
-"WEP 128-bit पासफ्रेज\n"
-"WEP 64/128-bit हेक्स\n"
-"WEP 64/128-bit ASCII\n"
 
-#: ../src/applet.glade.h:38
+#: ../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
+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
+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 ""
+
+#: ../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
+msgid "Installed GSM device"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../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
 msgid ""
-"Open System\n"
-"Shared Key"
+"This assistant helps you easily set up a mobile broadband connection to a "
+"cellular (3G) network."
 msgstr ""
-"खुल्ला प्रणाली\n"
-"साझेदारी कुञ्जी"
 
-#: ../src/applet.glade.h:40
-msgid "Other Wireless Network..."
-msgstr "अन्य ताररहित सञ्जाल..."
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+msgid "You will need the following information:"
+msgstr ""
 
-#: ../src/applet.glade.h:41
-msgid "Passphrase:"
-msgstr "पासफ्रेज:"
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
+msgid "Your broadband provider's name"
+msgstr ""
 
-#: ../src/applet.glade.h:42
-msgid "Password:"
-msgstr "पासवर्ड:"
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
+msgid "Your broadband billing plan name"
+msgstr ""
 
-#: ../src/applet.glade.h:43
-msgid "Phase2 Type:"
-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 ""
 
-#: ../src/applet.glade.h:44
-msgid "Primary DNS:"
-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 ""
 
-#: ../src/applet.glade.h:45
-msgid "Private Key File:"
-msgstr "निजी कुञ्जी फाइल:"
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+msgid "Any device"
+msgstr ""
 
-#: ../src/applet.glade.h:46
-msgid "Private Key Password:"
-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/applet.glade.h:47
-msgid "Secondary DNS:"
-msgstr "गौण डीएनएस:"
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr ""
 
-#: ../src/applet.glade.h:48
-msgid "Select the CA Certificate File"
-msgstr "सीए प्रमाणपत्र फाइल चयन गर्नुहोस्"
+#: ../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/applet.glade.h:49
-msgid "Select the Client Certificate File"
-msgstr "क्लाइन्ट प्रमाणपत्र फाइल चयन गर्नुहोस्"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/applet.glade.h:50
-msgid "Select the Private Key File"
-msgstr "निजी कुञ्जी फाइल चयन गर्नुहोस्"
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+msgid "Ask for this password every time"
+msgstr ""
 
-#: ../src/applet.glade.h:51
-msgid "Show key"
-msgstr "कुञ्जी देखाउनुहोस्"
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+msgid "The password is not required"
+msgstr ""
 
-#: ../src/applet.glade.h:52
-msgid "Show passphrase"
-msgstr "पासफ्रेज देखाउनुहोस्"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "गौण डीएनएस:"
 
-#: ../src/applet.glade.h:53
-msgid "Show password"
-msgstr "पासवर्ड देखाउनुहोस्"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "निजी कुञ्जी पासवर्ड:"
 
-#: ../src/applet.glade.h:54
-msgid "Show passwords"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
 msgstr "पासवर्ड देखाउनुहोस्"
 
-#: ../src/applet.glade.h:55
-msgid "Speed:"
-msgstr "गति:"
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "तारसहित सञ्जाल जडान"
 
-#: ../src/applet.glade.h:56
-msgid "Subnet Mask:"
-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/applet.glade.h:57
-msgid "Type:"
-msgstr "प्रकार:"
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
+msgid "New..."
+msgstr ""
 
-#: ../src/applet.glade.h:58
-msgid "User Name:"
-msgstr "प्रयोगकर्ता नाम:"
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "कुनै पनि होइन"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+msgid "C_reate"
+msgstr ""
 
-#: ../src/applet.glade.h:59
-msgid "Wireless Network Key Required"
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "ताररहित सञ्जाल कुञ्जी चाहियो"
 
-#: ../src/applet.glade.h:60
-msgid "Wireless _adapter:"
-msgstr "ताररहित एडप्टर:"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
 
-#: ../src/applet.glade.h:61
-msgid "_Always Trust this Wireless Network"
-msgstr "सधै यो ताररहित सञ्जाललाई विश्वास गर्नुहोस्"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
+msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्"
 
-#: ../src/applet.glade.h:62
-msgid "_Don't remind me again"
-msgstr "मलाई फेरि नसम्झाउनुहोस्"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+msgid "New Wi-Fi network"
+msgstr ""
 
-#: ../src/applet.glade.h:63
-msgid "_Login to Network"
-msgstr "सञ्जालमा लगइन गर्नुहोस्"
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "तपाईँले जडान गर्न चाहनुभएको ताररहित सञ्जालको नाम प्रविष्ट गर्नुहोस् ।"
 
-#: ../src/applet.glade.h:64
-msgid "_Network Name:"
-msgstr "सञ्जाल नाम:"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "अन्य ताररहित सञ्जालमा जडान गर्नुहोस्"
+
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+msgid "Hidden Wi-Fi network"
+msgstr ""
 
-#: ../src/applet.glade.h:65
-msgid "_Wireless Security:"
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, 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:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
 msgstr "ताररहित सुरक्षा:"
 
-#: ../src/eggtrayicon.c:134
-msgid "Orientation"
-msgstr "अभिमुखीकरण"
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#, fuzzy
+msgid "C_onnection:"
+msgstr "जडान गर्नुहोस्"
 
-#: ../src/eggtrayicon.c:135
-msgid "The orientation of the tray."
-msgstr "ट्रेको अभिमुखीकरण ।"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "ताररहित एडप्टर:"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+msgid "Wired"
+msgstr ""
 
-#: ../src/menu-items.c:88
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
 #, c-format
-msgid "Wired Network (%s)"
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr ""
+
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+
+#: ../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
+msgid "EVDO"
+msgstr ""
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:68
+msgid "HSPA+"
+msgstr ""
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr ""
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr ""
+
+#: ../src/mb-menu-item.c:141
+#, fuzzy, c-format
+msgid "Home network (%s)"
 msgstr "तार भएको सञ्जाल (%s)"
 
-#: ../src/menu-items.c:91
-msgid "_Wired Network"
+#: ../src/mb-menu-item.c:143
+#, fuzzy, c-format
+msgid "Home network"
 msgstr "तार भएको सञ्जाल"
 
-#: ../src/menu-items.c:163
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr ""
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr ""
+
+#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
 #, c-format
-msgid "Wireless Network (%s)"
-msgid_plural "Wireless Networks (%s)"
-msgstr[0] "ताररहित सञ्जाल (%s)"
-msgstr[1] "ताररहित सञ्जालहरू (%s)"
+msgid "%s (%s roaming)"
+msgstr ""
 
-#: ../src/menu-items.c:165
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "ताररहित सञ्जाल"
-msgstr[1] "ताररहित सञ्जालहरू"
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
+#, c-format
+msgid "%s (roaming)"
+msgstr ""
 
-#: ../src/menu-items.c:344
-msgid " (invalid Unicode)"
-msgstr " (अवैध युनिकोड)"
+#: ../src/mb-menu-item.c:170
+#, fuzzy, c-format
+msgid "Roaming network (%s)"
+msgstr "तार भएको सञ्जाल (%s)"
 
-#: ../src/other-network-dialog.c:352
+#: ../src/mb-menu-item.c:172
+#, fuzzy, c-format
+msgid "Roaming network"
+msgstr "सञ्जालमा लगइन गर्नुहोस्"
+
+#: ../src/mobile-helpers.c:331
 #, c-format
-msgid ""
-"By default, the wireless network's name is set to your computer's name, %s, "
-"with no encryption enabled"
-msgstr "पूर्वानिर्धारित रूपमा, गुप्तिकरण सक्षम नपारीकन, ताररहित सञ्जालको नाम तपाईँको कम्प्युटरको नाममा सेट गरिन्छ, %s"
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
 
-#: ../src/other-network-dialog.c:358
-msgid "Create new wireless network"
-msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्"
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr ""
 
-#: ../src/other-network-dialog.c:359
-msgid ""
-"Enter the name and security settings of the wireless network you wish to "
-"create."
-msgstr "तपाईँले सिर्जना गर्न चाहनुभएको ताररहित सञ्जालको नाम र सुरक्षा सेटिङ प्रविष्ट गर्नुहोस् ।"
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr ""
 
-#: ../src/other-network-dialog.c:363
-msgid "Create New Wireless Network"
-msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्"
+#: ../src/mobile-helpers.c:619
+#, fuzzy, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "'%s' (%d%%) मा ताररहित सञ्जाल जडान"
 
-#: ../src/other-network-dialog.c:368
-msgid "Existing wireless network"
-msgstr "ताररहित सञ्जाल अवस्थित गर्दै"
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr ""
 
-#: ../src/other-network-dialog.c:369
-msgid "Enter the name of the wireless network to which you wish to connect."
-msgstr "तपाईँले जडान गर्न चाहनुभएको ताररहित सञ्जालको नाम प्रविष्ट गर्नुहोस् ।"
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "भीपीएन जडान"
 
-#: ../src/other-network-dialog.c:371
-msgid "Connect to Other Wireless Network"
-msgstr "अन्य ताररहित सञ्जालमा जडान गर्नुहोस्"
+#: ../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/wireless-security/eap-method.c:452
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
 
-#: ../src/passphrase-dialog.c:219
-msgid "Error connecting to wireless network"
-msgstr "ताररहित सञ्जालमा जडान गर्दा त्रुटि"
+#: ../src/wireless-security/eap-method.c:455
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr "GTC"
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "बेनामी पहिचान:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "प्रमाणीकरण:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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
+#, fuzzy
+msgid "Anony_mous identity:"
+msgstr "बेनामी पहिचान:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+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
+#, fuzzy
+msgid "_Inner authentication:"
+msgstr "प्रमाणीकरण:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+msgid "MD5"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "C_A certificate:"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+msgid "PEAP _version:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/passphrase-dialog.c:220
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
+msgid "Unencrypted private keys are insecure"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:299
 msgid ""
-"The requested wireless network requires security capabilities unsupported by "
-"your hardware."
-msgstr "अनुरोध गरिएको ताररहित सञ्जाललाई सुरक्षा क्षमताको आवश्यक पर्दछ जुन तपाईँको हार्डवेयरद्वारा असमर्थित छ ।"
+"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 ""
+
+#: ../src/wireless-security/eap-method-tls.c:475
+msgid "Choose your personal certificate..."
+msgstr ""
 
-#: ../src/vpn-password-dialog.c:154 ../src/vpn-password-dialog.c:191
+#: ../src/wireless-security/eap-method-tls.c:487
+msgid "Choose your private key..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+#, fuzzy
+msgid "I_dentity:"
+msgstr "पहिचान:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+#, fuzzy
+msgid "_User certificate:"
+msgstr "सीए प्रमाणपत्र फाइल:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+#, fuzzy
+msgid "Private _key:"
+msgstr "निजी कुञ्जी फाइल:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+#, fuzzy
+msgid "_Private key password:"
+msgstr "निजी कुञ्जी पासवर्ड:"
+
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "भीपीएन जडान '%s' सुरुआत गर्न सक्दैन"
+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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
+msgid "TLS"
+msgstr "TLS"
+
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
+msgid "Tunneled TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:493
+msgid "Protected EAP (PEAP)"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Au_thentication:"
+msgstr "प्रमाणीकरण:"
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/vpn-password-dialog.c:157
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
 #, c-format
 msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr "भीपीएन जडान प्रकार '%s' का लागि प्रमाणीकरण संवाद फेला पार्न सकेन । तपाईँको प्रणाली प्रशासकलाई सम्पर्क गर्नुहोस् ।"
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr ""
 
-#: ../src/vpn-password-dialog.c:194
+#: ../src/wireless-security/ws-wep-key.c:125
 #, c-format
 msgid ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
-msgstr "त्यहाँ भीपीएन जडान प्रकार '%s' का लागि प्रमाणीकरण संवाद सुरुआत गर्दा त्रुटि थियो । तपाईँको प्रणाली प्रशासकलाई सम्पर्क गर्नुहोस् ।"
+"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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr ""
 
-#: ../src/wireless-security-option.c:157
+#: ../src/wireless-security/ws-wep-key.ui.h:1
+#, fuzzy
+msgid "1 (Default)"
+msgstr "कुनै पनि होइन (पूर्वानिर्धारित)"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:5
 msgid "Open System"
 msgstr "खुल्ला प्रणाली"
 
-#: ../src/wireless-security-option.c:160
+#: ../src/wireless-security/ws-wep-key.ui.h:6
 msgid "Shared Key"
 msgstr "साझेदार गरिएको कुञ्जी"
 
-#: ../src/wireless-security-option.c:207
-msgid "Automatic (Default)"
-msgstr "स्वचालित (पूर्वानिर्धारण)"
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+#, fuzzy
+msgid "_Key:"
+msgstr "कुञ्जी:"
 
-#: ../src/wireless-security-option.c:214
-msgid "AES-CCMP"
-msgstr "AES-CCMP"
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+#, fuzzy
+msgid "Sho_w key"
+msgstr "कुञ्जी देखाउनुहोस्"
 
-#: ../src/wireless-security-option.c:222
-msgid "TKIP"
-msgstr "TKIP"
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x:"
+msgstr ""
 
-#: ../src/wireless-security-option.c:230
-msgid "Dynamic WEP"
-msgstr "गतिशील WEP"
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+msgstr ""
 
-#: ../src/wireless-security-option.c:252
-msgid "None (Default)"
-msgstr "कुनै पनि होइन (पूर्वानिर्धारित)"
+#: ../src/wireless-security/ws-wpa-psk.c:77
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
 
-#: ../src/wireless-security-option.c:257
-msgid "PAP"
-msgstr "PAP"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+#, fuzzy
+msgid "_Type:"
+msgstr "प्रकार:"
 
-#: ../src/wireless-security-option.c:262
-msgid "MSCHAP"
-msgstr "MSCHAP"
+#~ msgid "Passphrase for wireless network %s"
+#~ msgstr "ताररहित सञ्जाल %s का लागि पासफ्रेज"
 
-#: ../src/wireless-security-option.c:267
-msgid "MSCHAPV2"
-msgstr "MSCHAPV2"
+#~ msgid "You are now connected to the Ad-Hoc wireless network '%s'."
+#~ msgstr "तपाईँ हाल अहिले एड-हक ताररहित सञ्जाल '%s' मा जडान हुनुभयो ।"
 
-#: ../src/wireless-security-option.c:272
-msgid "GTC"
-msgstr "GTC"
+#~ msgid "Connection to the wireless network '%s' failed."
+#~ msgstr "ताररहित सञ्जाल '%s' मा जडान असफल भयो ।"
 
-#: ../src/wso-none.c:53
-msgid "None"
-msgstr "कुनै पनि होइन"
+#~ msgid "Could not find some required resources (the glade file)!"
+#~ msgstr "केही आवश्यक संसाधनहरू फेला पार्न सकेन (ग्लेड फाइल)!"
 
-#: ../src/wso-wep-ascii.c:138
-msgid "WEP 64/128-bit ASCII"
-msgstr "WEP 64/128-bit ASCII"
+#~ msgid "Wireless Ethernet (%s)"
+#~ msgstr "ताररहित इथरनेट (%s)"
 
-#: ../src/wso-wep-hex.c:135
-msgid "WEP 64/128-bit Hex"
-msgstr "WEP 64/128-bit हेक्स"
+#~ msgid "translator-credits"
+#~ msgstr "श्यामकृष्ण बल"
 
-#: ../src/wso-wep-passphrase.c:135
-msgid "WEP 128-bit Passphrase"
-msgstr "WEP 128-bit पासफ्रेज"
+#~ msgid ""
+#~ "Copyright © 2004-2005 Red Hat, Inc.\n"
+#~ "Copyright © 2005-2006 Novell, Inc."
+#~ msgstr ""
+#~ "Copyright © 2004-2005 Red Hat, Inc.\n"
+#~ "Copyright © 2005-2006 Novell, Inc."
 
-#: ../src/wso-wpa-eap.c:244
-msgid "PEAP"
-msgstr "PEAP"
+#~ msgid "VPN Login Failure"
+#~ msgstr "भीपीएन लगइन असफलता"
 
-#: ../src/wso-wpa-eap.c:245
-msgid "TLS"
-msgstr "TLS"
+#~ msgid "Could not start the VPN connection '%s' due to a login failure."
+#~ msgstr "लगइन असफलताको कारणले भीपीएन जडान '%s' सुरु गर्न सकेन ।"
 
-#: ../src/wso-wpa-eap.c:246
-msgid "TTLS"
-msgstr "TTLS"
+#~ msgid "VPN Start Failure"
+#~ msgstr "भीपीएन सुरुआत असफलता"
 
-#: ../src/wso-wpa-eap.c:254
-msgid "WPA2 Enterprise"
-msgstr "WPA2 उद्यमशिलता"
+#~ msgid ""
+#~ "Could not start the VPN connection '%s' due to a failure launching the "
+#~ "VPN program."
+#~ msgstr ""
+#~ "भीपीएन कार्यक्रम सुरुआत गर्दा असफलताका कारण भीपीएन जडान '%s' सुरु गर्न सकेन ।"
+
+#~ msgid "VPN Configuration Error"
+#~ msgstr "भीपीएन कन्फिगरेसन त्रुटि"
+
+#~ msgid "The network device \"%s (%s)\" does not support wireless scanning."
+#~ msgstr "सञ्जाल यन्त्र \"%s (%s)\" ले ताररहित स्क्यानिङलाई समर्थन गरेन ।"
 
-#: ../src/wso-wpa-eap.c:256
-msgid "WPA Enterprise"
-msgstr "WPA उद्यमशीलता"
+#~ msgid "The network device \"%s (%s)\" does not support link detection."
+#~ msgstr "सञ्जाल यन्त्र \"%s (%s)\" ले लिङ्क अन्वेषणलाई समर्थन गरेन ।"
 
-#: ../src/wso-wpa-psk.c:178
-msgid "WPA2 Personal"
-msgstr "WPA2 व्यक्तिगत"
+#~ msgid "Preparing device %s for the wired network..."
+#~ msgstr "तार भएको सञ्जालका लागि यन्त्र %s तयार गरिँदैछ..."
+
+#~ msgid "Configuring device %s for the wired network..."
+#~ msgstr "तार भएको सञ्जालका लागि यन्त्र %s कन्फिगर गरिँदैछ..."
+
+#~ msgid "Attempting to join the wireless network '%s'..."
+#~ msgstr "ताररहित सञ्जाल '%s' जडान गर्न प्रयास गरिँदैछ..."
+
+#~ msgid "Waiting for Network Key for the wireless network '%s'..."
+#~ msgstr "ताररहित सञ्जाल '%s' का लागि सञ्जाल कुञ्जीका लागि प्रतिक्षा गर्देछ..."
+
+#~ msgid "Requesting a network address from the wired network..."
+#~ msgstr "तार भएको सञ्जालबाट सञ्जाल ठेगाना अनुरोध गर्दैछ..."
+
+#~ msgid "Finishing connection to the wired network..."
+#~ msgstr "तार भएको सञ्जालमा जडान समाप्त गर्दैछ..."
+
+#~ msgid "Finishing connection to the wireless network '%s'..."
+#~ msgstr "ताररहित सञ्जाल '%s' मा जडान समाप्त गर्दैछ..."
+
+#~ msgid "NetworkManager is not running"
+#~ msgstr "सञ्जालप्रबन्धक संचालन भइरहेको छैन ।"
+
+#~ msgid "Connected to an Ad-Hoc wireless network"
+#~ msgstr "एउटा एड-हक ताररहित सञ्जालमा सम्पर्क स्थापना गरियो ।"
+
+#~ msgid "VPN connecting to '%s'"
+#~ msgstr "'%s' मा भीपीएन जडान गर्दै"
+
+#~ msgid "_Dial Up Connections"
+#~ msgstr "जडान डायलअप गर्नुहोस्"
+
+#~ msgid "Connect to %s..."
+#~ msgstr "%s मा जडान गर्नुहोस्..."
+
+#~ msgid "Disconnect from %s..."
+#~ msgstr "%s बाट विच्छेदन गर्नुहोस्..."
+
+#~ msgid "_Help"
+#~ msgstr "मद्दत"
+
+#~ msgid ""
+#~ "The NetworkManager applet could not find some required resources.  It "
+#~ "cannot continue.\n"
+#~ msgstr ""
+#~ "सञ्जालप्रबन्धक एप्लेटले केही आवश्यक संसाधन फेला पार्न सकेन । यसले जारी राख्न सक्दैन ।\n"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">जडान जानकारी सक्रिय पार्नुहोस्</span>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+#~ "Network</span>\n"
+#~ "\n"
+#~ "A passphrase or encryption key is required to access the wireless network "
+#~ "'%s'."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">ताररहित सञ्जालद्वारा आवश्यक पासफ्रेज</"
+#~ "span>\n"
+#~ "\n"
+#~ "ताररहित सञ्जाल'%s' पहुँच गर्न एउटा पासफ्रेज वा गुप्तिकरण कुञ्जीको आवश्यक पर्दछ ।"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</"
+#~ "span>\n"
+#~ "\n"
+#~ "%s  It will not be completely functional."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">सञ्जाल कार्यात्मकता </span> घटाउछ\n"
+#~ "\n"
+#~ "%s  यो पूर्ण कार्यात्मकता हुने छैन।"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
+#~ "Confirmation</span>\n"
+#~ "\n"
+#~ "You have chosen to log in to the wireless network '%s'.  If you are sure "
+#~ "that this wireless network is secure, click the checkbox below and "
+#~ "NetworkManager will not require confirmation on subsequent log ins."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">ताररहित सञ्जाल लगइन स्वीकृति</span>\n"
+#~ "\n"
+#~ "तपाईले ताररहित सञ्जाल '%s' मा लगइन छान्नु भएको छ। यदि तपाई निश्चिन्त हुनुहुन्छ कि "
+#~ "ताररहित सञ्जाल सुरक्षित छ, तलको जाँच बाकसमा क्लिक गर्नुहोस् र सञ्जाल प्रबन्धकलाई "
+#~ "अनुवर्ती लगइनहरूमा स्वीकृति आवश्यक पर्ने छैन ।"
+
+#~ msgid "Client Certificate File:"
+#~ msgstr "क्लाइन्ट प्रमाणपत्र फाइल:"
+
+#~ msgid "Destination Address:"
+#~ msgstr "गन्तब्य ठेगाना:"
+
+#~ msgid "Key Type:"
+#~ msgstr "कुञ्जी प्रकार:"
+
+#~ msgid "Key management:"
+#~ msgstr "कुञ्जी व्यवस्थापन:"
+
+#~ msgid ""
+#~ "None\n"
+#~ "WEP 128-bit Passphrase\n"
+#~ "WEP 64/128-bit Hex\n"
+#~ "WEP 64/128-bit ASCII\n"
+#~ msgstr ""
+#~ "कुनै पनि होइन\n"
+#~ "WEP 128-bit पासफ्रेज\n"
+#~ "WEP 64/128-bit हेक्स\n"
+#~ "WEP 64/128-bit ASCII\n"
+
+#~ msgid ""
+#~ "Open System\n"
+#~ "Shared Key"
+#~ msgstr ""
+#~ "खुल्ला प्रणाली\n"
+#~ "साझेदारी कुञ्जी"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "अन्य ताररहित सञ्जाल..."
+
+#~ msgid "Passphrase:"
+#~ msgstr "पासफ्रेज:"
+
+#~ msgid "Phase2 Type:"
+#~ msgstr "चरण २ प्रकार:"
+
+#~ msgid "Select the CA Certificate File"
+#~ msgstr "सीए प्रमाणपत्र फाइल चयन गर्नुहोस्"
+
+#~ msgid "Select the Client Certificate File"
+#~ msgstr "क्लाइन्ट प्रमाणपत्र फाइल चयन गर्नुहोस्"
+
+#~ msgid "Select the Private Key File"
+#~ msgstr "निजी कुञ्जी फाइल चयन गर्नुहोस्"
+
+#~ msgid "Show passphrase"
+#~ msgstr "पासफ्रेज देखाउनुहोस्"
+
+#~ msgid "_Always Trust this Wireless Network"
+#~ msgstr "सधै यो ताररहित सञ्जाललाई विश्वास गर्नुहोस्"
+
+#~ msgid "Orientation"
+#~ msgstr "अभिमुखीकरण"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ट्रेको अभिमुखीकरण ।"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgid_plural "Wireless Networks (%s)"
+#~ msgstr[0] "ताररहित सञ्जाल (%s)"
+#~ msgstr[1] "ताररहित सञ्जालहरू (%s)"
+
+#~ msgid "Wireless Network"
+#~ msgid_plural "Wireless Networks"
+#~ msgstr[0] "ताररहित सञ्जाल"
+#~ msgstr[1] "ताररहित सञ्जालहरू"
+
+#~ msgid " (invalid Unicode)"
+#~ msgstr " (अवैध युनिकोड)"
+
+#~ msgid ""
+#~ "By default, the wireless network's name is set to your computer's name, "
+#~ "%s, with no encryption enabled"
+#~ msgstr ""
+#~ "पूर्वानिर्धारित रूपमा, गुप्तिकरण सक्षम नपारीकन, ताररहित सञ्जालको नाम तपाईँको "
+#~ "कम्प्युटरको नाममा सेट गरिन्छ, %s"
+
+#~ msgid "Create new wireless network"
+#~ msgstr "नयाँ ताररहित सञ्जाल सिर्जना गर्नुहोस्"
+
+#~ msgid "Existing wireless network"
+#~ msgstr "ताररहित सञ्जाल अवस्थित गर्दै"
+
+#~ msgid "Error connecting to wireless network"
+#~ msgstr "ताररहित सञ्जालमा जडान गर्दा त्रुटि"
+
+#~ msgid ""
+#~ "The requested wireless network requires security capabilities unsupported "
+#~ "by your hardware."
+#~ msgstr ""
+#~ "अनुरोध गरिएको ताररहित सञ्जाललाई सुरक्षा क्षमताको आवश्यक पर्दछ जुन तपाईँको "
+#~ "हार्डवेयरद्वारा असमर्थित छ ।"
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "भीपीएन जडान प्रकार '%s' का लागि प्रमाणीकरण संवाद फेला पार्न सकेन । तपाईँको "
+#~ "प्रणाली प्रशासकलाई सम्पर्क गर्नुहोस् ।"
+
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "त्यहाँ भीपीएन जडान प्रकार '%s' का लागि प्रमाणीकरण संवाद सुरुआत गर्दा त्रुटि थियो । "
+#~ "तपाईँको प्रणाली प्रशासकलाई सम्पर्क गर्नुहोस् ।"
+
+#~ msgid "AES-CCMP"
+#~ msgstr "AES-CCMP"
+
+#~ msgid "TKIP"
+#~ msgstr "TKIP"
+
+#~ msgid "WEP 64/128-bit Hex"
+#~ msgstr "WEP 64/128-bit हेक्स"
+
+#~ msgid "TTLS"
+#~ msgstr "TTLS"
 
-#: ../src/wso-wpa-psk.c:180
-msgid "WPA Personal"
-msgstr "WPA व्यक्तिगत"
+#~ msgid "WPA Enterprise"
+#~ msgstr "WPA उद्यमशीलता"
 
+#~ msgid "WPA Personal"
+#~ msgstr "WPA व्यक्तिगत"
diff --git a/po/nl.po b/po/nl.po
index df66a5b1..4cc4352c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-11 23:02+0100\n"
-"PO-Revision-Date: 2016-03-25 18:52+0100\n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
+"PO-Revision-Date: 2016-03-31 18:11+0200\n"
 "Last-Translator: Hannie Dumoleyn <hannie@ubuntu-nl.org>\n"
 "Language-Team: Dutch <gnome-nl-list@gnome.org>\n"
 "Language: nl\n"
@@ -25,7 +25,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-05-18 08:04+0000\n"
 "X-Project-Style: gnome\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Netwerk"
 
@@ -61,8 +61,8 @@ msgstr "Geen meldingen tonen bij verbroken verbinding"
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
-"Stel dit in op ‘true’ om geen meldingen te krijgen bij het verbreken van "
-"een verbinding met een netwerk."
+"Stel dit in op ‘true’ om geen meldingen te krijgen bij het verbreken van een "
+"verbinding met een netwerk."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
 msgid "Disable VPN notifications"
@@ -84,8 +84,8 @@ msgstr "Meldingen over beschikbare draadloze netwerken onderdrukken"
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
-"Stel dit in op ‘true’ om geen meldingen te krijgen wanneer er draadloze "
-"netwerken beschikbaar zijn."
+"Stel dit in op ‘true’ om geen meldingen te krijgen wanneer er wifi-netwerken "
+"beschikbaar zijn."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
@@ -109,18 +109,28 @@ msgstr ""
 "kunnen worden bij gebruik van de toepassing."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr "Toon het programmaatje in het mededelingengebied"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+"Stel dit in op FALSE om het weergeven van het programmaatje in het "
+"mededelingengebied, uit te schakelen."
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "CA-certificaat negeren"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
 msgstr ""
-"Stel dit in op ‘true’ om waarschuwingen over CA-certificaten in "
-"EAP-authenticatie te onderdrukken."
+"Stel dit in op ‘true’ om waarschuwingen over CA-certificaten in EAP-"
+"authenticatie te onderdrukken."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
@@ -128,46 +138,91 @@ msgstr ""
 "Stel dit in op ‘true’ om waarschuwingen over CA-certificaten in fase 2 van "
 "EAP-authenticatie uit te schakelen."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+msgid "NetworkManager"
+msgstr "NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+msgid "NetworkManager for GNOME"
+msgstr "Netwerkbeheerprogramma voor Gnome"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+"NetworkManager is een systeemdienst voor het beheren en configureren van uw "
+"netwerkverbindingen en apparaten."
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+"Het programma nm-connection-editor werkt met NetworkManager om bestaande "
+"verbindingsprofielen voor NetworkManager aan te maken en te bewerken."
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-authenticatie"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr "_Annuleren"
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_Verbinden"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Netwerknaam:"
 
-#: ../src/applet.c:545
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr "ad hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr "veilig."
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Toevoegen/activeren van de verbinding is mislukt"
 
-#: ../src/applet.c:547 ../src/applet.c:591 ../src/applet.c:617
-#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: ../src/applet.c:550 ../src/applet.c:620 ../src/applet-device-wifi.c:1379
-#: ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Verbindingsfout"
 
-#: ../src/applet.c:589
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Verbreken van verbinding met apparaat is mislukt"
 
-#: ../src/applet.c:594
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Verbinding verbreken mislukt"
 
-#: ../src/applet.c:615
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Verbinding activeren mislukt"
 
-#: ../src/applet.c:986 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Dit bericht niet meer tonen"
 
-#: ../src/applet.c:1075
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -178,7 +233,7 @@ msgstr ""
 "De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de netwerkverbinding "
 "werd onderbroken."
 
-#: ../src/applet.c:1078
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -188,7 +243,7 @@ msgstr ""
 "De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-service "
 "onverwacht gestopt is."
 
-#: ../src/applet.c:1081
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -200,7 +255,7 @@ msgstr ""
 "ongeldige configuratie teruggaf."
 
 # niet goed/onjuist
-#: ../src/applet.c:1084
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -210,7 +265,7 @@ msgstr ""
 "De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de verbindingspoging "
 "de tijdslimiet heeft overschreden."
 
-#: ../src/applet.c:1087
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -220,7 +275,7 @@ msgstr ""
 "De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-service niet "
 "tijdig gestart werd."
 
-#: ../src/applet.c:1090
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -230,7 +285,7 @@ msgstr ""
 "De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat de VPN-service niet "
 "opgestart kon worden."
 
-#: ../src/applet.c:1093
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -240,7 +295,7 @@ msgstr ""
 "De verbinding met het VPN-netwerk ‘%s’ is mislukt omdat er geen geldige VPN-"
 "geheimen waren."
 
-#: ../src/applet.c:1096
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -250,7 +305,7 @@ msgstr ""
 "De verbinding met het VPN-netwerk ‘%s’ is mislukt vanwege ongeldige VPN-"
 "geheimen."
 
-#: ../src/applet.c:1103
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -259,7 +314,7 @@ msgstr ""
 "\n"
 "De VPN-verbinding met ‘%s’ is mislukt."
 
-#: ../src/applet.c:1121
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -270,7 +325,7 @@ msgstr ""
 "De verbinding met het VPN-netwerk ‘%s’ is verbroken omdat de "
 "netwerkverbinding werd onderbroken."
 
-#: ../src/applet.c:1124
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -281,7 +336,7 @@ msgstr ""
 "gestopt is."
 
 # "the connection has been disconnected" is een contaminatie
-#: ../src/applet.c:1130
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -290,7 +345,7 @@ msgstr ""
 "\n"
 "De verbinding met het VPN-netwerk ‘%s’ is verbroken."
 
-#: ../src/applet.c:1160
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -301,19 +356,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1162
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-verbinding is met succes opgebouwd.\n"
 
-#: ../src/applet.c:1164
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN-aanmeldbericht"
 
-#: ../src/applet.c:1170 ../src/applet.c:1178 ../src/applet.c:1228
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN-verbinding mislukt"
 
-#: ../src/applet.c:1235
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -327,7 +382,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1238
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -340,297 +395,285 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1553
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "apparaat niet gereed (firmware ontbreekt)"
 
-#: ../src/applet.c:1555
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "apparaat niet gereed"
 
 # niet verbonden/verbinding verbroken
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1565 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "verbinding verbroken"
 
-#: ../src/applet.c:1581
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Verbinding verbreken"
 
-#: ../src/applet.c:1595
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "apparaat wordt niet beheerd"
 
 # Er zijn geen netwerkapparaten geconfigureerd/gevonden
-#: ../src/applet.c:1639
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Er zijn geen netwerkapparaten beschikbaar"
 
 # Netwerken
-#: ../src/applet.c:1727
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN-verbindingen"
 
-#: ../src/applet.c:1784
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "VPN _configureren…"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "V_PN-verbinding verbreken"
 
-#: ../src/applet.c:1882
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Netwerkbeheer draait niet…"
 
-#: ../src/applet.c:1887 ../src/applet.c:2739
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Netwerken is uitgeschakeld"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2108
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "_Netwerk inschakelen"
 
 # Wireless gebruiken
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2117
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
-msgstr "_Draadloos netwerk inschakelen"
+msgstr "_Wifi inschakelen"
 
 # gebruiken/aanzetten/inschakelen
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2126
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobiel breedband inschakelen"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2135
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMA_X Mobiel breedband inschakelen"
-
 #. Toggle notifications item
-#: ../src/applet.c:2146
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "_Meldingen aanzetten"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2157
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Verbindingsinformatie"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2167
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Verbindingen bewerken…"
 
-#. Help item
-#: ../src/applet.c:2181
-msgid "_Help"
-msgstr "_Hulp"
-
-#. About item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "I_nfo"
 
-#: ../src/applet.c:2368
+# met het netwerk %s/via het netwerk
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "U bent nu verbonden met ‘%s’."
+
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: ../src/applet.c:2369
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "De verbinding met het netwerk is verbroken."
 
-#: ../src/applet.c:2602
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Netwerkverbinding ‘%s’ aan het voorbereiden…"
 
-#: ../src/applet.c:2605
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Gebruikersauthenticatie vereist voor kabelnetwerkverbinding ‘%s’…"
 
-#: ../src/applet.c:2608 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:615
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Er wordt een netwerkadres aangevraagd voor ‘%s’…"
 
 # is actief/actief
-#: ../src/applet.c:2611
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Netwerkverbinding ‘%s’ actief"
 
-#: ../src/applet.c:2694
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Bezig met starten van VPN-verbinding ‘%s’…"
 
-#: ../src/applet.c:2697
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Gebruikersauthenticatie vereist voor VPN-verbinding ‘%s’…"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "VPN-adres aanvragen voor ‘%s’…"
 
 # actief/ingesteld/in werking
 # met/via
-#: ../src/applet.c:2703
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-verbinding ‘%s’ actief"
 
 # geen netwerk/netwerkverbinding
-#: ../src/applet.c:2744
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Geen netwerkverbinding"
 
-#: ../src/applet.c:3445
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager applet"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:767
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr "Verkeerde PUK-code; neem contact op met uw telefoonmaatschappij."
+
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "Verkeerde pincode; neem contact op met uw telefoonmaatschappij."
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr "Ontgrendelingscode aan het verzenden…"
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Mobiel breedband (%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
+msgid "Mobile Broadband"
+msgstr "Mobiel breedband"
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Beschikbaar"
 
-# met het netwerk %s/via het netwerk
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:811
-#: ../src/applet-device-gsm.c:399 ../src/applet-device-wimax.c:419
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "U bent nu verbonden met ‘%s’."
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr "Nieuwe mobiel breedbandverbinding…"
 
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:815
-#: ../src/applet-device-gsm.c:403 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Verbinding ingesteld"
 
-#: ../src/applet-device-bt.c:200
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "U bent nu verbonden met het mobielbreedbandnetwerk."
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr "Mobielbreedbandnetwerk."
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "U bent nu geregistreerd bij het thuisnetwerk."
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "U bent nu geregistreerd bij een netwerk voor roaming."
+
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "U bent nu verbonden met het mobiele breedbandnetwerk."
 
-#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:606
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Mobiele breedbandverbinding ‘%s’ aan het voorbereiden…"
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:609
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Mobiele breedbandverbinding ‘%s’ aan het instellen…"
 
-#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:612
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Gebruikersauthenticatie vereist voor mobiele breedbandverbinding ‘%s’…"
 
 # actief/geactiveerd/in werking/ingesteld/in gebruik
-#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:632
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobiele breedbandverbinding ‘%s’ actief"
 
-#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:713
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:424
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Mobiel breedband (%s)"
-
-#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:715
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
-#: ../src/libnm-gtk/nm-ui-utils.c:333
-msgid "Mobile Broadband"
-msgstr "Mobiel breedband"
-
-#. Default connection item
-#: ../src/applet-device-cdma.c:316
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Nieuwe (CDMA) mobiele breedbandverbinding…"
-
-# bedraad netwerk/vast netwerk
-#: ../src/applet-device-cdma.c:350
-msgid "You are now connected to the CDMA network."
-msgstr "U bent nu verbonden met het CDMA-netwerk."
-
-#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
-msgid "CDMA network."
-msgstr "CDMA-netwerk."
-
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:953
-#: ../src/applet-device-gsm.c:677
-msgid "You are now registered on the home network."
-msgstr "U bent nu geregistreerd bij het thuisnetwerk."
-
-#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:959
-#: ../src/applet-device-gsm.c:683
-msgid "You are now registered on a roaming network."
-msgstr "U bent nu geregistreerd bij een netwerk voor roaming."
-
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Auto ethernet"
 
 # vaste netwerk/kabelnetwerk
-#: ../src/applet-device-ethernet.c:202
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Bekabelde netwerken (%s)"
 
 # vaste netwerk
-#: ../src/applet-device-ethernet.c:204
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Bekabeld netwerk (%s)"
 
 # vaste netwerk
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Bekabelde netwerken"
 
 # vaste netwerk
-#: ../src/applet-device-ethernet.c:209
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Bekabeld netwerk"
 
-#: ../src/applet-device-ethernet.c:271
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "U bent nu verbonden met het bekabeld netwerk."
 
-#: ../src/applet-device-ethernet.c:297
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Kabelnetwerkverbinding ‘%s’ aan het voorbereiden…"
 
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Kabelnetwerkverbinding ‘%s’ aan het instellen…"
 
-#: ../src/applet-device-ethernet.c:303
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Gebruikersauthenticatie vereist voor de kabelnetwerkverbinding ‘%s’…"
 
 # kabelnetwerkadres
-#: ../src/applet-device-ethernet.c:306
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Kabelnetwerkadres aanvragen voor ‘%s’…"
@@ -639,444 +682,338 @@ msgstr "Kabelnetwerkadres aanvragen voor ‘%s’…"
 # netwerkverbinding via de kabel/netwerk/netwerkverbinding
 # vaste netwerk/kabelnetwerkverbinding
 # verbinding via kabelnetwerk
-#: ../src/applet-device-ethernet.c:310
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Verbinding via kabelnetwerk ‘%s’ actief"
 
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-authenticatie"
 
-#: ../src/applet-device-broadband.c:165 ../src/applet-device-gsm.c:518
-msgid "Wrong PUK code; please contact your provider."
-msgstr "Verkeerde PUK-code; neem contact op met uw telefoonmaatschappij."
-
-#: ../src/applet-device-broadband.c:207 ../src/applet-device-gsm.c:495
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Verkeerde pincode; neem contact op met uw telefoonmaatschappij."
-
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:258 ../src/applet-device-gsm.c:545
-msgid "Sending unlock code..."
-msgstr "Ontgrendelingscode aan het verzenden…"
-
-#. Default connection item
-#: ../src/applet-device-broadband.c:780
-msgid "New Mobile Broadband connection..."
-msgstr "Nieuwe mobiel breedbandverbinding…"
-
-#: ../src/applet-device-broadband.c:816
-msgid "You are now connected to the Mobile Broadband network."
-msgstr "U bent nu verbonden met het mobielbreedbandnetwerk."
-
-#: ../src/applet-device-broadband.c:952 ../src/applet-device-broadband.c:958
-msgid "Mobile Broadband network."
-msgstr "Mobielbreedbandnetwerk."
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Nieuwe (GSM) mobiele breedbandverbinding…"
-
-#: ../src/applet-device-gsm.c:404
-msgid "You are now connected to the GSM network."
-msgstr "U bent nu verbonden met het GSM-netwerk."
-
-#: ../src/applet-device-gsm.c:676 ../src/applet-device-gsm.c:682
-msgid "GSM network."
-msgstr "GSM-netwerk."
-
 # via/met
-#: ../src/applet-device-wifi.c:98
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
-msgstr "_Verbinden met verborgen draadloos netwerk…"
+msgstr "_Verbinden met verborgen wifi-netwerk…"
 
-#: ../src/applet-device-wifi.c:149
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
-msgstr "_Nieuw draadloos netwerk aanmaken…"
+msgstr "_Nieuw wifi-netwerk aanmaken…"
 
 # niets/geen
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(geen)"
 
 # vaste netwerk/kabelnetwerk
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
-msgstr "Draadloze netwerken (%s)"
+msgstr "Wifi-netwerken (%s)"
 
 # vaste netwerk
-#: ../src/applet-device-wifi.c:789
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
-msgstr "Draadloos netwerk (%s)"
+msgstr "Wifi-netwerk (%s)"
 
 # vaste netwerk
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
-msgstr[0] "Draadloos netwerk"
-msgstr[1] "Draadloze netwerken"
+msgstr[0] "wifi-netwerk"
+msgstr[1] "Wifi-netwerken"
 
-#: ../src/applet-device-wifi.c:824
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
-msgstr "Draadloos netwerk is uitgeschakeld"
+msgstr "Wifi is uitgeschakeld"
 
-#: ../src/applet-device-wifi.c:825
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
-msgstr "Draadloos netwerk is met de fysieke schakelaar uitgeschakeld"
+msgstr "Wifi is met de fysieke schakelaar uitgeschakeld"
 
-#: ../src/applet-device-wifi.c:886
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Meer netwerken"
 
-#: ../src/applet-device-wifi.c:1065
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
-msgstr "Draadloze netwerken beschikbaar"
+msgstr "Wifi-netwerken beschikbaar"
 
-#: ../src/applet-device-wifi.c:1066
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
-msgstr ""
-"Gebruik het netwerkmenu om verbinding te maken met een draadloos netwerk"
+msgstr "Gebruik het netwerkmenu om verbinding te maken met een wifi-netwerk"
 
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
-msgstr "U bent nu verbonden met het draadloos netwerk ‘%s’."
+msgstr "U bent nu verbonden met het wifi-netwerk ‘%s’."
 
-#: ../src/applet-device-wifi.c:1291
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
-msgstr "Draadloos netwerkverbinding ‘%s’ aan het voorbereiden…"
+msgstr "Wifi-netwerkverbinding ‘%s’ aan het voorbereiden…"
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
-msgstr "Kabelnetwerkverbinding ‘%s’ aan het instellen…"
+msgstr "Wifi-netwerkverbinding ‘%s’ aan het instellen…"
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
-msgstr "Gebruikersauthenticatie vereist voor draadloos netwerk ‘%s’…"
+msgstr "Gebruikersauthenticatie vereist voor wifi-netwerk ‘%s’…"
 
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
-msgstr "Draadloos netwerkadres aanvragen voor ‘%s’…"
+msgstr "Aanvragen van een adres voor wifi-netwerk ‘%s’…"
 
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
-msgstr "Verbinding met draadloos netwerk ‘%s’ actief: %s (%d%%)"
+msgstr "Verbinding via wifi-netwerk ‘%s’ actief: %s (%d%%)"
 
 # dit is een tooltip die boven het applet verschijnt
 # netwerkverbinding via de kabel/netwerk/netwerkverbinding
 # vaste netwerk/kabelnetwerkverbinding
 # verbinding via kabelnetwerk
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
-msgstr "Verbinding via draadloos netwerk ‘%s’ actief"
+msgstr "Verbinding via wifi-netwerk ‘%s’ actief"
 
-#: ../src/applet-device-wifi.c:1374
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Activeren van verbinding mislukt"
 
-#: ../src/applet-device-wifi.c:1393
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Toevoegen van nieuwe verbinding mislukt"
 
-#: ../src/applet-device-wimax.c:227
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX mobiel breedband (%s)"
-
-#: ../src/applet-device-wimax.c:229
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX mobiel breedband"
-
-#: ../src/applet-device-wimax.c:255
-msgid "WiMAX is disabled"
-msgstr "WiMAX is uitgeschakeld"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX is met de fysieke schakelaar uitgeschakeld"
-
-#: ../src/applet-device-wimax.c:424
-msgid "You are now connected to the WiMAX network."
-msgstr "U bent nu verbonden met het WiMAX-netwerk."
-
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:627
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Mobiele breedbandverbinding ‘%s’ actief: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:630
-msgid "roaming"
-msgstr "roaming"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Fout bij weergeven van verbindingsinformatie:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamisch WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+msgid "More addresses"
+msgstr "Meer adressen"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
 # zonder/geen
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Geen"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (standaard)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
 # niet bekend/onbekend
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../src/applet-dialogs.c:361
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Onbekend"
 
-#: ../src/applet-dialogs.c:363
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "onbekend"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP-adres:"
 
-#: ../src/applet-dialogs.c:375
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "onbekend"
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Broadcast-adres:"
 
-#: ../src/applet-dialogs.c:410
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Subnetmasker:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
-#: ../src/connection-editor/page-general.c:345
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Algemeen"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Apparaat:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Hardware-adres:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Stuurprogramma:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Snelheid:"
 
 # Bedoeld wordt beveiliging van het draadloos netwerk.
 # niet dat de beveiling draadloos is.
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Beveiliging:"
 
-#: ../src/applet-dialogs.c:512
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:525
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "IP-adres:"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "Broadcast-adres:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "Subnetmasker:"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Standaardroute:"
 
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "Primaire DNS:"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "Secondaire DNS:"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "Tertiaire DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
 # niet gebruikt/genegeerd
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN-type:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN-gateway:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN-gebruikersnaam:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN-banier:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Basisverbinding:"
 
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Onbekend"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Geen geldige actieve verbindingen gevonden!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:985
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "en vele bijdragen van vertalers en anderen uit de gemeenschap"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:988
 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:944
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager website"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Ontbrekende bronnen"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1030
 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:993
+#: ../src/applet-dialogs.c:1039
 #, 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:1012
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Wachtwoord:"
 
 # nodig/gevraagd/vereist
 # geen letterlijke vertaling van unlock
-#: ../src/applet-dialogs.c:1310
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN-code vereist"
 
-#: ../src/applet-dialogs.c:1311
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN-code vereist"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1313
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1086,26 +1023,26 @@ msgstr ""
 "het gebruikt kan worden."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1315
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN-code:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1319
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "PIN-code tonen"
 
 # gevraagd/vereist
-#: ../src/applet-dialogs.c:1321
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK-code vereist"
 
-#: ../src/applet-dialogs.c:1322
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK-code vereist"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1324
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1115,29 +1052,36 @@ msgstr ""
 "gebruikt kan worden."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK-code:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Nieuwe PIN-code:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Voer nieuwe PIN-code nogmaals in:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PUK-/pincodes weergeven"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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/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:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
@@ -1145,18 +1089,41 @@ msgstr ""
 "IP-adressen identificeren uw computer op het netwerk. Klik op de knop "
 "“Toevoegen” om een IP-adres toe te voegen."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+msgid "_Add"
+msgstr "_Toevoegen"
+
+#. 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
+msgid "_Delete"
+msgstr "_Verwijderen"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "A_utomatisch verkregen routes negeren"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "_Deze verbinding alleen gebruiken voor bronnen op haar netwerk"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1164,9 +1131,8 @@ msgstr ""
 "Als dit is ingeschakeld zal deze verbinding nooit als de "
 "standaardnetwerkverbinding gebruikt worden."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1174,12 +1140,16 @@ msgstr ""
 msgid " "
 msgstr " "
 
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+msgid "Create…"
+msgstr "Aanmaken…"
+
 # Kies een VPN-verbindingstype
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "Een verbindingstype kiezen"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1191,10 +1161,6 @@ msgstr ""
 "Wanneer u een VPN aanmaakt en de VPN-verbinding die u wilt niet in de lijst "
 "voorkomt dan is de juiste VPN-plugin mogelijk niet geïnstalleerd."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:6
-msgid "Create…"
-msgstr "Aanmaken…"
-
 #: ../src/connection-editor/ce-page-bond.ui.h:1
 msgid "Round-robin"
 msgstr "Round-robin"
@@ -1236,45 +1202,41 @@ msgid "Bonded _connections:"
 msgstr "Ge_bundelde verbindingen:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
 msgstr "M_odus:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
-msgid "_Edit"
-msgstr "Be_werken"
-
-#. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "_Delete"
-msgstr "_Verwijderen"
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "Be_werken"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Observatie_frequentie:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: ../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:"
 msgstr "_Interfacenaam:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "Verbindings_observatie:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP-_doelen:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1282,20 +1244,50 @@ msgstr ""
 "Een IP-adres of een kommagescheiden lijst van IP-adressen om naar te zoeken "
 "bij het controleren van de verbindingsstatus."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Vertraging verbinding a_ctiveren:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Vertraging verbinding _neerleggen:"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+msgid "_Primary:"
+msgstr "_Primair:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr ""
+"De interfacenaam van het primaire apparaat. Indien ingesteld, zal dit "
+"apparaat altijd de actieve slave zijn wanneer het beschikbaar is."
+
+#: ../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:"
+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
+msgid "bytes"
+msgstr "bytes"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "Pad_kosten:"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Prioriteit:"
 
@@ -1307,42 +1299,283 @@ msgstr "_Haarspeldmodus:"
 msgid "Bridged _connections:"
 msgstr "Over_brugde verbindingen:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "Vertraging _doorsturen:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Hello-tijd:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "Enable I_GMP snooping"
+msgstr "I_GMP-snooping inschakelen"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_STP (Spanning Tree Protocol) inschakelen"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Max. leeftijd:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "Ver_ouderingstijd:"
 
-#: ../src/connection-editor/ce-page.c:72
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatisch"
 
+#: ../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
+msgid "default"
+msgstr "standaard"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr "Ongespecificeerde fout"
+
+#: ../src/connection-editor/ce-page.c:245
+msgid "MAC address"
+msgstr "MAC-adres"
+
+#: ../src/connection-editor/ce-page.c:245
+msgid "HW address"
+msgstr "HW-adres"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr "ongeldige %s voor %s (%s)"
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr "Ongeldige %s (%s)"
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr "ongeldige interfacenaam for %s (%s)"
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr "ongeldige interfacenaam (%s)"
+
+#: ../src/connection-editor/ce-page.c:485
+msgid "device"
+msgstr "apparaat"
+
 # technische term
-#: ../src/connection-editor/ce-page.c:356
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Kon verbindingsgeheimen niet bijwerken vanwege een onbekende fout."
 
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "Data Center Bridging (DCB) gebruiken voor deze verbinding"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr "FCoE"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr "iSCSI"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr "FIP"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr "Flow Control"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr "Functie"
+
+# Wireless gebruiken
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr "Inschakelen"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr "Bekendmaken"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr "Bereid"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr "Prioriteit"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr "Opties…"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr "Prioriteitsgroepen"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr "0"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr "1"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr "5"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr "6"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr "7"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr "Structuur"
+
+#: ../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"
+msgstr "Priority Flow Control"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+"Prioriteitspauzetransmissie voor elke gebruikersprioriteit in- of "
+"uitschakelen."
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr "Prioriteit:"
+
+#: ../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 "Verkeersklasse:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr "Nauwkeurige bandbreedte:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr "Prioriteitsbandbreedte:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr "Groepsbandbreedte:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr "Groep-ID:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr "15"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr "Voer ID van prioriteitsgroep in voor elke gebruikersprioriteit."
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+msgid ""
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
+msgstr ""
+"Voer het percentage van de toegestane koppelingsbandbreedte in die elke "
+"prioriteitsgroep mag gebruiken. Het totaal van alle groepen moet 100% zijn."
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+"Voer het percentage van de prioriteitsgroepbandbreedte in die elke "
+"gebruikersprioriteit mag gebruiken."
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+"Nauwkeurige bandbreedte voor elke gebruikersprioriteit in- of uitschakelen."
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+msgid "Enter the traffic class for each user priority."
+msgstr "De verkeersklasse invoeren voor elke gebruikersprioriteit."
+
 # inlognaam/gebruikersnaam
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../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
@@ -1356,15 +1589,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 msgid "Sho_w password"
 msgstr "Wachtwoord _tonen"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../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
@@ -1376,7 +1611,8 @@ msgstr "_Wachtwoord:"
 #: ../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-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatisch"
@@ -1429,20 +1665,20 @@ msgstr "Volledig duple_x"
 msgid "Aut_onegotiate"
 msgstr "Automatisch _onderhandelen"
 
+# dienst/service
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "MAC-adres van a_pparaat:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+msgid "_Device:"
+msgstr "_Apparaat:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "Gek_loond MAC-adres:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1452,19 +1688,52 @@ msgstr ""
 "netwerkapparaat waarop deze verbinding is geactiveerd. Dit wordt “MAC "
 "cloning” of “spoofing” genoemd. Voorbeeld: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr "Wake on LAN:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "bytes"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+msgid "De_fault"
+msgstr "_Standaard"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr "_Negeren"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr "_Phy"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr "_Unicast"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr "Mul_ticast"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+msgid "_Broadcast"
+msgstr "_Broadcast"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr "_Arp"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr "Ma_gic"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+msgid "_Wake on LAN password:"
+msgstr "_Wake on LAN wachtwoord:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+msgid ""
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
+msgstr ""
+"Wake-on-LAN wachtwoord (een Ethernet MAC). Het is alleen geldig voor magic-"
+"pakketten."
 
 #: ../src/connection-editor/ce-page-general.ui.h:1
 msgid "Automatically connect to _VPN when using this connection"
@@ -1503,8 +1772,8 @@ msgstr "Automatisch met handmatige DNS-instellingen"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Handmatig"
 
@@ -1515,23 +1784,23 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Gedeeld met andere computers"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_Methode:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Adressen"
 
 # client identifier, technische term
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1542,8 +1811,8 @@ msgstr ""
 "identifier gebruiken wilt, voer deze dan hier in."
 
 # opzoeken/oplossen
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1551,26 +1820,25 @@ msgstr ""
 "Domeinen die gebruikt worden bij het opzoeken van hostnamen. Gebruik komma's "
 "om domeinen te scheiden."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "Door_zoek domeinen:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS-servers:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1578,11 +1846,11 @@ msgstr ""
 "IP-adressen van DNS-servers die gebruikt worden bij het opzoeken van "
 "hostnamen. Gebruik komma's om adressen te scheiden."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "IPv_4-adressering vereist voor de voltooiing van deze verbinding"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1591,16 +1859,43 @@ msgstr ""
 "om de verbinding te voltooien wanneer IPv4-configuratie mislukt maar IPv6-"
 "configuratie wel lukt."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Routes…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Uitgeschakeld"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr "Ingeschakeld (voorkeur openbaar adres)"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr "Ingeschakeld (voorkeur tijdelijk adres)"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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-adressen van domeinnaam-servers die gebruikt worden bij het opzoeken van "
+"hostnamen. Gebruik komma's om meerdere DNS-adressen te scheiden. Link-local-"
+"adressen vallen automatisch binnen het bereik van de verbindingsinterface."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr "IPv6 _privacy uitbreidingen:"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Vereis IPv_6-adressering voor de voltooiing van deze verbinding"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1609,74 +1904,40 @@ msgstr ""
 "om de verbinding te voltooien wanneer IPv6-configuratie mislukt maar IPv4-"
 "configuratie wel lukt."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Elke"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Bij voorkeur 3G (UMTS/HSPA)"
-
-# prefereren/voorkeur voor/bij voorkeur
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Bij voorkeur 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Bij voorkeur 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Alleen 4G (LTE) gebruiken"
-
 # simple/eenvoudig/kort
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: ../src/connection-editor/ce-page-mobile.ui.h:1
 msgid "Basic"
 msgstr "Simpel"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Nu_mmer:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "N_etwerk ID:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Type:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Wijzigen…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_incode:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "Sta _roaming (gastgebruik) toe indien thuisnetwerk niet beschikbaar is"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "Wachtwoorden _tonen"
 
@@ -1728,29 +1989,66 @@ msgstr "Echo"
 msgid "Send PPP _echo packets"
 msgstr "PPP-_echopakketten versturen"
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr "_JSON config:"
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr "Een opgeslagen team-configuratie i_mporteren…"
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+msgid "_Teamed connections:"
+msgstr "_Team-verbindingen:"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr "Een opgeslagen team-configuratie importeren…"
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Bovenliggende interface:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+msgid "VLAN inter_face name:"
 msgstr "Interface_naam VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+msgid "Cloned MAC _address:"
 msgstr "Ge_kloond MAC-adres:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN-_id:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr "Vlaggen:"
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr "Koppen _herschikken"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr "_GVRP"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr "Losse _binding"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Apparaatnaam + nummer"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + nummer"
 
@@ -1767,99 +2065,103 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastructuur"
+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
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
 # signaalsterkte
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Si_gnaalsterkte:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
 # bandbreedte/snelheid/frequentie
 # B/G
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "S_nelheid:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Kanaal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ban_d:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "M_odus:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
+#: ../src/connection-editor/ce-polkit-button.c:74
+msgid "No polkit authorization to perform the action"
+msgstr "Polkit-autorisatie om deze actie uit te voeren mislukt"
+
 # ondersteunde types/methodes van aanmeldingscontrole
 # aanmeldingsmethodes
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
 msgid "Allowed Authentication Methods"
 msgstr "Ondersteunde aanmeldingsmethodes"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1868,130 +2170,154 @@ msgstr ""
 "aanmeldingsmethodes ondersteunen. Wanneer er problemen zijn met verbinden "
 "kunt u proberen de ondersteuning voor bepaalde methodes uit te schakelen."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip4.c:928
-#: ../src/connection-editor/page-ip6.c:894
-msgid "Address"
-msgstr "Adres"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/page-ip4.c:945
-msgid "Netmask"
-msgstr "Netmask"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-#: ../src/connection-editor/page-ip4.c:962
-#: ../src/connection-editor/page-ip6.c:928
-msgid "Gateway"
-msgstr "Gateway"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:813
-#: ../src/connection-editor/ip6-routes-dialog.c:755
-msgid "Metric"
-msgstr "Metrisch"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip6.c:911
-msgid "Prefix"
-msgstr "Voorvoegsel"
-
-#: ../src/connection-editor/new-connection.c:101
-#: ../src/connection-editor/page-ethernet.c:251
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:471 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
-msgstr "Draadloos netwerk"
+msgstr "Wifi"
 
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:134
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:131
-#: ../src/connection-editor/page-infiniband.c:168
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:559
+#: ../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
 msgid "Bond"
 msgstr "Gebundeld"
 
-#: ../src/connection-editor/new-connection.c:143
-#: ../src/connection-editor/page-bridge.c:211
-#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+#: ../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
+msgid "Team"
+msgstr "Team"
+
+#: ../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
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:563
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:252
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Apparatuur"
 
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtueel"
 
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Een opgeslagen VPN-configuratie importeren…"
 
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "De verbindingbewerker kon niet gestart worden vanwege een onbekende fout."
 
-#: ../src/connection-editor/new-connection.c:380
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Kon geen nieuwe verbinding aanmaken"
 
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Verbinding verwijderen is mislukt"
 
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Weet u zeker dat u de verbinding %s wilt verwijderen?"
 
-#: ../src/connection-editor/nm-connection-editor.c:118
+#: ../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
+msgid "Address"
+msgstr "Adres"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Netmask"
+
+#: ../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
+msgid "Gateway"
+msgstr "Gateway"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Metrisch"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Voorvoegsel"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Bezig met bewerken van %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Naamloze verbinding bewerken"
 
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:124
+msgid "Missing connection name"
+msgstr "Naam van verbinding ontbreekt"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+msgid "Editor initializing..."
+msgstr "Editor initialiseren…"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+msgid "Connection cannot be modified"
+msgstr "Verbinding kan n iet worden gewijzigd"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr "Ongeldige instelling %s: %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -1999,185 +2325,212 @@ msgstr ""
 "De verbindingbewerker kon bepaalde vereiste bronnen niet vinden (het .ui-"
 "bestand werd niet gevonden)."
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "Op_slaan"
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "De wijzigingen opslaan die aan deze verbinding zijn aangebracht."
 
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "_Save..."
-msgstr "Op_slaan…"
-
-#: ../src/connection-editor/nm-connection-editor.c:411
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Beheerwachtwoord invoeren om deze verbinding op te slaan voor alle "
 "gebruikers van deze computer."
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Kon geen verbinding leggen"
 
 # geen netwerk/netwerkverbinding
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Kon de verbinding niet bewerken"
 
-#: ../src/connection-editor/nm-connection-editor.c:429
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Onbekende fout bij aanmaken van het verbindingseditorvenster."
 
-#: ../src/connection-editor/nm-connection-editor.c:536
-msgid "Error saving connection"
-msgstr "Fout bij het opslaan van de verbinding"
-
-#: ../src/connection-editor/nm-connection-editor.c:537
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "De eigenschap ‘%s’ /  ‘%s’ is ongeldig: %d"
-
-#: ../src/connection-editor/nm-connection-editor.c:631
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Fout bij het initialiseren van de editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:952
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Verbinding toevoegen is mislukt"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
+msgid "_Close"
+msgstr "_Sluiten"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "_Naam verbinding:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Exporteren…"
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nooit"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "nu"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuut geleden"
 msgstr[1] "%d minuten geleden"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d uur geleden"
 msgstr[1] "%d uur geleden"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag geleden"
 msgstr[1] "%d dagen geleden"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d maand geleden"
 msgstr[1] "%d maanden geleden"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d jaar geleden"
 msgstr[1] "%d jaar geleden"
 
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Laatst gebruikt"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "De geselecteerde verbinding bewerken"
 
-#: ../src/connection-editor/nm-connection-list.c:687
-msgid "_Edit..."
-msgstr "Be_werken…"
-
 # hier wordt bedoeld dat je het systeembeheerderswachtwoord invoert
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Beheerwachtwoord invoeren om de geselecteerde verbinding te bewerken"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "De geselecteerde verbinding verwijderen"
 
-#: ../src/connection-editor/nm-connection-list.c:704
-msgid "_Delete..."
-msgstr "_Verwijderen…"
-
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr ""
 "Beheerwachtwoord invoeren om de geselecteerde verbinding te verwijderen"
 
-#: ../src/connection-editor/nm-connection-list.c:942
-msgid "Error creating connection"
-msgstr "Fout bij het aanmaken van de verbinding"
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr "Er zijn geen invoegtoepassingen geïnstalleerd voor VPN."
 
-#: ../src/connection-editor/nm-connection-list.c:943
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Weet niet hoe ‘%s’-verbindingen aan te maken"
 
-#: ../src/connection-editor/nm-connection-list.c:998
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "Fout bij het aanmaken van de verbinding"
+
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Fout bij het bewerken van de verbinding"
 
-#: ../src/connection-editor/nm-connection-list.c:999
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Kon geen verbinding met UUID ‘%s’ vinden"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x-beveiliging"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "Kon de gebruikersinterface voor 802.1x-beveiliging niet laden."
 
-#: ../src/connection-editor/page-8021x-security.c:141
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Gebruik 802.1_X-beveiliging voor deze verbinding"
 
-#: ../src/connection-editor/page-bond.c:422
+#: ../src/connection-editor/page-bluetooth.c:58
+msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
+msgstr "MAC-adres Bluetooth-apparaat. Bijvoorbeeld: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-bluetooth.c:125
+msgid "Could not load Bluetooth user interface."
+msgstr "Kon de Bluetooth-gebruikersinterface niet laden."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "Ongeldig Bluetooth-apparaat (%s)"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, c-format
+msgid "Bluetooth connection %d"
+msgstr "Bluetooth-verbinding %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr "Type Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr "Het type van het Bluetooth-verbindingsprofiel selecteren"
+
+# vaste netwerk
+#: ../src/connection-editor/page-bluetooth.c:325
+msgid "_Personal Area Network"
+msgstr "_Personal Area Network"
+
+# vaste netwerk
+#: ../src/connection-editor/page-bluetooth.c:330
+msgid "_Dial-Up Network"
+msgstr "_Dial-Up Network"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Kon de gebruikersinterface voor bundeling niet laden."
 
-#: ../src/connection-editor/page-bond.c:561
+#: ../src/connection-editor/page-bond.c:566
+msgid "primary"
+msgstr "primair"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bundelverbinding %d"
 
-#: ../src/connection-editor/page-bridge.c:214
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Kon de gebruikersinterface voor een bridge niet laden."
 
-#: ../src/connection-editor/page-bridge.c:309
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Bridgeverbinding %d"
@@ -2185,50 +2538,72 @@ msgstr "Bridgeverbinding %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Bridgepoort"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Kon de gebruikersinterface voor een bridgepoort niet laden."
 
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr "DCB"
+
+#: ../src/connection-editor/page-dcb.c:605
+msgid "Could not load DCB user interface."
+msgstr "Kon de DCB-gebruikersinterface niet laden."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Kon de DSL-gebruikersschil niet laden."
 
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-verbinding %d"
 
-#: ../src/connection-editor/page-ethernet.c:90
-#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:113
-#: ../src/connection-editor/page-wimax.c:70
+#: ../src/connection-editor/page-ethernet.c:74
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
-"Deze optie verbindt deze verbinding aan het netwerkapparaat met het vaste "
-"MAC-adres dat hier ingegeven wordt. Voorbeeld: 00:11:22:33:44:55"
+"Deze optie verbindt deze verbinding aan het netwerkapparaat dat opgegeven is "
+"middels de interfacenaam of het vaste MAC-adres ervan of beide. Voorbeelden: "
+"\"em1\", \"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-ethernet.c:253
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Kon de gebruikersinterface voor ethernetverbinding niet laden."
 
-#: ../src/connection-editor/page-ethernet.c:396
+#: ../src/connection-editor/page-ethernet.c:457
+msgid "Ethernet device"
+msgstr "Ethernet-apparaat"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+msgid "cloned MAC"
+msgstr "Gekloond MAC-adres"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr "_Wake on LAN wachtwoord"
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernetverbinding %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#: ../src/connection-editor/page-general.c:59
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Standaard"
 
-#: ../src/connection-editor/page-general.c:60
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2238,141 +2613,202 @@ msgstr ""
 "een reguliere zone; wanneer u dit kiest dan wordt de standaardzone die is "
 "ingesteld in de firewall gebruikt. Alleen bruikbaar als firewalld actief is."
 
-#: ../src/connection-editor/page-general.c:61
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD is niet actief."
 
-#: ../src/connection-editor/page-general.c:348
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Kon de gebruikersinterface Algemeen niet laden."
 
-#: ../src/connection-editor/page-infiniband.c:171
+#: ../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 ""
+"Deze optie verbindt deze verbinding aan het netwerkapparaat dat opgegeven is "
+"middels de interfacenaam of het vaste MAC-adres ervan of beide. Voorbeelden: "
+"\"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:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Kon de InfiniBand-gebruikersinterface niet laden."
 
-#: ../src/connection-editor/page-infiniband.c:263
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr "InfiniBand-apparaat"
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBandverbinding %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatisch (VPN)"
 
 # enkel/alleen
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatisch, alleen VPN-adressen"
 
-#: ../src/connection-editor/page-ip4.c:137
+# enkel/alleen
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Automatisch (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Automatisch, alleen PPP-adressen"
+msgid "Automatic, addresses only"
+msgstr "Automatisch, alleen adressen"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatisch (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatisch, alleen PPPoE-adressen"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatisch (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatisch, alleen DHCP-adressen"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Alleen Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Uitgeschakeld"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Aanvullende _DNS-servers:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Extra door_zoekdomeinen:"
 
-#: ../src/connection-editor/page-ip4.c:860
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "IPv4-routes aan het bewerken voor %s"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4-instellingen"
 
-#: ../src/connection-editor/page-ip4.c:1013
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Kon de IPv4-gebruikersschil niet laden."
 
-# enkel/alleen
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "Automatisch, alleen adressen"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr "IPv4-adres ‘%s’ ongeldig"
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr "Netwerkmasker van IPv4-adres ‘%s’ ongeldig"
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr "IPv4-gateway ‘%s’ ongeldig"
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr "IPv4 DNS-server ‘%s’ ongeldig"
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Negeren"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatisch, alleen DHCP"
 
-#: ../src/connection-editor/page-ip6.c:826
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "IPv6-routes bewerken voor %s"
 
-#: ../src/connection-editor/page-ip6.c:975
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6-instellingen"
 
-#: ../src/connection-editor/page-ip6.c:977
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Kon de IPv6-gebruikersinterface niet laden."
 
-#: ../src/connection-editor/page-master.c:290
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr "IPv6-adres ‘%s’ ongeldig"
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr "IPv6-prefix ‘%s’ ongeldig"
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr "IPv6-gateway ‘%s’ ongeldig"
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr "IPv6 DNS-server ‘%s’ ongeldig"
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr "Duplicaat-slaves"
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr "Slaves ‘%s’ en ‘%s’ gelden beide voor apparaat ‘%s’"
+
+#: ../src/connection-editor/page-master.c:260
+#, c-format
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
+msgstr ""
+"Slaves ‘%s’ en ‘%s’ gelden voor verschillende virtuele poorten (‘%s’ en "
+"‘%s’) van hetzelfde fysieke apparaat."
+
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Kon de mobiele breedband-gebruikersinterface niet laden."
 
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Niet ondersteund verbindingstype voor mobiel breedband."
 
 # geen letterlijke vertaling.
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:658
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Selecteer verbindingstype voor mobiel breedband"
 
-#: ../src/connection-editor/page-mobile.c:693
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2381,96 +2817,145 @@ msgstr ""
 "het uw provider wanneer u het niet zeker weet."
 
 # GSM-gebaseerde/GSM-technologie
-#: ../src/connection-editor/page-mobile.c:698
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Mijn provider gebruikt _GSM-technologie (bijv. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:705
+#: ../src/connection-editor/page-mobile.c:568
 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:715 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:266
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 # niets/geen
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "geen"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "PPP-aanmeldingsmethodes bewerken voor %s"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP-instellingen"
 
-#: ../src/connection-editor/page-ppp.c:286
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Kon de PPP-gebruikersinterface niet laden."
 
-#: ../src/connection-editor/page-vlan.c:482
+#: ../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 "Bestand selecteren voor import"
+
+#: ../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"
+msgstr "Fout: bestand bevat geen geldige JSON-configuratie"
+
+#: ../src/connection-editor/page-team.c:270
+msgid "Could not load team user interface."
+msgstr "Kon de team-gebruikersinterface niet laden."
+
+#: ../src/connection-editor/page-team.c:377
+#, c-format
+msgid "Team connection %d"
+msgstr "Team-verbinding %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr "Teampoort"
+
+#: ../src/connection-editor/page-team-port.c:153
+msgid "Could not load team port user interface."
+msgstr "Kon de gebruikersinterface voor een teampoort niet laden."
+
+#. 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
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr "%s (via ‘%s’)"
+
+# geen netwerk/netwerkverbinding
+#: ../src/connection-editor/page-vlan.c:426
+#, c-format
+msgid "New connection..."
+msgstr "Nieuwe verbinding…"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Kon de vlan-gebruikersinterface niet laden."
 
-#: ../src/connection-editor/page-vlan.c:678
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr "Bovenliggende vlan"
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-verbinding %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Kon de VPN-gebruikersinterface niet laden."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Kon de VPN-plugin voor ‘%s’ niet vinden."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-verbinding %d"
 
 # 'missing' is beter dat 'no'
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2481,11 +2966,11 @@ msgstr ""
 "Foutmelding: type VPN-service ontbreekt."
 
 # Kies een VPN-verbindingstype
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Een VPN-verbindingstype kiezen"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2495,98 +2980,103 @@ msgstr ""
 "Wanneer het gewenste type VPN-verbinding niet in de lijst voorkomt is de "
 "juiste VPN-plugin mogelijk niet geïnstalleerd."
 
-#: ../src/connection-editor/page-wifi.c:98
+#: ../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 ""
-"Deze optie vergrendelt deze verbinding aan het draadloze toegangspunt (AP) "
-"met de BSSID die hier ingegeven wordt. Voorbeeld: 00:11:22:33:44:55"
+"Deze optie vergrendelt deze verbinding aan het wifi-toegangspunt (AP) "
+"gespecificeerd door de hier ingevoerde BSSID. Voorbeeld: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:190
-#: ../src/connection-editor/page-wifi.c:194
-#: ../src/connection-editor/page-wifi.c:215
-#, c-format
-msgid "default"
-msgstr "standaard"
+#: ../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 ""
+"Deze optie verbindt deze verbinding aan het netwerkapparaat dat opgegeven is "
+"middels de interfacenaam of het vaste MAC-adres ervan of beide. Voorbeelden: "
+"\"wlan0\", \"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-wifi.c:219
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:473
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
-msgstr "Kon de draadloos netwerk-gebruikersinterface niet laden."
+msgstr "Laden van wifi-gebruikersinterface mislukt."
 
-#: ../src/connection-editor/page-wifi.c:650
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr "bssid"
+
+#: ../src/connection-editor/page-wifi.c:577
+msgid "Wi-Fi device"
+msgstr "Wifi-apparaat"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
-msgstr "Draadloze verbinding %d"
-
-# zonder/geen
-#: ../src/connection-editor/page-wifi-security.c:265
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "Geen"
+msgstr "Wifi-verbinding %d"
 
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit sleutel (Hex or ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit wachtwoordzin"
 
-#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Dynamisch WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 persoonlijk"
 
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 zakelijk"
 
-#: ../src/connection-editor/page-wifi-security.c:396
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
-"Kon de gebruikersinterface voor draadloos netwerk-beveiliging niet laden; "
-"instelling voor draadloos netwerk ontbreekt."
+"Laden van gebruikersinterface voor beveiliging wifi-netwerk mislukt; wifi-"
+"instelling ontbreekt."
 
 # Bedoeld wordt beveiliging van het draadloos netwerk.
 # niet dat de beveiling draadloos is.
-#: ../src/connection-editor/page-wifi-security.c:407
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
-msgstr "Draadloos netwerk-beveiliging"
+msgstr "Wifi-beveiliging"
 
-#: ../src/connection-editor/page-wifi-security.c:409
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
-msgstr ""
-"Kon de gebruikersinterface voor draadloos netwerk-beveiliging niet laden."
+msgstr "Laden van gebruikersinterface voor wifi-beveiliging mislukt."
 
-#: ../src/connection-editor/page-wimax.c:137
-msgid "Could not load WiMAX user interface."
-msgstr "Kon de gebruikersinterface voor WiMAX niet laden."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr "Ontbrekende SSID"
 
-#: ../src/connection-editor/page-wimax.c:233
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX-verbinding %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr "Beveiliging niet compatibel met Ad-Hoc-modus"
 
 # Netwerken
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Kan VPN-verbinding niet importeren"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2599,30 +3089,30 @@ msgstr ""
 "\n"
 "Foutmelding: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "Bestand selecteren voor import"
+#: ../src/connection-editor/vpn-helpers.c:141
+msgid "unknown error"
+msgstr "Onbekende fout"
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Een bestand met de naam ‘%s’ bestaat al."
 
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Vervangen"
 
 # die u nu opslaat/die u aan het opslaan bent
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Wilt u %s vervangen door de VPN-verbinding die u nu opslaat?"
 
-#: ../src/connection-editor/vpn-helpers.c:332
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Kan VPN-verbinding niet exporteren"
 
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2633,11 +3123,11 @@ msgstr ""
 "\n"
 "Foutmelding: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN-verbinding exporteren…"
 
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../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)."
@@ -2645,114 +3135,25 @@ msgstr ""
 "Het Netwerkbeheerapplet kon bepaalde vereiste bronnen niet vinden (het .ui-"
 "bestand is niet gevonden)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"Configureren van Bluetooth was niet mogelijk (kon geen D-Bus-proxy aanmaken: "
-"(%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr ""
-"Configureren van Bluetooth was niet mogelijk (kan NetworkManager niet "
-"vinden: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:445
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Uw mobiele telefoon als een netwerkapparaat gebruiken (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:454
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Internettoegang via uw mobiele telefoon (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:336
-#, c-format
-msgid "Error: %s"
-msgstr "Fout: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:443
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Kon DUN-verbinding niet aanmaken: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:445
-#: ../src/gnome-bluetooth/nma-bt-device.c:959
-msgid "Your phone is now ready to use!"
-msgstr "Uw telefoon is klaar voor gebruik!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:468
-msgid "Mobile wizard was canceled"
-msgstr "De mobiel-assistent is geannuleerd"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:477
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Onbekend telefoontype (geen GSM of CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:513
-msgid "unknown modem type."
-msgstr "onbekend modemtype."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:733
-#: ../src/gnome-bluetooth/nma-bt-device.c:739
-msgid "failed to connect to the phone."
-msgstr "verbinden met de telefoon mislukt."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:770
-msgid "unexpectedly disconnected from the phone."
-msgstr "de telefoonverbinding werd onverwacht verbroken."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:780
-msgid "timed out detecting phone details."
-msgstr "tijdlimiet overschreden bij detecteren van telefoondetails."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:791
-msgid "Detecting phone configuration..."
-msgstr "Telefooninstellingen aan het detecteren…"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:823
-msgid "error getting bus connection"
-msgstr "fout bij het verkrijgen van een busverbinding"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:920
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"De standaard Bluetooth-adapter moet inschakeld zijn voordat een "
-"inbelverbinding ingesteld kan worden."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Kon PAN-verbinding niet aanmaken: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:978
-#, c-format
-msgid "%s Network"
-msgstr "%s-netwerk"
-
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "Dit apparaat automatisch ontgrendelen"
-
 # openen/ontgrendelen
 #: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Ontgrendelen"
 
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "Dit apparaat automatisch ontgrendelen"
+
 #: ../src/info.ui.h:1
 msgid "Connection Information"
 msgstr "Verbindingsinformatie"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Actieve netwerkverbindingen"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:208
+#: ../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 ""
@@ -2761,21 +3162,25 @@ msgstr ""
 
 # dienst/service
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:215
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Uw apparaat:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:226
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Uw provider:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:237
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Uw abonnement:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: ../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 "
@@ -2789,24 +3194,29 @@ msgstr ""
 "instellingen dan nogmaals. Om uw instellingen te wijzigen kiest u "
 "‘Netwerkverbindingen’ in het menu."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:274
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Mobiele breedbandinstellingen bevestigen"
 
 # komt niet in de lijst voor/onbekend/niet in de lijst
-#: ../src/libnm-gtk/nm-mobile-wizard.c:338
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Niet in de lijst"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:493
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Selecteer uw abonnement:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:517
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Geselecteerd abonnement _APN (Access Point Name):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:541
+#: ../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"
@@ -2821,67 +3231,83 @@ msgstr ""
 "internetaanbieder en vraag naar de APN (naam van Access Point) van uw "
 "abonnement."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:548
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Kies uw abonnement"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:597
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Mijn abonnement komt niet in de lijst voor…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Selecteer uw provider uit de _lijst:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provider"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: ../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 "Ik kan mijn provider niet vinden en wil het hand_matig invoeren:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:803
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Provider:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:827
+#: ../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 "Mijn provider gebruikt GSM-technologie (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:833
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Mijn provider gebruikt CDMA-technologie (1xRTT, EVDO)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:844
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Kies uw provider"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../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:1113
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Land of regio"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Mijn land komt niet in de lijst voor"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Kies het land of regio van uw provider"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1227
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "GSM-apparaat geïnstalleerd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "CDMA-apparaat geïnstalleerd"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../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."
@@ -2890,148 +3316,202 @@ msgstr ""
 "via een mobiel (3G) netwerk."
 
 # informatie/gegevens
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "U heeft de volgende gegevens nodig:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "De naam van uw breedband-provider"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "De naam van uw breedband-abonnement"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../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 ""
 "(in sommige gevallen) De naam van het APN (Access Point Name) voor uw "
 "abonnement"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../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 "Een verbinding _aanmaken voor dit mobiele breedbandapparaat:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Elk apparaat"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Een mobiele breedbandverbinding instellen"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nieuwe mobiele breedbandverbinding"
 
-# kabeldraad/bekabeld/bedraad/draad
-# dit is de titel van het tabblad:
-# wired/wireless/VPN/GSM
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
-msgid "Wired"
-msgstr "Kabel"
+#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
+msgid "Store the password only for this user"
+msgstr "Wachtwoord alleen voor deze gebruiker opslaan"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr "Wachtwoord alleen voor alle gebruikers opslaan"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC-mesh"
-
-#: ../src/libnm-gtk/nm-ui-utils.c:343
-msgid "ADSL"
-msgstr "ADSL"
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+msgid "Ask for this password every time"
+msgstr "Elke keer naar dit wachtwoord vragen"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:405
-msgid "PCI"
-msgstr "PCI"
+# om een verbinding te maken met/voor het verbinden met
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+msgid "The password is not required"
+msgstr "Het wachtwoord is niet vereist"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Tweede wachtwoord:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+msgid "_Ternary Password:"
+msgstr "_Derde wachtwoord:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+msgid "Sh_ow passwords"
+msgstr "Wachtwoorden _tonen"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+msgid "Click to connect"
+msgstr "Klikken om te verbinden"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%$2s (%$1s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../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 ""
+"Of er ontbreekt een wachtwoord, of de verbinding is ongeldig. In het laatste "
+"geval dient u eerst de verbinding te bewerken met nm-connection-editor"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nieuw…"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+# zonder/geen
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Geen"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Aanmaken"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
-"Wachtwoorden of cryptografiesleutels zijn vereist om toegang te krijgen tot "
-"het draadloos netwerk ‘%s’."
+"Wachtwoorden of encryptiesleutels zijn vereist om toegang te krijgen tot het "
+"wifi-netwerk ‘%s’."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
-msgstr "Authenticatie draadloos netwerk vereist"
+msgstr "Authenticatie wifi-netwerk vereist"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
-msgstr "Het draadloos netwerk vereist authenticatie"
+msgstr "Het wifi-netwerk vereist authenticatie"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
-msgstr "Nieuw draadloos netwerk aanmaken"
+msgstr "Nieuw wifi-netwerk aanmaken"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
-msgstr "Nieuw draadloos netwerk"
+msgstr "Nieuw wifi-netwerk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
-msgstr "Voer een naam in voor het draadloze netwerk dat u wilt aanmaken."
+msgstr "Voer een naam in voor het wifi-netwerk dat u wilt aanmaken."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
-msgstr "Verbinden met verborgen draadloos netwerk"
+msgstr "Verbinden met verborgen wifi-netwerk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
-msgstr "Verborgen draadloos netwerk"
+msgstr "Verborgen wifi-netwerk"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
-"Voer de naam en de beveiligingsinstellingen in van het verborgen draadloze "
-"netwerk waarmee u wilt verbinden."
+"Voer de naam en de beveiligingsgegevens in van het verborgen wifi-netwerk "
+"waarmee u wilt verbinden."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
-msgstr "_Beveiliging voor draadloos netwerk:"
+msgstr "Wifi-_beveiliging:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "_Verbinding:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
-msgstr "Draadloze _adapter:"
+msgstr "Wifi-_adapter:"
 
-#: ../src/main.c:73
+# kabeldraad/bekabeld/bedraad/draad
+# dit is de titel van het tabblad:
+# wired/wireless/VPN/GSM
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC-mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3039,7 +3519,7 @@ msgstr ""
 "Dit programma is een onderdeel van Netwerkbeheer (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3047,150 +3527,154 @@ msgstr ""
 "Het is niet bedoeld voor gebruik via de opdrachtregel maar draait in de "
 "GNOME-werkomgeving."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
 # aangezet/ingeschakeld
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "niet ingeschakeld"
 
 # aangemeld/geregistreerd
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "niet geregistreerd"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Thuisnetwerk (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Thuisnetwerk"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "aan het zoeken"
 
 # aanmelding/registratie
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registratie afgewezen"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (%s roaming oftewel gastgebruik)"
 
-#: ../src/mb-menu-item.c:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (roaming oftewel gastgebruik)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Netwerk voor roaming oftewel gastgebruik (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Netwerk voor roaming (gastgebruik)"
 
-#: ../src/mobile-helpers.c:297
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "Pincode voor SIM-kaart ‘%s’ op ‘%s’"
 
-#: ../src/mobile-helpers.c:471
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Pincode vereist"
 
-#: ../src/mobile-helpers.c:479
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "De pincode is nodig voor het mobiele breedbandapparaat"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Mobiele breedbandverbinding ‘%s’ actief: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "roaming"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s-verbinding"
 
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "Geen certificaat van certificaatautoriteit gekozen"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr "Ongedefinieerde fout in 802.1x beveiliging (wpa-eap)"
 
-#: ../src/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr ""
-"Het niet gebruiken van een certificaat van een Certificaatautoriteit (CA) "
-"kan resulteren in verbindingen met onveilige, malafide draadloze netwerken. "
-"Wilt u een certificaat van een certificaatautoriteit kiezen?"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr "ongespecificeerde fout bij het valideren van eap-method-bestand"
 
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "CA-certificaat kiezen"
+#: ../src/wireless-security/eap-method.c:452
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr "DER, PEM, of PKCS#12 private sleutels (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
-msgstr "DER, PEM, of PKCS#12-privésleutels (*.der, *.pem, *.p12)"
-
-#: ../src/wireless-security/eap-method.c:648
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- of PEM-certificaten (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr "Ontbrekend EAP-FAST PAC-bestand"
+
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Kies een PAC-bestand…"
 
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC-bestanden (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Alle bestanden"
 
@@ -3217,8 +3701,8 @@ msgid "PAC _file:"
 msgstr "PAC-_bestand:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "_Interne authenticatie:"
 
@@ -3226,14 +3710,32 @@ msgstr "_Interne authenticatie:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automatische PAC-aanlevering _toestaan"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr "ontbrekende EAP-LEAP-gebruikersnaam"
+
+#: ../src/wireless-security/eap-method-leap.c:69
+msgid "missing EAP-LEAP password"
+msgstr "ontbrekend EAP-LEAP-wachtwoord"
+
+#: ../src/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr "ongeldig EAP-PEAP CA-certificaat: %s"
+
+#: ../src/wireless-security/eap-method-peap.c:68
+msgid "invalid EAP-PEAP CA certificate: no certificate specified"
+msgstr "ongeldig EAP-PEAP CA-certificaat: geen certificaat opgegeven"
+
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "Kies een certificaat van een certificaatautoriteit…"
 
@@ -3251,19 +3753,56 @@ msgstr "Versie 1"
 msgid "C_A certificate:"
 msgstr "C_A-certificaat:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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
+msgid "No CA certificate is _required"
+msgstr "Geen CA-certificaat _vereist"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "PEAP _versie:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "El_ke keer dit wachtwoord vragen"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr "ontbrekende EAP-gebruikersnaam"
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr "ontbrekend EAP-wachtwoord"
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr "ontbrekende EAP-TLS-identiteit"
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "ongeldig EAP-TLS CA-certificaat: %s"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr "ongeldig EAP-TLS CA-certificaat: geen certificaat opgegeven"
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr "Ongeldig EAP-TLS-wachtwoord: ontbreekt"
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr "ongeldige EAP-TLS-privésleutel: %s"
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr "ongeldig EAP-TLS gebruikerscertificaat: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Onversleutelde privésleutels zijn onveilig"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../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 "
@@ -3277,11 +3816,11 @@ msgstr ""
 "\n"
 "(U kunt uw privésleutel beveiligen met een wachtwoord via openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Kies uw persoonlijke certificaat…"
 
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Kies uw privésleutel…"
 
@@ -3293,27 +3832,44 @@ msgstr "I_dentiteit:"
 msgid "_User certificate:"
 msgstr "_Gebruikerscertificaat:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "_Privésleutel:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "Privésleutel _wachtwoord:"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../src/wireless-security/eap-method-ttls.c:63
+#, c-format
+msgid "invalid EAP-TTLS CA certificate: %s"
+msgstr "ongeldig EAP-TTLS CA-certificaat: %s"
+
+#: ../src/wireless-security/eap-method-ttls.c:68
+msgid "invalid EAP-TTLS CA certificate: no certificate specified"
+msgstr "ongeldig EAP-TTLS CA-certificaat: geen certificaat opgegeven"
+
+#: ../src/wireless-security/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr "Onbekende fout bij het valideren van de 802.1x-beveiliging"
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr "PWD"
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Getunnelde TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Beschermde EAP (PEAP)"
 
@@ -3323,29 +3879,61 @@ msgstr "Beschermde EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Au_thenticatie:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "Open systeem"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr "ontbrekende leap-gebruikersnaam"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "Gedeelde sleutel"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr "ontbrekend leap-wachtwoord"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr "ontbrekende wep-sleutel"
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
+msgstr ""
+"ongeldige wep-sleutel: sleutel met een lengte van %zu mag alleen hex-cijfers "
+"bevatten"
+
+#: ../src/wireless-security/ws-wep-key.c:120
+#, c-format
+msgid ""
+"invalid wep-key: key with a length of %zu must contain only ascii characters"
+msgstr ""
+"ongeldige wep-sleutel: sleutel met een lengte van %zu mag alleen ascii-"
+"tekens bevatten"
+
+#: ../src/wireless-security/ws-wep-key.c:125
+#, 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 ""
+"ongeldige wep-sleutel: verkeerde sleutellengte %zu. De lengte van een "
+"sleutel moet 5/13 (ascii) of 10/26 (hex) zijn"
+
+#: ../src/wireless-security/ws-wep-key.c:131
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr "ongeldige wep-sleutel: wachtwoordzin mag niet leeg zijn"
+
+#: ../src/wireless-security/ws-wep-key.c:133
+msgid "invalid wep-key: passphrase must be shorter than 64 characters"
+msgstr "ongeldige wep-sleutel: wachtwoordzin moet minder dan 64 tekens ziijn"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:1
 msgid "1 (Default)"
 msgstr "1 (Standaard)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "2"
-msgstr "2"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "3"
+msgid "Open System"
+msgstr "Open systeem"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "4"
+msgid "Shared Key"
+msgstr "Gedeelde sleutel"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -3359,6 +3947,236 @@ msgstr "Sleutel _tonen"
 msgid "WEP inde_x:"
 msgstr "WEP-inde_x:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, c-format
+msgid ""
+"invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
+"digits"
+msgstr ""
+"ongeldige wpa-psk: ongeldige sleutellengte %zu. Moet [8,63] bytes of 64 hex-"
+"cijfers zijn"
+
+#: ../src/wireless-security/ws-wpa-psk.c:77
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+"ongeldige wpa-psk: interpreteren van sleutel met 64 bytes als hex is niet "
+"mogelijk"
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Type:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "WiMA_X Mobiel breedband inschakelen"
+
+#~ msgid "_Help"
+#~ msgstr "_Hulp"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Nieuwe (CDMA) mobiele breedbandverbinding…"
+
+# bedraad netwerk/vast netwerk
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "U bent nu verbonden met het CDMA-netwerk."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA-netwerk."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Nieuwe (GSM) mobiele breedbandverbinding…"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "U bent nu verbonden met het GSM-netwerk."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM-netwerk."
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX mobiel breedband (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX mobiel breedband"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX is uitgeschakeld"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX is met de fysieke schakelaar uitgeschakeld"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "U bent nu verbonden met het WiMAX-netwerk."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "onbekend"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "onbekend"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "Secondaire DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "Tertiaire DNS:"
+
+#~ msgid "_Mode:"
+#~ msgstr "M_odus:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "MAC-adres van a_pparaat:"
+
+#~ msgid "Any"
+#~ msgstr "Elke"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Bij voorkeur 3G (UMTS/HSPA)"
+
+# prefereren/voorkeur voor/bij voorkeur
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Bij voorkeur 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Bij voorkeur 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Alleen 4G (LTE) gebruiken"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastructuur"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "_Save..."
+#~ msgstr "Op_slaan…"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Fout bij het opslaan van de verbinding"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "De eigenschap ‘%s’ /  ‘%s’ is ongeldig: %d"
+
+#~ msgid "_Edit..."
+#~ msgstr "Be_werken…"
+
+#~ msgid "_Delete..."
+#~ msgstr "_Verwijderen…"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Automatisch (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Automatisch, alleen PPP-adressen"
+
+#~ msgid "Could not load WiMAX user interface."
+#~ msgstr "Kon de gebruikersinterface voor WiMAX niet laden."
+
+#~ msgid "WiMAX connection %d"
+#~ msgstr "WiMAX-verbinding %d"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Configureren van Bluetooth was niet mogelijk (kon geen D-Bus-proxy "
+#~ "aanmaken: (%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Configureren van Bluetooth was niet mogelijk (kan NetworkManager niet "
+#~ "vinden: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Uw mobiele telefoon als een netwerkapparaat gebruiken (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Internettoegang via uw mobiele telefoon (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Fout: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Kon DUN-verbinding niet aanmaken: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Uw telefoon is klaar voor gebruik!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "De mobiel-assistent is geannuleerd"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Onbekend telefoontype (geen GSM of CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "onbekend modemtype."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "verbinden met de telefoon mislukt."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "de telefoonverbinding werd onverwacht verbroken."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "tijdlimiet overschreden bij detecteren van telefoondetails."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Telefooninstellingen aan het detecteren…"
+
+#~ msgid "error getting bus connection"
+#~ msgstr "fout bij het verkrijgen van een busverbinding"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "De standaard Bluetooth-adapter moet inschakeld zijn voordat een "
+#~ "inbelverbinding ingesteld kan worden."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Kon PAN-verbinding niet aanmaken: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s-netwerk"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Geen certificaat van certificaatautoriteit gekozen"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Het niet gebruiken van een certificaat van een Certificaatautoriteit (CA) "
+#~ "kan resulteren in verbindingen met onveilige, malafide draadloze "
+#~ "netwerken. Wilt u een certificaat van een certificaatautoriteit kiezen?"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "CA-certificaat kiezen"
+
+#~ msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#~ msgstr "DER, PEM, of PKCS#12-privésleutels (*.der, *.pem, *.p12)"
+
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "Draadloze netwerken (%s)"
 
@@ -3429,9 +4247,6 @@ msgstr "WEP-inde_x:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "Weet niet hoe ‘%s’-verbindingen te bewerken"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "kon het Bluetooth-apparaat niet vinden."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr ""
 #~ "Configureren van Bluetooth was niet mogelijk (kon geen D-Bus proxy "
@@ -3440,24 +4255,9 @@ msgstr "WEP-inde_x:"
 #~ msgid "_Wireless security:"
 #~ msgstr "_Draadloze beveiliging:"
 
-#~ msgid "Show the applet in notification area"
-#~ msgstr "Toon het programmaatje in het mededelingengebied"
-
-#~ msgid ""
-#~ "Set to FALSE to disable displaying the applet in the notification area."
-#~ msgstr ""
-#~ "Stel dit in op FALSE om het weergeven van het programmaatje in het "
-#~ "mededelingengebied, uit te schakelen."
-
 #~ msgid "Wired network"
 #~ msgstr "Bekabeld netwerk"
 
-#~ msgid "ad-hoc"
-#~ msgstr "ad hoc"
-
-#~ msgid "secure."
-#~ msgstr "veilig."
-
 #~ msgid "Disconnected - you are now offline"
 #~ msgstr "Verbinding verbroken - u bent nu niet verbonden met het internet"
 
@@ -3470,12 +4270,6 @@ msgstr "WEP-inde_x:"
 #~ msgid "Available to all users"
 #~ msgstr "Beschikbaar voor alle gebruikers"
 
-#~ msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
-#~ msgstr "DER, PEM, of PKCS#12 private sleutels (*.der, *.pem, *.p12, *.key)"
-
-#~ msgid "Use 802.1X security for this connection"
-#~ msgstr "802.1X-beveiliging gebruiken voor de deze verbinding"
-
 #~ msgid "_SSID:"
 #~ msgstr "_SSID:"
 
@@ -3506,9 +4300,6 @@ msgstr "WEP-inde_x:"
 #~ msgid "Cannot start VPN connection '%s'"
 #~ msgstr "Kan VPN-verbinding ‘%s’ niet starten"
 
-#~ msgid "Network Manager"
-#~ msgstr "Netwerkbeheerder"
-
 #~ msgid "Control your network connections"
 #~ msgstr "Beheer uw netwerkverbindingen"
 
diff --git a/po/nn.po b/po/nn.po
index 9cbd7252..a7fcb268 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,20 +9,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager 0.1.x\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2012-04-03 10:08+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Lokalize 1.4\n"
-"Language: nn\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Nettverk"
 
@@ -30,677 +29,905 @@ msgstr "Nettverk"
 msgid "Manage your network connections"
 msgstr "Handsam nettverkstilkoplingane"
 
-#: ../nm-applet.schemas.in.h:1
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "Nettverkstilkoplingar"
+
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "Handter og endra innstillingar for nettverkstilkopling"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "Slå av varsel om tilkopling"
 
-#: ../nm-applet.schemas.in.h:2
-msgid "Set this to TRUE to disable notifications when connecting to a network."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, 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."
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "Slå av varsel om fråkopling"
 
-#: ../nm-applet.schemas.in.h:4
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, 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
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Slå av varsel om tilkopling"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"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."
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
 msgid "Suppress networks available notifications"
 msgstr "Hindra varsel om tilgjengelege nettverk"
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
+"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."
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "Stempel"
 
-#: ../nm-applet.schemas.in.h:8
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
 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."
 
-#: ../nm-applet.schemas.in.h:9
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
 msgstr "Slå av laging av trådlaust nettverk"
 
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Set til TRUE for å slå av laging av ad hoc-nettverk ved bruk av "
 "miniprogrammet."
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Nettverkstilkoplingar"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
-msgid "Manage and change your network connection settings"
-msgstr "Handter og endra innstillingar for nettverkstilkopling"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:864 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "Tilgjengeleg"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Vel CA-sertifikat"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Panelprogram for NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Panelprogram for NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "K_oble til"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "_Nettverksnamn:"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+msgid "Failed to add/activate connection"
+msgstr "Klarte ikkje laga/ta i bruk tilkopling"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr "Ukjend feil"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+msgid "Connection failure"
+msgstr "Feil under tilkopling"
+
+#: ../src/applet.c:399
+msgid "Device disconnect failed"
+msgstr "Klarte ikkje kopla frå eining"
+
+#: ../src/applet.c:404
+msgid "Disconnect failure"
+msgstr "Feil under fråkopling"
+
+#: ../src/applet.c:434
+msgid "Connection activation failed"
+msgstr "Klarte ikkje ta i bruk tilkopling"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "Ikkje vis denne meldinga igjen"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "Du er no kopla til «%s»."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» vart mislukka fordi nettverkstilkoplinga vart avbroten."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1268 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "Tilkoplinga er sett opp"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» vart mislukka fordi VPN-tenesta vart uventa stoppa."
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "Du er no kopla til eit mobilt breibandnettverk."
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» vart mislukka fordi VPN-tenesta sendte eit ugyldig "
+"oppsett."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "Førebur mobil breibandstilkopling «%s» …"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» vart mislukka på grunn av eit tidsavbrot."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "Set opp mobil breibandstilkopling «%s» …"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» vart mislukka fordi VPN tenesta ikkje vart starta i "
+"tide."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
 msgstr ""
-"Brukarautentikasjon er påkravt for den mobile breibandstilkoplinga %s …"
+"\n"
+"VPN-tilkoplinga «%s» vart mislukka fordi VPN tenesta ikkje klarte å starta."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2504
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "Ber om ei nettverksadresse for «%s» …"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» vart mislukka fordi det ikkje fanst nokon gyldige "
+"gyldige VPN-løyndomar."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "Mobil breibandstilkopling «%s» er i bruk."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» vart mislukka pga. ugyldige VPN-løyndomar."
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» vart mislukka."
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
-#: ../src/applet-dialogs.c:424
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Mobilt breiband (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» vart fråkopla fordi nettverkstilkoplinga vart broten."
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1510
-msgid "Mobile Broadband"
-msgstr "Mobilt breiband"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» vart fråkopla fordi VPN-tenesta vart stoppa."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Ny mobil breibandstilkopling (CDMA) …"
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» er kopla frå."
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "Du er no kopla til eit CDMA-nettverk."
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"VPN-tilkopling vart kopla opp.\n"
+"\n"
+"%s\n"
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr "VPN-tilkopling vart kopla opp.\n"
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "Påloggingsmelding for VPN"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "VPN-tilkoplinga vart mislukka"
+
+#: ../src/applet.c:990
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Mobil breibandstilkopling «%s» er i bruk: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» vart mislukka fordi VPN-tenesta ikkje klarte å starta.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "utanlands"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN-tilkoplinga «%s» klarte ikkje starta.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-msgid "CDMA network."
-msgstr "CDMA-nettverk."
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "eininga er ikkje klar (manglar fastvare)"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
-msgid "You are now registered on the home network."
-msgstr "Du er no registrert på heimenettverket."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "eininga er ikkje klar"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
-#| msgid "You are now connected to the wired network."
-msgid "You are now registered on a roaming network."
-msgstr "Du er no registrert som gjest på eit utanlandsk nettverk."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "fråkopla"
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "Kopla frå"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:459
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Ny mobil breibandtilkopling (GSM) …"
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "eining ikkje handsama"
 
-#: ../src/applet-device-gsm.c:493
-msgid "You are now connected to the GSM network."
-msgstr "Du er no kopla til eit GSM-nettverk."
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "Ingen nettverkseiningar er tilgjengelege"
 
-#: ../src/applet-device-gsm.c:654
-msgid "PIN code required"
-msgstr "PIN-kode påkravd"
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "_VPN-tilkoplingar"
 
-#: ../src/applet-device-gsm.c:662
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "PIN-kode er påkravd av den mobile breibandseininga"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "_Set opp VPN …"
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "Ko_pla frå VPN …"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager køyrer ikkje …"
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "Nettverk slått av"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "Slå på _nettverk"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "Slå på _trådlaus"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "Slå på _mobilt breiband"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "Slå på _varsling"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "Tilkoplings_informasjon"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "Rediger tilkoplingar …"
 
-#: ../src/applet-device-gsm.c:783
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_Om"
+
+#: ../src/applet.c:2179
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "PIN-kode for SIM-kort «%s» på «%s»"
+msgid "You are now connected to '%s'."
+msgstr "Du er no kopla til «%s»."
 
-#: ../src/applet-device-gsm.c:875
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Feil PIN-kode. Kontakt leverandøren."
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "Fråkopla"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "Nettverkstilkoplinga er fråkopla."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Førebur nettverkstilkobling «%s» …"
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "Brukarautentisering krevst for nettverkstilkoplinga «%s» …"
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Ber om ei nettverksadresse for «%s» …"
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "Nettverkstilkoplinga «%s» er i bruk"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Startar VPN-tilkopling «%s» …"
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "Brukarautentisering krevst for VPN-tilkoplinga «%s» …"
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Ber om ei VPN-adresse for «%s» …"
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN-tilkopling «%s» i bruk"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "Inga nettverkstilkopling"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "Panelprogram for NetworkManager"
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Feil PUK-kode. Kontakt leverandøren."
 
+#: ../src/applet-device-broadband.c:201
+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-gsm.c:925
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Sender opplåsingskode …"
 
-#: ../src/applet-device-gsm.c:988
-msgid "SIM PIN unlock required"
-msgstr "Opplåsingskode for SIM-kortet er nødvendig"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Mobilt breiband (%s)"
 
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN Unlock Required"
-msgstr "Opplåsingskode for SIM-kortet er nødvendig"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "Mobilt breiband"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"Den mobile breibandseininga «%s» krev ein PIN-kode for SIM-kortet før den kan "
-"brukast."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Tilgjengeleg"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
-msgid "PIN code:"
-msgstr "PIN-kode:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "Ny mobil breibandstilkopling"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
-msgid "Show PIN code"
-msgstr "Vis PIN-kode"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Tilkoplinga er sett opp"
 
-#: ../src/applet-device-gsm.c:1000
-msgid "SIM PUK unlock required"
-msgstr "Opplåsing av PUK-koden til SIM-kortet er nødvendig"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "Du er no kopla til eit mobilt breibandnettverk."
 
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK Unlock Required"
-msgstr "Opplåsing av PUK-koden til SIM-kortet er nødvendig"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "Passord for mobilt breibandsnettverk"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"Den mobile breibandseininga «%s» krev ein PUK-kode for SIM-kortet før den kan "
-"brukast."
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "Du er no registrert på heimenettverket."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
-msgid "PUK code:"
-msgstr "PUK-kode:"
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "Du er no registrert som gjest på eit utanlandsk nettverk."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "New PIN code:"
-msgstr "Ny PIN-kode:"
+#: ../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."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
-msgid "Re-enter new PIN code:"
-msgstr "Skriv inn ny PUK-kode på nytt:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "Førebur mobil breibandstilkopling «%s» …"
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
-msgid "Show PIN/PUK codes"
-msgstr "Vis PIN/PUK-kodar"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, 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
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr ""
+"Brukarautentikasjon er påkravt for den mobile breibandstilkoplinga %s …"
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
-msgid "GSM network."
-msgstr "GSM-nettverk"
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "Mobil breibandstilkopling «%s» er i bruk."
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatisk lokalnett"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "Kabla nettverk (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "Kabla nettverk (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "Kabla nettverk"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "Kabla nettverk"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1510
-msgid "disconnected"
-msgstr "fråkopla"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../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-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "Førebur kabla nettverkstilkopling «%s» …"
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "Set opp kabla nettverkstilkopling «%s» …"
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../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-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../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-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../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-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL autentisering:"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Kopla til eit gøymt trådlaust nettverk …"
 
-#: ../src/applet-device-wifi.c:150
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "Opprett _nytt trådlaust nettverk …"
 
-#: ../src/applet-device-wifi.c:294
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../src/applet-device-wifi.c:792
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "Trådlause nettverk (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Kabla nettverk (%s)"
 
-#: ../src/applet-device-wifi.c:794
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "Trådlaust nettverk (%s)"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Kabla nettverk (%s)"
 
-#: ../src/applet-device-wifi.c:796
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Trådlaust nettverk"
-msgstr[1] "Trådlause nettverk"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Kabla nettverk"
+msgstr[1] "Kabla nettverk"
 
-#: ../src/applet-device-wifi.c:829
-msgid "wireless is disabled"
-msgstr "trådlaus er slått av"
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "WiMAX er slått av"
 
-#: ../src/applet-device-wifi.c:830
-msgid "wireless is disabled by hardware switch"
-msgstr "trådlaus er slått av med brytar"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WiMAX er slått av med brytar"
 
-#: ../src/applet-device-wifi.c:891
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Fleire nettverk"
 
-#: ../src/applet-device-wifi.c:1071
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "Trådlause nettverk er tilgjengelege"
 
-#: ../src/applet-device-wifi.c:1072
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, 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:1075 ../src/applet.c:926
-msgid "Don't show this message again"
-msgstr "Ikkje vis denne meldinga igjen"
-
-#: ../src/applet-device-wifi.c:1267
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, 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:1298
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Klargjer trådlaus nettverkstilkopling «%s» …"
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Førebur nettverkstilkobling «%s» …"
 
-#: ../src/applet-device-wifi.c:1301
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "Set opp trådlaus nettverkstilkopling «%s» …"
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Set opp kabla nettverkstilkopling «%s» …"
 
-#: ../src/applet-device-wifi.c:1304
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, 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:1307
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Ber om ei nettverksadresse for det trådlaust nettverket «%s» …"
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "Ber om ei nettverksadresse for «%s» …"
 
-#: ../src/applet-device-wifi.c:1328
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, 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:1333
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "Trådlaus nettverkstilkopling «%s» er i bruk"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Kabla nettverkstilkopling «%s» er  i bruk"
 
-#: ../src/applet-device-wifi.c:1381
-#| msgid "Failed to create PAN connection: %s"
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Klarte ikkje å ta i bruk tilkoplinga"
 
-#: ../src/applet-device-wifi.c:1383 ../src/applet-device-wifi.c:1402
-#: ../src/applet.c:492 ../src/applet.c:536 ../src/applet.c:562
-#| msgid "Unknown"
-msgid "Unknown error"
-msgstr "Ukjend feil"
-
-#: ../src/applet-device-wifi.c:1386 ../src/applet-device-wifi.c:1405
-#: ../src/applet.c:495 ../src/applet.c:565
-#| msgid "Connection add failed"
-msgid "Connection failure"
-msgstr "Feil under tilkopling"
-
-#: ../src/applet-device-wifi.c:1400
-#| msgid "Could not edit new connection"
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Klarte ikkje leggja til ny tilkopling"
 
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX mobilt breiband (%s)"
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX mobilt breiband"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "WiMAX er slått av"
-
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX er slått av med brytar"
-
-#: ../src/applet-device-wimax.c:428
-msgid "You are now connected to the WiMAX network."
-msgstr "Du er no kopla til WiMAX-nettverket."
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Feil under vising av tilkoplingsinformasjon:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:313
-#: ../src/libnm-gtk/nm-wireless-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adresser"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/libnm-gtk/nm-wireless-dialog.c:905
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:260
 #, c-format
-#| msgid "1 (Default)"
 msgid "%s (default)"
 msgstr "%s (forvald)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: ../src/applet-dialogs.c:361
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Ukjend"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP-adresse:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Kringkastingsadresse:"
 
-#: ../src/applet-dialogs.c:363
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "ukjend"
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Ukjend"
 
-#: ../src/applet-dialogs.c:375
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "ukjend"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Subnettmaske:"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Grensesnitt:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Maskinvareadresse:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Snøggleik:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Tryggleik:"
 
-#: ../src/applet-dialogs.c:512
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:525
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "IP-adresse:"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Ukjend"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "Kringkastingsadresse:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "Subnettmaske:"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Ukjend"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Standard rute:"
 
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "Primær DNS:"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "Sekundær DNS:"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "Ternær DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorert"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN-type:"
 
-#: ../src/applet-dialogs.c:803
-#| msgid "Gateway"
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN-portnar:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN-brukarnamn:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN-topptekst:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Grunntilkopling:"
 
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Ukjend"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Fann ingen tilkoplingar som er i bruk."
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -708,416 +935,604 @@ msgstr ""
 "Opphavsrett © 2005–2008 Novell, Inc.\n"
 "og mange andre bidragsytarar og omsetjarar i fellesskapet"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Panelprogram for handtering av dine nettverkseiningar og -tilkoplingar."
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Netstaden til NetworkManager"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Manglande ressursar"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Passord for mobilt breibandsnettverk"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Passord krevst for å kopla til «%s»."
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/applet.c:490
-#| msgid "Failed to create PAN connection: %s"
-msgid "Failed to add/activate connection"
-msgstr "Klarte ikkje laga/ta i bruk tilkopling"
-
-#: ../src/applet.c:534
-#| msgid "disconnected"
-msgid "Device disconnect failed"
-msgstr "Klarte ikkje kopla frå eining"
-
-#: ../src/applet.c:539
-#| msgid "Disconnected"
-msgid "Disconnect failure"
-msgstr "Feil under fråkopling"
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "Opplåsingskode for SIM-kortet er nødvendig"
 
-#: ../src/applet.c:560
-#| msgid "Connection add failed"
-msgid "Connection activation failed"
-msgstr "Klarte ikkje ta i bruk tilkopling"
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "Opplåsingskode for SIM-kortet er nødvendig"
 
-#: ../src/applet.c:1015
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart mislukka fordi nettverkstilkoplinga vart avbroten."
+"Den mobile breibandseininga «%s» krev ein PIN-kode for SIM-kortet før den "
+"kan brukast."
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "PIN-kode:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "Vis PIN-kode"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "Opplåsing av PUK-koden til SIM-kortet er nødvendig"
 
-#: ../src/applet.c:1018
+#: ../src/applet-dialogs.c:1348
+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:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart mislukka fordi VPN-tenesta vart uventa stoppa."
+"Den mobile breibandseininga «%s» krev ein PUK-kode for SIM-kortet før den "
+"kan brukast."
 
-#: ../src/applet.c:1021
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "PUK-kode:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "Ny PIN-kode:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+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:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart mislukka fordi VPN-tenesta sendte eit ugyldig "
-"oppsett."
 
-#: ../src/applet.c:1024
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart mislukka på grunn av eit tidsavbrot."
+"IP-adresser identifiserer datamaskina di på nettverket. Trykk på «Legg til»-"
+"knappen for å leggja til ei IP-adresse."
 
-#: ../src/applet.c:1027
-#, c-format
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Slett"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart mislukka fordi VPN tenesta ikkje vart starta i tide."
+"Viss det er kryssa av her vil denne tilkoplinga aldri verta brukt som den "
+"forvalde nettverkstilkoplinga."
 
-#: ../src/applet.c:1030
-#, c-format
+#: ../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…"
+msgstr "Lag …"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "Vel type VPN-tilkopling"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"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."
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart mislukka fordi VPN tenesta ikkje klarte å starta."
+"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/applet.c:1033
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "Kringkastingsadresse:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Grunntilkopling:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "R_ediger"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "Grensesnitt:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart mislukka fordi det ikkje fanst nokon gyldige "
-"gyldige VPN-løyndomar."
 
-#: ../src/applet.c:1036
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "Primær DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+"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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "bytar"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "Tryggl_eik:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart mislukka pga. ugyldige VPN-løyndomar."
 
-#: ../src/applet.c:1043
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Grunntilkopling:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Slå på _nettverk"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "automatisk"
+
+#: ../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
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+msgid "default"
+msgstr "forval"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart mislukka."
 
-#: ../src/applet.c:1061
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adresse"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adresse"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+msgid "invalid %s for %s (%s)"
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart fråkopla fordi nettverkstilkoplinga vart broten."
 
-#: ../src/applet.c:1064
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+msgid "invalid %s (%s)"
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart fråkopla fordi VPN-tenesta vart stoppa."
 
-#: ../src/applet.c:1070
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+msgid "invalid interface-name for %s (%s)"
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» er kopla frå."
 
-#: ../src/applet.c:1100
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid ""
-"VPN connection has been successfully established.\n"
-"\n"
-"%s\n"
+msgid "invalid interface-name (%s)"
 msgstr ""
-"VPN-tilkopling vart kopla opp.\n"
-"\n"
-"%s\n"
 
-#: ../src/applet.c:1102
-msgid "VPN connection has been successfully established.\n"
-msgstr "VPN-tilkopling vart kopla opp.\n"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Eikvar eining"
 
-#: ../src/applet.c:1104
-msgid "VPN Login Message"
-msgstr "Påloggingsmelding for VPN"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "Klarte ikkje å oppdatera tilkoplingsløyndom pga. ein ukjend feil."
 
-#: ../src/applet.c:1110 ../src/applet.c:1118 ../src/applet.c:1168
-msgid "VPN Connection Failed"
-msgstr "VPN-tilkoplinga vart mislukka"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "Bruk 802.1_X-tryggleik for denne tilkoplinga"
 
-#: ../src/applet.c:1175
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» vart mislukka fordi VPN-tenesta ikkje klarte å starta.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1178
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
 msgstr ""
-"\n"
-"VPN-tilkoplinga «%s» klarte ikkje starta.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1498
-msgid "device not ready (firmware missing)"
-msgstr "eininga er ikkje klar (manglar fastvare)"
-
-#: ../src/applet.c:1500
-msgid "device not ready"
-msgstr "eininga er ikkje klar"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1526
-msgid "Disconnect"
-msgstr "Kopla frå"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1540
-msgid "device not managed"
-msgstr "eining ikkje handsama"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.c:1584
-msgid "No network devices available"
-msgstr "Ingen nettverkseiningar er tilgjengelege"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.c:1672
-msgid "_VPN Connections"
-msgstr "_VPN-tilkoplingar"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.c:1729
-msgid "_Configure VPN..."
-msgstr "_Set opp VPN …"
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.c:1733
-msgid "_Disconnect VPN"
-msgstr "Ko_pla frå VPN …"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.c:1831
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager køyrer ikkje …"
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.c:1836 ../src/applet.c:2635
-msgid "Networking disabled"
-msgstr "Nettverk slått av"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2057
-msgid "Enable _Networking"
-msgstr "Slå på _nettverk"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2066
-msgid "Enable _Wireless"
-msgstr "Slå på _trådlaus"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2075
-msgid "Enable _Mobile Broadband"
-msgstr "Slå på _mobilt breiband"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2084
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Slå på WiMA_X mobilt breiband"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#. Toggle notifications item
-#: ../src/applet.c:2095
-msgid "Enable N_otifications"
-msgstr "Slå på _varsling"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2106
-msgid "Connection _Information"
-msgstr "Tilkoplings_informasjon"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2116
-msgid "Edit Connections..."
-msgstr "Rediger tilkoplingar …"
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2130
-msgid "_Help"
-msgstr "_Hjelp"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2139
-msgid "_About"
-msgstr "_Om"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.c:2316
-msgid "Disconnected"
-msgstr "Fråkopla"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2317
-msgid "The network connection has been disconnected."
-msgstr "Nettverkstilkoplinga er fråkopla."
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2498
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "Førebur nettverkstilkobling «%s» …"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2501
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "Brukarautentisering krevst for nettverkstilkoplinga «%s» …"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:2507
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "Nettverkstilkoplinga «%s» er i bruk"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:2590
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "Startar VPN-tilkopling «%s» …"
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.c:2593
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "Brukarautentisering krevst for VPN-tilkoplinga «%s» …"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
 
-#: ../src/applet.c:2596
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Ber om ei VPN-adresse for «%s» …"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
 
-#: ../src/applet.c:2599
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN-tilkopling «%s» i bruk"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
 
-#: ../src/applet.c:2640
-msgid "No network connection"
-msgstr "Inga nettverkstilkopling"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.c:3354
-msgid "NetworkManager Applet"
-msgstr "Panelprogram for NetworkManager"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "Lås opp denne eininga automatisk"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "_Lås opp"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Connection Information"
-msgstr "Tilkoplingsinformasjon"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Active Network Connections"
-msgstr "Aktive nettverkstilkoplingar"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "Kabla 802.1X-autentisering"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
-msgstr "_Nettverksnamn:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "automatisk"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:318
-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:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-msgid "Ig_nore automatically obtained routes"
-msgstr "O_versjå automatisk innhenta ruter"
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-#| msgid "Use this c_onnection only for resources on its network"
-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-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+msgid "Enter the traffic class for each user priority."
 msgstr ""
-"Viss det er kryssa av her vil denne tilkoplinga aldri verta brukt som den "
-"forvalde nettverkstilkoplinga."
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
+#: ../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
@@ -1130,15 +1545,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 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:9
+#: ../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
@@ -1146,15 +1563,168 @@ msgstr "V_is passord"
 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-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#: ../src/connection-editor/page-ip6.c:142
+#: ../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
 msgid "Automatic"
 msgstr "Automatisk"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Tvinna Par (TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+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.h:11
+msgid "_Speed:"
+msgstr "_Snøggleik:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "Full duple_ks"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "F_orhandla automatisk"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "Tene_ste:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+msgid "C_loned MAC address:"
+msgstr "_Klona MAC-adresse:"
+
+#: ../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 ""
+"MAC-adressa som vert oppgjeven her, vil brukast som maskinvareadresse for "
+"nettverkseininga denne tilkoplinga brukar. Denne funksjonen er kjend som MAC-"
+"kloning. Døme: 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.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Standard"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorer"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Kringkastingsadresse:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Passord for privat nøkkel:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "fråkopla"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1162,8 +1732,8 @@ msgstr "Automatisk med manuelle DNS-innstillingar"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manuell"
 
@@ -1174,22 +1744,22 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 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:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_Metode:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Adresser"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1198,8 +1768,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:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1207,23 +1777,25 @@ 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
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:10
-#| msgid "_Search domains:"
+#: ../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
 msgid "S_earch domains:"
 msgstr "_Søkjedomene:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:"
 msgstr "_DNS-tenarar:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1231,12 +1803,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
-#| msgid "Require IPv4 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1244,17 +1815,43 @@ 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:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Ruter …"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-#| msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Slått av"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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-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:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1263,64 +1860,38 @@ msgstr ""
 "IPv6-oppsett ikkje fungerer."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Kva som helst"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Føretrekk 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Føretrekk 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "Basic"
 msgstr "Grunnleggjande"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "Nu_mmer:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "Nettverks-ID:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Type:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Endra …"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#| msgid "PI_N:"
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "_Vis passord"
 
@@ -1372,198 +1943,177 @@ msgstr "Ekko"
 msgid "Send PPP _echo packets"
 msgstr "Send PPP-ekkopakkar"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "Tvinna Par (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Grunntilkopling:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "Grensesnitt:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "_Klona MAC-adresse:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "_Snøggleik:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "Full duple_ks"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "F_orhandla automatisk"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "_Device MAC address:"
-msgstr "_MAC-adresse for eining:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-#| msgid "_Cloned MAC address:"
-msgid "C_loned MAC address:"
-msgstr "_Klona MAC-adresse:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-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"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
 msgstr ""
-"MAC-adressa som vert oppgjeven her, vil brukast som maskinvareadresse for "
-"nettverkseininga denne tilkoplinga brukar. Denne funksjonen er kjend som MAC-"
-"kloning. Døme: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-#| msgid "MT_U:"
-msgid "_MTU:"
-msgstr "_MTU:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "bytar"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr "Tryggl_eik:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2,4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastruktur"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "_Sendareffekt:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Rate:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-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/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "Ka_nal:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Ban_d:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "M_ode:"
-msgstr "M_odus:"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-#| msgid "_SSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-#| msgid "Security:"
-msgid "S_ecurity:"
-msgstr "Tryggl_eik:"
+#: ../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:1
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
 msgid "Allowed Authentication Methods"
 msgstr "Tillatne autentiseringsmetodar"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1572,176 +2122,655 @@ msgstr ""
 "autentiseringsmetodar. Dersom du ikkje får kopla til, prøv å slå av støtte "
 "for nokre metodar."
 
-#: ../src/connection-editor/ce-vpn-wizard.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/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+#, fuzzy
+msgid "Ethernet"
+msgstr "Automatisk lokalnett"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "Vel type VPN-tilkopling"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+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:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
+msgid "InfiniBand"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
+#: ../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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "Maskinvareadresse:"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "Eksporter VPN-tilkopling …"
+
+#: ../src/connection-editor/connection-helpers.c:323
 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."
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
 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."
+"Klarte ikkje starta dialogvindauge for tilkoplingsredigering på grunn av ein "
+"ukjend feil."
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Create…"
-msgstr "Lag …"
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "Klarte ikkje laga ny tilkopling"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:900
-#: ../src/connection-editor/page-ip6.c:866
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "Sletting av tilkopling feila"
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, 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:804
+#: ../src/connection-editor/ip6-routes-dialog.c:746
+#: ../src/connection-editor/page-ip4.c:1068
+#: ../src/connection-editor/page-ip6.c:1066
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:917
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Nettmaske"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:934
-#: ../src/connection-editor/page-ip6.c:900
+#: ../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
 msgid "Gateway"
 msgstr "Portnar"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Kostnad"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:883
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1518
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "Redigerer %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "Redigerer tilkopling utan namn"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Tilkoplings_namn:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Feil når redigeringsverktøyet skulle startast"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Klarte ikkje leggja til tilkopling"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr ""
+"Tilkoplingsredigering fann ikkje alle nødvendige ressursar (fann ikkje .ui-"
+"fila)"
+
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "_Save"
+msgstr "_Lagra"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "Lagra alle endringar for denne tilkoplinga."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+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:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "Klarte ikkje laga ny tilkopling"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "Klarte ikkje redigera tilkopling"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+msgid "Unknown error creating connection editor dialog."
+msgstr "Klarte ikkje laga vindauge for tilkoplingsredigering."
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "Feil når redigeringsverktøyet skulle startast"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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
+msgid "Connection _name:"
+msgstr "Tilkoplings_namn:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "E_ksporter"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "aldri"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "no"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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:623
+msgid "Name"
+msgstr "Namn"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "Sist brukt"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "Rediger valt tilkopling"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "Autentiser for å redigera den valde tilkoplinga"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "Slett vald tilkopling"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "Autentiser til å sletta den valde tilkoplinga"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, 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:933
+msgid "Error creating connection"
+msgstr "Klarte ikkje oppretta tilkopling"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr "Feil under redigering av tilkopling"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, 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
+msgid "802.1x Security"
+msgstr "802.1X-tryggleik:"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, 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
+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
+msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
+msgstr ""
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/page-bluetooth.c:125
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "klarte ikkje å finna blåtanneininga."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Kabla tilkopling %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Slå på _nettverk"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Trådlaust nettverk"
+
+#: ../src/connection-editor/page-bond.c:447
+#, fuzzy
+msgid "Could not load bond user interface."
+msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "Primær DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "Kabla tilkopling %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+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
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "Klarte ikkje lasta brukargrensesnitt for DSL-nettverk."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for DSL-nettverk."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-tilkopling %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+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:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, 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
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Klona MAC-adresse:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "Standard"
+
+#: ../src/connection-editor/page-general.c:52
+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 køyrer ikkje …"
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+#, fuzzy
+msgid "Could not load InfiniBand user interface."
+msgstr "Klarte ikkje lasta brukargrensesnitt for trådlaust nettverk."
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "Kabla tilkopling %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatisk (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Berre automatiske (VPN-) adresser"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Automatisk (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Berre automatiske (PPP-) adresser"
+msgid "Automatic, addresses only"
+msgstr "Automatisk, berre adresser"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatisk (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Berre automatiske (PPPoE-) adresser"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatisk (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Berre automatiske (DHCP-) adresser"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Berre lokal lekkje"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Slått av"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "_DNS-tenarar:"
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "_Søkjedomene:"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Redigerer IPv4-ruter for %s"
 
-#: ../src/connection-editor/page-ip4.c:981
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4-innstillingar"
 
-#: ../src/connection-editor/page-ip4.c:983
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for IPv4-nettverk."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "Automatisk, berre adresser"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:285
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatisk, berre DHCP"
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Redigerer IPv6-ruter for %s"
 
-#: ../src/connection-editor/page-ip6.c:945
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6-innstillingar"
 
-#: ../src/connection-editor/page-ip6.c:947
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for IPv6-nettverk"
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for mobilt breibandnettverk."
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:327
 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:639
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Vel mobil breibandtilbydartype"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1749,429 +2778,266 @@ msgstr ""
 "Vel teknologien tilbydaren til ditt mobile breiband brukar. Spør tilbydaren "
 "om du er usikker."
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Min tilbydar brukar _GSM-basert teknologi (GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:568
 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-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ingen"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:282
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP-innstillingar"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for PPP-nettverk"
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-#: ../src/connection-editor/nm-connection-list.c:1514
-msgid "VPN"
-msgstr "VPN"
+#: ../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 "Vel fil som skal importerast"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+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:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+msgid "Could not load team port user interface."
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Inga nettverkstilkopling"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "Klarte ikkje lasta brukargrensesnitt for IPv4-nettverk."
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "VPN-tilkopling %d"
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for VPN."
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Klarte ikkje finna VPN-programtilleggsteneste til «%s»."
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:899
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-tilkopling %d"
 
-#: ../src/connection-editor/page-wired.c:89
-#: ../src/connection-editor/page-wireless.c:94
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 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-wired.c:272
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:1502
-msgid "Wired"
-msgstr "Kabla"
-
-#: ../src/connection-editor/page-wired.c:274
-msgid "Could not load wired user interface."
-msgstr "Klarte ikkje lasta brukergrensesnitt for kabla nettverk."
-
-#: ../src/connection-editor/page-wired.c:449
-#, c-format
-msgid "Wired connection %d"
-msgstr "Kabla tilkopling %d"
+"VPN-tilleggsprogrammet klarte ikkje å importera VPN-tilkoplinga rett.\n"
+"\n"
+"Feil: Ingen VPN-tenestetype."
 
-#: ../src/connection-editor/page-wired-security.c:119
-msgid "802.1x Security"
-msgstr "802.1X-tryggleik:"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "Vel type VPN-tilkopling"
 
-#: ../src/connection-editor/page-wired-security.c:121
-msgid "Could not load Wired Security security user interface."
-msgstr "Klarte ikkje lasta brukargrensesnittet for kabla nettverkstryggleik."
+#: ../src/connection-editor/page-vpn.c:255
+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 ""
+"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-wired-security.c:139
-#| msgid "Use 802.1X security for this connection"
-msgid "Use 802.1_X security for this connection"
-msgstr "Bruk 802.1_X-tryggleik for denne tilkoplinga"
+#: ../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 ""
+"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-wireless.c:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
-#, c-format
-msgid "default"
-msgstr "forval"
+#: ../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)\""
+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-wireless.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:457
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:1506
-msgid "Wireless"
-msgstr "Trådlaus"
-
-#: ../src/connection-editor/page-wireless.c:459
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for trådlaust nettverk."
 
-#: ../src/connection-editor/page-wireless.c:663
-#, c-format
-msgid "Wireless connection %d"
-msgstr "Trådlaus tilkopling %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Eikvar eining"
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Kabla tilkopling %d"
 
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/libnm-gtk/nm-wireless-dialog.c:922
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:300
-#: ../src/libnm-gtk/nm-wireless-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit passfrase"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:961
+#: ../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)"
 msgstr "Dynamisk WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:340
-#: ../src/libnm-gtk/nm-wireless-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 personleg"
 
-#: ../src/connection-editor/page-wireless-security.c:354
-#: ../src/libnm-gtk/nm-wireless-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA og WPA2 enterprise"
 
-#: ../src/connection-editor/page-wireless-security.c:395
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, 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-wireless-security.c:405
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "Trådlaus tryggleik"
 
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
 msgstr "Klarte ikkje lasta brukargrensesnitt for trådlaus tryggleik."
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Editing %s"
-msgstr "Redigerer %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:105
-msgid "Editing un-named connection"
-msgstr "Redigerer tilkopling utan namn"
-
-#: ../src/connection-editor/nm-connection-editor.c:291
-msgid ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
+msgid "missing SSID"
 msgstr ""
-"Tilkoplingsredigering fann ikkje alle nødvendige ressursar (fann ikkje .ui-"
-"fila)"
-
-#: ../src/connection-editor/nm-connection-editor.c:394
-msgid "Error creating connection editor dialog."
-msgstr "Klarte ikkje laga vindauge for tilkoplingsredigering."
-
-#: ../src/connection-editor/nm-connection-editor.c:406
-msgid "_Save"
-msgstr "_Lagra"
-
-#: ../src/connection-editor/nm-connection-editor.c:407
-msgid "Save any changes made to this connection."
-msgstr "Lagra alle endringar for denne tilkoplinga."
-
-#: ../src/connection-editor/nm-connection-editor.c:408
-msgid "_Save..."
-msgstr "_Lagra …"
-
-#: ../src/connection-editor/nm-connection-editor.c:409
-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.ui.h:5
-msgid "_Import"
-msgstr "_Importer"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "E_xport"
-msgstr "E_ksporter"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-msgid "Connection _name:"
-msgstr "Tilkoplings_namn:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-msgid "Connect _automatically"
-msgstr "Kopla til _automatisk"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "A_vailable to all users"
-msgstr "_Tilgjengeleg til alle brukarar"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "aldri"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "no"
 
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, 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:249
-#, 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:261
-#, 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:267
-#, 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:271
+#: ../src/connection-editor/page-wifi-security.c:512
 #, 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:486
-msgid "Connection add failed"
-msgstr "Klarte ikkje leggja til tilkopling"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "Klarte ikkje lagra tilkopling"
-
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Eigenskapen «%s» eller «%s» er ugyldig: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-msgstr "Ein ukjend feil oppstod."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-msgstr "Feil når redigeringsverktøyet skulle startast"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:719
-#: ../src/connection-editor/nm-connection-list.c:885
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
+msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
-"Klarte ikkje starta dialogvindauge for tilkoplingsredigering på grunn "
-"av ein ukjend feil."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "Klarte ikkje laga ny tilkopling"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "Klarte ikkje redigera ny tilkopling"
-
-#: ../src/connection-editor/nm-connection-list.c:733
-msgid "Could not edit connection"
-msgstr "Klarte ikkje redigera tilkopling"
-
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "Sletting av tilkopling feila"
-
-#: ../src/connection-editor/nm-connection-list.c:795
-#, 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/nm-connection-list.c:929
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Klarte ikkje importera VPN-tilkopling"
 
-#: ../src/connection-editor/nm-connection-list.c:931
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"VPN-tilleggsprogrammet klarte ikkje å importera VPN-tilkoplinga rett.\n"
-"\n"
-"Feil: Ingen VPN-tenestetype."
-
-#: ../src/connection-editor/nm-connection-list.c:944
-msgid "Could not edit imported connection"
-msgstr "Klarte ikkje redigera importert tilkopling"
-
-#: ../src/connection-editor/nm-connection-list.c:1125
-msgid "Name"
-msgstr "Namn"
-
-#: ../src/connection-editor/nm-connection-list.c:1137
-msgid "Last Used"
-msgstr "Sist brukt"
-
-#: ../src/connection-editor/nm-connection-list.c:1263
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr ""
-"Ingen VPN-tillegg tilgjengelege. Installer eit for å aktivera denne knappen."
-
-#: ../src/connection-editor/nm-connection-list.c:1274
-msgid "_Edit"
-msgstr "R_ediger"
-
-#: ../src/connection-editor/nm-connection-list.c:1275
-msgid "Edit the selected connection"
-msgstr "Rediger valt tilkopling"
-
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "_Edit..."
-msgstr "R_ediger …"
-
-#: ../src/connection-editor/nm-connection-list.c:1277
-msgid "Authenticate to edit the selected connection"
-msgstr "Autentiser for å redigera den valde tilkoplinga"
-
-#: ../src/connection-editor/nm-connection-list.c:1292
-msgid "_Delete"
-msgstr "_Slett"
-
-#: ../src/connection-editor/nm-connection-list.c:1293
-msgid "Delete the selected connection"
-msgstr "Slett vald tilkopling"
-
-#: ../src/connection-editor/nm-connection-list.c:1294
-msgid "_Delete..."
-msgstr "_Slett …"
-
-#: ../src/connection-editor/nm-connection-list.c:1295
-msgid "Authenticate to delete the selected connection"
-msgstr "Autentiser til å sletta den valde tilkoplinga"
-
-#: ../src/connection-editor/nm-connection-list.c:1574
-msgid "Error creating connection"
-msgstr "Klarte ikkje oppretta tilkopling"
-
-#: ../src/connection-editor/nm-connection-list.c:1575
-#, 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:1630
-#: ../src/connection-editor/nm-connection-list.c:1642
-msgid "Error editing connection"
-msgstr "Feil under redigering av tilkopling"
-
-#: ../src/connection-editor/nm-connection-list.c:1631
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "Veit ikkje korleis «%s»-tilkoplingar vert endra"
-
-#: ../src/connection-editor/nm-connection-list.c:1643
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "Fann ikkje tilkopling med UUID «%s»"
-
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2184,29 +3050,30 @@ msgstr ""
 "\n"
 "Feil: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:263
-msgid "Select file to import"
-msgstr "Vel fil som skal importerast"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Ukjend feil"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Ei fil kalla «%s» finst alt."
 
-#: ../src/connection-editor/vpn-helpers.c:316
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Byt ut"
 
-#: ../src/connection-editor/vpn-helpers.c:318
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:354
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Klarte ikkje eksportera VPN-tilkopling"
 
-#: ../src/connection-editor/vpn-helpers.c:356
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2217,119 +3084,61 @@ msgstr ""
 "\n"
 "Feil: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:391
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Eksporter VPN-tilkopling …"
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Klarte ikkje oppretta PAN-tilkopling: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "Telefonen din er no klar til bruk!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:249
-#, c-format
-msgid "%s Network"
-msgstr "%s-nettverk"
-
-#: ../src/gnome-bluetooth/bt-widget.c:375
-#, c-format
-msgid "Error: %s"
-msgstr "Feil: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:488
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Klarte ikkje oppretta DUN-tilkopling: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:511
-msgid "Mobile wizard was canceled"
-msgstr "Mobilvegvisaren vart avbroten"
-
-#: ../src/gnome-bluetooth/bt-widget.c:520
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Ukjend telefoneiningstype (ikkje GSM eller CDMA)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
-msgid "failed to connect to the phone."
-msgstr "klarte ikkje å kopla til telefonen."
-
-#: ../src/gnome-bluetooth/bt-widget.c:753
-msgid "unexpectedly disconnected from the phone."
-msgstr "uventa kopla frå telefonen."
-
-#: ../src/gnome-bluetooth/bt-widget.c:762
-msgid "timed out detecting phone details."
-msgstr "tidsavbrot under oppdaging av telefondetaljar."
-
-#: ../src/gnome-bluetooth/bt-widget.c:774
-msgid "Detecting phone configuration..."
-msgstr "Oppdagar telefoninnstillingar …"
-
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "klarte ikkje å finna blåtanneininga."
-
-#: ../src/gnome-bluetooth/bt-widget.c:980
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"Den forvalde blåtannadapteren må vera påslått før du kan setja opp "
-"ei oppringt tilkopling."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1012
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "Ikkje mogleg å setja opp blåtann (klarte ikkje kopla til D-Bus: %s)."
+"NetworkManager-miniprogrammet fann ikkje alle nødvendige ressursar (fann "
+"ikkje .ui-fila)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr ""
-"Ikkje mogleg å setja opp blåtann (klarte ikkje oppretta D-Bus-mellomtenar)."
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "_Lås opp"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1031
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr ""
-"Ikkje mogleg å setja opp blåtann (klarte ikkje finna NetworkManager: %s)"
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "Lås opp denne eininga automatisk"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1098
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Bruk mobiltelefonen din som ei nettverkseining (PAN/NAP)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Tilkoplingsinformasjon"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1107
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Få tilgang til Internettet ved å bruka mobiltelefonen din (DUN)"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "Aktive nettverkstilkoplingar"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
+#: ../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/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Di eining:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../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/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Din plan:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
+#: ../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 "
@@ -2338,28 +3147,33 @@ msgid ""
 "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."
+"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/libnm-gtk/nm-mobile-wizard.c:264
+#: ../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/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Ikkje lista"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Vel planen din:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../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/libnm-gtk/nm-mobile-wizard.c:528
+#: ../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"
@@ -2371,67 +3185,83 @@ msgstr ""
 "\n"
 "Kontakt tilbydaren din om du er usikker på kva for plan du har."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../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/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Min plan er ikkje oppgjeven …"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../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/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Tilbydar"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../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 "Eg kan ikkje finna tilbydaren min og eg vil oppgje han manuelt:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:789
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Tilbydar:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../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/libnm-gtk/nm-mobile-wizard.c:819
+#: ../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/libnm-gtk/nm-mobile-wizard.c:830
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Vel tilbydaren din"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1081
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1093
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Land eller region"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1146
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Vel landet eller regionen for leverandøren din"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1200
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Innstallert GSM-eining"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1203
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installert CDMA-eining"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1375
+#: ../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."
@@ -2439,110 +3269,211 @@ msgstr ""
 "Denne vegvisaren hjelper deg å setja opp ei mobil breibandstilkopling til "
 "eit 3G-nettverk."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1380
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Du treng følgjande informasjon:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1395
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Namnet på breibandtilbydaren din"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1401
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Namnet på betalingsplanen til breibandet ditt"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../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 ""
 "(i nokre tilfelle) APN-en (namnet på tilgangspunkt) til breibandet ditt sin "
 "betalingsplan"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../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 "Lag ei tilkopling for _denne mobile breibandseininga"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1449
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Eikvar eining"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Set opp ei mobil breibandstilkopling"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1626
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Ny mobil breibandstilkopling"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Passord:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Passord:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "_Vis passord"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Ny …"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1076
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Ingen"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "L_ag"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network '%"
-"s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Passord eller krypteringsnøklar er nødvendig for å kopla til det trådlause "
 "nettverket «%s»."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1162
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentisering for trådlaust nettverk påkravd"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "Autentisering er påkravd av det trådlause nettverket"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "Opprett nytt trådlaust nettverk"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1171
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "Nytt trådlaust nettverk"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, 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/libnm-gtk/nm-wireless-dialog.c:1174
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Kopla til eit gøymt trådlaust nettverk"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1176
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "Gøymt trådlaust nettverk"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "Oppgje namnet og tryggleiksdetaljane til det gøymde trådlause nettverket du "
 "ynskjer å kopla til."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
 msgstr "Tr_ådlaus tryggleik:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Tilkopli_ng:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
 msgstr "Trådlaust _kort:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -2550,7 +3481,7 @@ msgstr ""
 "Dette programmet er ein komponent av NetworkManager https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -2558,131 +3489,161 @@ msgstr ""
 "Det er ikkje meint for å brukast gjennom kommandolinja, men heller å køyrast "
 "i GNOME-skrivebordsmiljøet."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ikkje slått på"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ikkje registrert"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Heimenettverk (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Heimenettverk"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "søkjer"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrering nekta"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../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:153 ../src/mb-menu-item.c:159
+#: ../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:162
+#: ../src/mb-menu-item.c:170
 #, c-format
-#| msgid "Wired Network (%s)"
 msgid "Roaming network (%s)"
 msgstr "Utanlandsk nettverk (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, c-format
-#| msgid "More networks"
 msgid "Roaming network"
 msgstr "Utanlandsk nettverk"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "Standard"
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "PIN-kode for SIM-kort «%s» på «%s»"
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"NetworkManager-miniprogrammet fann ikkje alle nødvendige ressursar (fann "
-"ikkje .ui-fila)."
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "PIN-kode påkravd"
 
-#: ../src/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
-msgstr "Ingen sertifikatautoriserte sertifikat er valde"
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "PIN-kode er påkravd av den mobile breibandseininga"
 
-#: ../src/wireless-security/eap-method.c:280
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#: ../src/mobile-helpers.c:619
+#, 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:622
+msgid "roaming"
+msgstr "utanlands"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Grunntilkopling:"
+
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"Å ikkje bruka eit sertifikatautorisert sertifikat (CA) kan resultera i "
-"tilkoplingar til usikre og villeiande trådlause nettverk. Vil du velja eit "
-"sertifikatautorisert sertifikat?"
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
-msgstr "Vel CA-sertifikat"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:648
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:651
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER- eller PEM-sertifikat (*.der, *.pem, *.crt, *cer)"
 
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr "GTC"
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr "Vel PAC-fil …"
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr "PAC-filer (*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr "Alle filer"
+
 #: ../src/wireless-security/eap-method-fast.ui.h:2
-#| msgid "Anony_mous identity:"
 msgid "Anonymous"
 msgstr "Anonym"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:3
-#| msgid "Authentication"
 msgid "Authenticated"
 msgstr "Autentisert"
 
@@ -2701,9 +3662,8 @@ msgid "PAC _file:"
 msgstr "PAC-_fil:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
-#| msgid "I_nner authentication:"
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "I_ndre autentisering:"
 
@@ -2711,31 +3671,32 @@ msgstr "I_ndre autentisering:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Tillat automatisk PAC-_tildeling"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
-msgid "GTC"
-msgstr "GTC"
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "Vel PAC-fil …"
+#: ../src/wireless-security/eap-method-leap.c:69
+msgid "missing EAP-LEAP password"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:406
-msgid "PAC files (*.pac)"
-msgstr "PAC-filer (*.pac)"
+#: ../src/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:410
-msgid "All files"
-msgstr "Alle filer"
+#: ../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:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "Vel eit sertifikatautorisert sertifikat (CA) …"
 
@@ -2753,20 +3714,57 @@ msgstr "Versjon 1"
 msgid "C_A certificate:"
 msgstr "C_A-sertifikat:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-#| msgid "_PEAP version:"
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "C_A-sertifikat:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "PEAP-_versjon:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "S_pør etter dette passordet kvar gong"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A-sertifikat:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Ukrypterte private nøklar er utrygge"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../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 "
@@ -2775,16 +3773,16 @@ msgid ""
 "(You can password-protect your private key with openssl)"
 msgstr ""
 "Det ser ikkje ut til at den valde private nøkkelen er verna av eit passord. "
-"Dette kan føra til at dine tyggleiksakkreditiva kan koma på avvege. Vel "
-"eit passordverna privat nøkkel.\n"
+"Dette kan føra til at dine tyggleiksakkreditiva kan koma på avvege. Vel eit "
+"passordverna privat nøkkel.\n"
 "\n"
 "(Du kan passordverna din private nøkkel med OpenSSL)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Vel ditt personlege sertifikat …"
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Vel din private nøkkel …"
 
@@ -2796,60 +3794,102 @@ msgstr "I_dentitet:"
 msgid "_User certificate:"
 msgstr "Br_ukarsertifikat:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Privat nø_kkel:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "_Passord for privat nøkkel:"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunnelert TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Verna EAP (PEAP)"
 
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:2
 #: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
-#| msgid "_Authentication:"
 msgid "Au_thentication:"
 msgstr "Au_tentisering:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "Ope system"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "Delt nøkkel"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:4
-msgid "2"
-msgstr "2"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "3"
+msgid "Open System"
+msgstr "Ope system"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "4"
+msgid "Shared Key"
+msgstr "Delt nøkkel"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -2863,5 +3903,257 @@ msgstr "_Vis nøkkel"
 msgid "WEP inde_x:"
 msgstr "WEP-indek_s:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Type:"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Ny mobil breibandstilkopling (CDMA) …"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Du er no kopla til eit CDMA-nettverk."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA-nettverk."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Ny mobil breibandtilkopling (GSM) …"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Du er no kopla til eit GSM-nettverk."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM-nettverk"
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Trådlause nettverk (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Trådlaust nettverk (%s)"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "trådlaus er slått av"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "trådlaus er slått av med brytar"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Klargjer trådlaus nettverkstilkopling «%s» …"
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "Set opp trådlaus nettverkstilkopling «%s» …"
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Ber om ei nettverksadresse for det trådlaust nettverket «%s» …"
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "Trådlaus nettverkstilkopling «%s» er i bruk"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX mobilt breiband (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX mobilt breiband"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Du er no kopla til WiMAX-nettverket."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "ukjend"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "ukjend"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ 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"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjelp"
+
+#~ msgid "Any"
+#~ msgstr "Kva som helst"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Føretrekk 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Føretrekk 2G (GPRS/EDGE)"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_MAC-adresse for eining:"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastruktur"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Automatisk (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Berre automatiske (PPP-) adresser"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr ""
+#~ "Klarte ikkje lasta brukargrensesnittet for kabla nettverkstryggleik."
+
+#~ msgid "Wireless"
+#~ msgstr "Trådlaus"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "Trådlaus tilkopling %d"
+
+#~ 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"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Klarte ikkje lagra tilkopling"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Eigenskapen «%s» eller «%s» er ugyldig: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "Ein ukjend feil oppstod."
+
+#~ msgid "Could not edit new connection"
+#~ msgstr "Klarte ikkje redigera ny tilkopling"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "Klarte ikkje redigera importert tilkopling"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr ""
+#~ "Ingen VPN-tillegg tilgjengelege. Installer eit for å aktivera denne "
+#~ "knappen."
+
+#~ msgid "_Edit..."
+#~ msgstr "R_ediger …"
+
+#~ msgid "_Delete..."
+#~ msgstr "_Slett …"
+
+#~ 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!"
+
+#~ msgid "%s Network"
+#~ msgstr "%s-nettverk"
+
+#~ msgid "Error: %s"
+#~ msgstr "Feil: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Klarte ikkje oppretta DUN-tilkopling: %s"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Mobilvegvisaren vart avbroten"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Ukjend telefoneiningstype (ikkje GSM eller CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "klarte ikkje å kopla til telefonen."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "uventa kopla frå telefonen."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "tidsavbrot under oppdaging av telefondetaljar."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Oppdagar telefoninnstillingar …"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Den forvalde blåtannadapteren må vera påslått før du kan setja opp ei "
+#~ "oppringt tilkopling."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr ""
+#~ "Ikkje mogleg å setja opp blåtann (klarte ikkje kopla til D-Bus: %s)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr ""
+#~ "Ikkje mogleg å setja opp blåtann (klarte ikkje oppretta D-Bus-"
+#~ "mellomtenar)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr ""
+#~ "Ikkje mogleg å setja opp blåtann (klarte ikkje finna NetworkManager: %s)"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Bruk mobiltelefonen din som ei nettverkseining (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Få tilgang til Internettet ved å bruka mobiltelefonen din (DUN)"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Ingen sertifikatautoriserte sertifikat er valde"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Å ikkje bruka eit sertifikatautorisert sertifikat (CA) kan resultera i "
+#~ "tilkoplingar til usikre og villeiande trådlause nettverk. Vil du velja "
+#~ "eit sertifikatautorisert sertifikat?"
+
 #~ msgid "_Security:"
 #~ msgstr "Try_ggleik:"
diff --git a/po/oc.po b/po/oc.po
index be2febbd..d23ef3d5 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,9 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: oc\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: 2015-12-21 09:54+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -22,7 +21,7 @@ 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:3256
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Ret"
 
@@ -135,12 +134,10 @@ msgstr ""
 "prepaus dels certificats CA dins la fasa 2 de l'autentificacion EAP."
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
-#| msgid "NetworkManager Applet"
 msgid "NetworkManager"
 msgstr "NetworkManager"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-#| msgid "NetworkManager Applet"
 msgid "NetworkManager for GNOME"
 msgstr "NetworkManager per GNOME"
 
@@ -156,7 +153,7 @@ msgid ""
 "edit existing connection profiles for NetworkManager."
 msgstr ""
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autentificacion 802.1X"
 
@@ -171,7 +168,6 @@ msgid "_Cancel"
 msgstr ""
 
 #: ../src/8021x.ui.h:3
-#| msgid "Connected"
 msgid "C_onnect"
 msgstr "C_onnectat"
 
@@ -179,45 +175,45 @@ msgstr "C_onnectat"
 msgid "_Network name:"
 msgstr "_Nom de la ret :"
 
-#: ../src/ap-menu-item.c:87
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "securizat."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Fracàs de l'apondon/creacion de la connexion"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Error desconeguda"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Fracàs de la connexion"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "La desconnexion del periferic a fracassat"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Fracàs de la desconnexion"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "L'activacion de la connexion a fracassat"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Visualizar pas pus aqueste messatge"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -228,7 +224,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque la connexion ret es estada "
 "interrompuda."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -238,7 +234,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque lo servici VPN es estat arrestat "
 "d'un biais imprevist."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +245,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque lo service VPN a renviat una "
 "configuracion invalida."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -259,7 +255,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque lo relambi de connexion es "
 "depassat."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -269,7 +265,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque lo servici VPN s'es pas aviat a "
 "temps."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -279,7 +275,7 @@ msgstr ""
 "La connexion VPN « %s » a fracassat perque l'aviada del servici VPN a "
 "fracassat."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -288,7 +284,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a fracassat perque i aviá pas de secrets VPN valids."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -297,7 +293,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a fracassat en rason de secrets VPN invalids."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -306,7 +302,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » a fracassat."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -317,7 +313,7 @@ msgstr ""
 "La connexion VPN « %s » es estada desconnectada perque la connexion ret es "
 "estada interrompuda."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -327,7 +323,7 @@ msgstr ""
 "La connexion VPN « %s » es estada desconnectada perque lo servici VPN es "
 "estat arrestat."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -336,7 +332,7 @@ msgstr ""
 "\n"
 "La connexion VPN « %s » es estada desconnectada."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -347,19 +343,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "La connexion VPN es estada establida amb succès.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Messatge de connexion VPN"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "La connexion VPN a pas capitat"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -373,7 +369,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -386,560 +382,547 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "periferic pas prèst (micrologicial mancant)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "periferic pas prèst"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconnectat"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Desconnectar"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "periferic pas gerit"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Cap de periferic de ret pas disponible"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Connexions _VPN"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Configurar VPN..."
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Desconnectar lo VPN"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager fonciona pas..."
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Ret desactivada"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Activar la _ret"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Activar la ret _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Activar la connexion _mobila de benda larga"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Activar las _notificacions"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Entresenhas sus la connexion"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Modificar las connexions..."
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "_Ajuda"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_A prepaus"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Ara, sètz connectat a « %s »."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Desconnectat"
 
-#: ../src/applet.c:2362
-#| msgid ""
-#| "\n"
-#| "The VPN connection '%s' disconnected."
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "La connexion ret es estada desconnectada."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Preparacion de la connexion a la ret « %s »..."
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Autentificacion necessària per la connexion a la ret « %s »..."
 
-#: ../src/applet.c:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Obtencion d'una adreça de ret per « %s »..."
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Connexion ret « %s » activa"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Aviada de la connexion VPN « %s »..."
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Autentificacion necessària per la connexion VPN « %s »..."
 
-#: ../src/applet.c:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Obtencion d'una adreça VPN per « %s »..."
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Connexion VPN « %s » activa"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Pas cap de connexion de ret"
 
-#: ../src/applet.c:3382
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Apondon (applet) NetworkManager"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Còde PUK erronèu ; contactatz vòstre provesidor."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 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:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Mandadís del còde de desverrolhatge..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, 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:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Connexion mobila de benda larga"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Disponible"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Novèla connexion mobila de larga benda..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Connectat"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Ara sètz connectat a la ret mobila."
 
-#: ../src/applet-device-broadband.c:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Ret mobila."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Ara sètz enregistrat sus la ret domestica."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Ara sètz enregistrat sus una ret itineranta."
 
-#: ../src/applet-device-bt.c:93
+#: ../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:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, 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:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, 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:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Connexion telefòn mobil de benda larga « %s » active"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automatic"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Rets Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ret Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Rets Ethernet"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ret Ethernet"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../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:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Preparacion de la connexion a la ret Ethernet « %s »..."
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Configuracion de la connexion a la ret Ethernet « %s »..."
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
-msgstr "Autentificacion necessària per la connexion a la ret Ethernet « %s »..."
+msgstr ""
+"Autentificacion necessària per la connexion a la ret Ethernet « %s »..."
 
-#: ../src/applet-device-ethernet.c:172
+#: ../src/applet-device-ethernet.c:170
 #, 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:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Connexion a la ret Ethernet « %s » activa"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autentificacion DSL"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Se connectar a una ret Wi-Fi invisibla..."
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Crear una _novèla ret Wi-Fi..."
 
 #
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(pas cap)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Rets Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Ret Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Ret Wi-Fi"
 msgstr[1] "Rets Wi-Fi"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "lo Wi-Fi es desactivat"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "lo Wi-Fi es desactivat per un comutador material"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Mai de rets"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Rets Wi-Fi disponiblas"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 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:1237
+#: ../src/applet-device-wifi.c:1364
 #, 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:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Preparacion de la connexion ret Wi-Fi « %s »..."
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, 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:1275
+#: ../src/applet-device-wifi.c:1405
 #, 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:1278
+#: ../src/applet-device-wifi.c:1408
 #, 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:1289
+#: ../src/applet-device-wifi.c:1419
 #, 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:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Connexion a la ret Wi-Fi « %s » activa"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "L'activacion de la connexion a fracassat"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "L'apondon de la novèla connexion a fracassat"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Error al moment de l'afichatge de las informacions de connexion :"
 
-#: ../src/applet-dialogs.c:75 ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
 #
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP dinamic"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
-#| msgid "Addresses"
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Mai d'adreças"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Pas cap"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (per defaut)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mo/s"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconegut"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "Adreça IP :"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Adreça de broadcast :"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Amagatal de sosret :"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "Wifi 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "General"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interfaç :"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Adreça materiala :"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Pilòt :"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Velocitat :"
 
 #
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Seguretat :"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Rota per defaut :"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorat"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Tipe de VPN :"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Palanca pel VPN"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Nom d'utilizaire pel VPN :"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Bandièra pel VPN :"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Connexion de basa :"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconegut"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Cap de connexion valida activa pas trobada !"
 
-#: ../src/applet-dialogs.c:977
-#| msgid ""
-#| "Copyright © 2004-2011 Red Hat, Inc.\n"
-#| "Copyright © 2005-2008 Novell, Inc.\n"
-#| "and many other community contributors and translators"
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -949,44 +932,44 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "e fòrça contributors e traductors mai de la comunautat"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 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:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager fonciona pas..."
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Ressorsas mancantas"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Senhal de la ret telefòn mobil de benda larga"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, 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:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Mot de pas :"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Desverrolhatge SIM PIN requesit"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 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:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -996,25 +979,25 @@ msgstr ""
 "èsser utilizat."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Còde PIN :"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Afichar lo còde PIN"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Desverrolhatge SIM PUK requesit"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 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:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1024,22 +1007,22 @@ msgstr ""
 "èsser utilizat."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Còde PUK :"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Còde PIN novèl :"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 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:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Afichar los còdes PIN/PUK"
 
@@ -1058,8 +1041,8 @@ msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
 msgstr ""
-"Las adreças IP identifican vòstre ordenador sus la ret. Clicatz sul boton "
-"« Apondre » per apondre una adreça IP."
+"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
@@ -1080,7 +1063,7 @@ msgstr ""
 #: ../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:697
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Suprimir"
 
@@ -1181,7 +1164,7 @@ msgstr "Mòde"
 #: ../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:681
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Modificar"
 
@@ -1283,7 +1266,6 @@ msgid "s"
 msgstr "s"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:10
-#| msgid "Enable _Networking"
 msgid "Enable I_GMP snooping"
 msgstr "Activar la _ret I_GMP"
 
@@ -1299,60 +1281,57 @@ msgstr "_Durada maximum :"
 msgid "_Aging time:"
 msgstr "_Durada de vida :"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatic"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "per defaut"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "error pas especificada"
 
-#: ../src/connection-editor/ce-page.c:247
-#| msgid "Address"
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "Adreça MAC"
 
-#: ../src/connection-editor/ce-page.c:247
-#| msgid "Address"
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "Adreça HW"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:486
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s invalid (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page.c:487
-#| msgid "Any device"
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "periferic"
 
-#: ../src/connection-editor/ce-page.c:593
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "La mesa a jorn de las informacions d'autentificacion de connexion a "
@@ -1574,8 +1553,8 @@ 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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1587,8 +1566,8 @@ msgstr "Sen_hal :"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatic"
@@ -1644,7 +1623,6 @@ msgstr "Negociacion aut_omatica"
 #: ../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
-#| msgid "_Service:"
 msgid "_Device:"
 msgstr "_Periferic :"
 
@@ -1670,41 +1648,43 @@ msgid "Wake on LAN:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:20
-#| msgid "Default"
 msgid "De_fault"
 msgstr "Per de_faut"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorar"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
-#| msgid "Broadcast"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
-#| msgid "_Private key password:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1747,8 +1727,8 @@ msgstr "Automatic amb parametratge manual del DNS"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manual"
 
@@ -1759,8 +1739,8 @@ 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:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Partejat amb d'autres ordenadors"
 
@@ -1799,15 +1779,15 @@ msgstr "ID de 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:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "Do_menis de recèrca :"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Ser_vidors DNS :"
 
@@ -1838,7 +1818,7 @@ msgid "_Routes…"
 msgstr "_Rotas…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Desactivat"
 
@@ -1976,7 +1956,6 @@ msgid "_Teamed connections:"
 msgstr "_Connexions en equipa :"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-#| msgid "Import a saved VPN configuration..."
 msgid "Im_port team configuration from a file..."
 msgstr "_Importar una configuracion en equipa a partir d'un fichier..."
 
@@ -1985,12 +1964,10 @@ msgid "_Parent interface:"
 msgstr "Interfàcia _parenta :"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-#| msgid "VLAN interface _name:"
 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:"
 msgid "Cloned MAC _address:"
 msgstr "Adreça MA_C clonada :"
 
@@ -2084,7 +2061,7 @@ msgstr "Ben_da :"
 msgid "SS_ID:"
 msgstr "SS_ID :"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr ""
 
@@ -2141,78 +2118,78 @@ 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:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:126
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Ligam"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "En equipa"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Pont"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:597 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Material"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtual"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Importar una configuracion VPN enregistrada..."
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2220,79 +2197,76 @@ 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:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Impossible de crear una connexion novèla"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "La supression de la connexion a fracassat"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Adreça"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Masqueta de ret"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Palanca"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrica"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Modificacion de %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Modificacion de la connexion anonima"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
-#| msgid "Connection _name:"
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Nom de la connexion mancant"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
-#| msgid "Error initializing editor"
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Inicializacion de l'editor..."
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
-#| msgid "Connection add failed"
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "La connexion pòt pas èsser modificada"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr ""
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2300,39 +2274,39 @@ 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:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "Enregi_strar"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Enregistrar tota modificacion aportada a aquesta connexion."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Impossible de crear una connexion"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Impossible de modificar la connexion"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 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:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Error al moment de l'inicializacion de l'editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "L'apondon de la connexion a fracassat"
 
@@ -2348,170 +2322,163 @@ msgstr "_Entresenhas sus la connexion"
 msgid "_Export..."
 msgstr "_Exportar..."
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "jamai"
 
 #
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "ara"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Darrièra utilizacion"
 
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Modifica la connexion seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "S'autentificar per modificar la connexion seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Suprimís la connexion seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "S'autentificar per suprimir la connexion seleccionada"
 
-#: ../src/connection-editor/nm-connection-list.c:924
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Cap d'empeuton VPN es pas installat."
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:928
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Error al moment de la creacion de la connexion"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Error al moment de la modificacion de la connexion"
 
-#: ../src/connection-editor/nm-connection-list.c:951
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Seguretat 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 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:128
+#: ../src/connection-editor/page-8021x-security.c:125
 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:61
+#: ../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:128
-#| msgid "Could not load ethernet user interface."
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:178
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:261
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
-#| msgid "Bond connection %d"
 msgid "Bluetooth connection %d"
 msgstr "Connexion Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:305
-#| msgid "Bluetooth"
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Tipe de Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:323
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr ""
 
-#: ../src/connection-editor/page-bluetooth.c:328
-#| msgid "Ethernet Network"
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "Ret Ethernet _personala"
 
-#: ../src/connection-editor/page-bluetooth.c:333
-#| msgid "Wi-Fi Network"
-#| msgid_plural "Wi-Fi Networks"
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr ""
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 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
-#| msgid "Primary DNS:"
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "principal"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr ""
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire del pont."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Connexion pont %d"
@@ -2519,74 +2486,69 @@ 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:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Pòrt del pont"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 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:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire DCB."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Impossible de cargar l'interfàcia de l'utilizaire DSL."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Connexion DLS %d"
 
-#: ../src/connection-editor/page-ethernet.c:77
-#| msgid ""
-#| "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:74
 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:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire Ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:447
-#| msgid "Ethernet"
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Periferic Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:744
-#: ../src/connection-editor/page-wifi.c:583
-#| msgid "C_loned MAC address:"
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "Adreça _MAC clonada"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr ""
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Per defaut"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2597,15 +2559,15 @@ msgstr ""
 "parametrada dins lo parafuòc. Aquò es pas utilizable que se FirewallD es "
 "activat."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD es pas aviat."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire principala."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2613,152 +2575,152 @@ msgid ""
 "(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)\""
 msgstr ""
 
-#: ../src/connection-editor/page-infiniband.c:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 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-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatic (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Adreças automaticas solament (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automatic, adreças solament"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatic (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Adreças automaticas solament (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatic (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Adreças automaticas solament (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Ligam-local solament"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Ser_vidors DNS suplementaris :"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Do_menis de recèrca suplementaris :"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Modificacion de las rotas IPv4 per %s"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Paramètres IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Impossible de cargar l'interfàcia de l'utilizaire IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatic, DHCP solament"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Modificacion de las rotas IPv6 per %s"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Paramètres IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Impossible de cargar l'interfàcia de l' utilizaire IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Esclaus duplicats"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, 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:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2767,26 +2729,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:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "Esclau %s %d"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 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:330
+#: ../src/connection-editor/page-mobile.c:327
 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:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Seleccion del tipe de provesidor de connexion mobila de benda larga"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2794,87 +2756,87 @@ 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:564
+#: ../src/connection-editor/page-mobile.c:561
 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, "
 "etc.)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 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:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "pas cap"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../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:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Paramètres PPP"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Impossible de cargar l'interfàcia de l'utilizaire PPP."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Seleccionatz lo fichièr d'importar"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Error : lo fichier ne contient pas de configuracion JSON valide"
 
-#: ../src/connection-editor/page-team.c:272
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire en equipa."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Connexion en equipa %d"
@@ -2882,57 +2844,56 @@ 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:154
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Pòrt d'equipa"
 
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:153
 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:417
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (via « %s »)"
 
-#: ../src/connection-editor/page-vlan.c:429
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
-#| msgid "No network connection"
 msgid "New connection..."
 msgstr "Connexion novèla..."
 
-#: ../src/connection-editor/page-vlan.c:599
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire VLAN."
 
-#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr ""
 
-#: ../src/connection-editor/page-vlan.c:800
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Connexion VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Impossible de cargar l'interfàcia d'utilizaire VPN."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Impossible de trobar lo servici d'empeuton VPN per « %s »."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Connexions VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2942,11 +2903,11 @@ msgstr ""
 "\n"
 "Error : pas cap tipe de servici VPN."
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Seleccionar un tipe de connexion VPN"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2956,7 +2917,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:80
+#: ../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"
@@ -2964,93 +2925,89 @@ 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:91
-#| msgid ""
-#| "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: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:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 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:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi.c:579
-#| msgid "Any device"
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Periferic Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Connexion Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "WEP dinamic (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA e WPA2 personal"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA e WPA2 entrepresa"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 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:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Seguretat Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 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:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr ""
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Impossible d'importar una connexion VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3063,30 +3020,29 @@ msgstr ""
 "\n"
 "Error : %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
-#| msgid "Unknown error"
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "Error desconeguda"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, 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:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Remplaçar"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Impossible d'exportar la connexion VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3097,11 +3053,11 @@ msgstr ""
 "\n"
 "Error : %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exportar la connexion VPN..."
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3125,8 +3081,8 @@ msgstr "Entresenhas sus la connexion"
 msgid "Active Network Connections"
 msgstr "Connexions de ret activas"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
@@ -3134,25 +3090,25 @@ msgstr ""
 "seguents :"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.c:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../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:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../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:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3166,28 +3122,28 @@ msgstr ""
 "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:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Pas dins la lista"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../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:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3200,83 +3156,83 @@ msgstr ""
 "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:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Mon plan figura pas dins la lista..."
 
-#: ../src/libnma/nma-mobile-wizard.c:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provesidor"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Tròbi pas mon provesidor e lo vòli picar  _manualament :"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../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:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../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:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../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:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 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:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Periferic GSM installat"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Periferic CDMA installat"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3284,107 +3240,103 @@ 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:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Lo nom de vòstre provesidor benda larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "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:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Crear una connexion per aqueste aparelh _mobil de benda larga :"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Connexion novèla mobila de benda larga"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../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:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../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:55 ../src/libnm-gtk/nm-ui-utils.c:620
-#| msgid "As_k for this password every time"
+#: ../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:56 ../src/libnm-gtk/nm-ui-utils.c:621
-#| msgid "A password is required to connect to '%s'."
+#: ../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:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../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.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
-#| msgid "_Password:"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "Senhal _terciari :"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
+#: ../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-wifi-dialog.c:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
-#| msgid "Disconnect"
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Clicar per se connectar"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Novèl..."
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Pas cap"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3392,35 +3344,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:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentificacion necessària per la ret Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autentificacion demandada per la ret Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Creacion d'una novèla ret Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Novèla ret Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Connexion a la ret Wi-Fi invisibla"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Ret Wi-Fi amagada"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3440,23 +3392,23 @@ msgstr "Co_nnexion :"
 msgid "Wi-Fi _adapter:"
 msgstr "Ad_aptador Wi-Fi :"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../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:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Malhum OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3466,25 +3418,25 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Usatge :"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"Ce programme fait partie de NetworkManager "
-"(https://wiki.gnome.org/Projects/NetworkManager/)."
+"Ce programme fait partie de NetworkManager (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3492,151 +3444,151 @@ 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:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "pas activat"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "pas enregistrat"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Ret domestica (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Ret domestica"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "recèrca"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "enregistrament refusat"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Ret itineranta (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Ret itineranta"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, 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:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Còde PIN requerit"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 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:610
+#: ../src/mobile-helpers.c:619
 #, 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:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "itinerança"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Connexion %s"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:452
 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:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificats DER o PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Causir un fichièr PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Fichièr PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Totes los fichièrs"
 
@@ -3672,32 +3624,32 @@ msgstr "Autentificacion i_ntèrna :"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "P_ermetre lo provisionament PAC automatic"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../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:69
+#: ../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:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Causissètz un certificat d'una autoritat de certificacion..."
 
@@ -3725,47 +3677,46 @@ msgstr "Aucun certificat de CA n'est _requis"
 msgid "PEAP _version:"
 msgstr "Version de _PEAP :"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
-#| msgid "C_A certificate:"
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Las claus privadas pas chifradas son pas seguras."
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3779,11 +3730,11 @@ msgstr ""
 "\n"
 "(Podètz protegir vòstra clau privada amb un senhal gràcias a openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Causissètz vòstre certificat personal..."
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Causissètz vòstra clau privada..."
 
@@ -3803,36 +3754,36 @@ msgstr "_Clau privada :"
 msgid "_Private key password:"
 msgstr "_Senhal de la clau privada :"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../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:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1x security"
 msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegit (PEAP)"
 
@@ -3842,11 +3793,11 @@ msgstr "EAP protegit (PEAP)"
 msgid "Au_thentication:"
 msgstr "Au_tentificacion :"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr ""
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr ""
 
@@ -3904,14 +3855,14 @@ msgstr "A_fichar la clau"
 msgid "WEP inde_x:"
 msgstr "Indè_x WEP :"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, 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:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 
@@ -3919,6 +3870,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Tipe :"
 
+#~ msgid "_Help"
+#~ msgstr "_Ajuda"
+
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Activar la connexion mobila WiMA_X de benda larga"
 
diff --git a/po/or.po b/po/or.po
index 317425d4..12ff0c73 100644
--- a/po/or.po
+++ b/po/or.po
@@ -2,1347 +2,1737 @@
 # Oriya translation of network-manager-applet.
 # Copyright (C) 2009 network-manager-applet's COPYRIGHT HOLDER
 # This file is distributed under the same license as the network-manager-applet package.
-# 
+#
 # Manoj Kumar Giri <mgiri@redhat.com>, 2009, 2010, 2011.
 # mgiri <mgiri@redhat.com>, 2014. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-21 08:48-0400\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
 "Language: or\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Zanata 3.5.1\n"
 
-#: ../nm-applet.desktop.in.h:1
-msgid "Network Manager"
-msgstr "ନେଟୱର୍କ ପରିଚାଳକ"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#, fuzzy
+msgid "Network"
+msgstr "%s ନେଟୱର୍କ"
 
 #: ../nm-applet.desktop.in.h:2
-msgid "Control your network connections"
+#, fuzzy
+msgid "Manage your network connections"
 msgstr "ଆପଣଙ୍କର ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକୁ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ"
 
-#: ../nm-applet.schemas.in.h:1
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ"
+
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "ଆପଣଙ୍କର ନେଟୱର୍କ ସଂଯୋଗ ସଂରଚନାକୁ ପରିଚାଳନା କରନ୍ତୁ ଏବଂ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "ସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../nm-applet.schemas.in.h:2
-msgid ""
-"Set this to TRUE to disable notifications when connecting to a network."
-msgstr ""
-"ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ହେବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE "
-"ସେଟ କରନ୍ତୁ।"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr "ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ହେବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "ଅସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../nm-applet.schemas.in.h:4
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
-"ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ "
-"ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
+"ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "ସଂଯୁକ୍ତ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, 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
 msgid "Suppress networks available notifications"
 msgstr "ନେଟୱର୍କ ଉପଲବ୍ଧ ବିଜ୍ଞପ୍ତିକୁ ଲୁଚାଇ ଦିଅନ୍ତୁ"
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
-msgstr ""
-"ବେତାର ନେଟୱର୍କ ଉପଲବ୍ଧ ଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE "
-"ସେଟ କରନ୍ତୁ।"
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr "ବେତାର ନେଟୱର୍କ ଉପଲବ୍ଧ ଥିବା ସମୟରେ ବିଜ୍ଞପ୍ତିକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "ଷ୍ଟାମ୍ପ"
 
-#: ../nm-applet.schemas.in.h:8
-msgid ""
-"Used to determine whether settings should be migrated to a new version."
-msgstr ""
-"ବିନ୍ୟାସକୁ ଗୋଟିଏ ନୂତନ ସଂସ୍କରଣକୁ ସ୍ଥାନାନ୍ତରଣ କରିବା ଉଚିତ କି ନୁହଁ ତାହା "
-"ନିର୍ଦ୍ଧାରଣ କରୁଅଛି।"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr "ବିନ୍ୟାସକୁ ଗୋଟିଏ ନୂତନ ସଂସ୍କରଣକୁ ସ୍ଥାନାନ୍ତରଣ କରିବା ଉଚିତ କି ନୁହଁ ତାହା ନିର୍ଦ୍ଧାରଣ କରୁଅଛି।"
 
-#: ../nm-applet.schemas.in.h:9
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
 msgstr "WiFi ନିର୍ମାଣକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ"
 
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
-"ଆପଲେଟ ବ୍ୟବହାର କରୁଥିବା ସମୟରେ ଏଡହକ ନେଟୱର୍କଗୁଡ଼ିକର ନିର୍ମାଣକୁ ନିଷ୍କ୍ରିୟ କରିବା "
-"ପାଇଁ ଏହାକୁ TRUE ସେଟ କରନ୍ତୁ।"
+"ଆପଲେଟ ବ୍ୟବହାର କରୁଥିବା ସମୟରେ ଏଡହକ ନେଟୱର୍କଗୁଡ଼ିକର ନିର୍ମାଣକୁ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଏହାକୁ TRUE ସେଟ "
+"କରନ୍ତୁ।"
 
-#: ../nm-applet.schemas.in.h:11
-msgid "Show WPA protocol chooser widget"
-msgstr "WPA ପ୍ରୋଟୋକଲ ଚୟନକର୍ତ୍ତା ୱିଜେଟ୍‌କୁ ଦର୍ଶାନ୍ତୁ"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:12
-msgid "Set to TRUE to show the WPA protocol chooser when editing connections."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
-"ସଂଯୋଗଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରିବା ସମୟରେ WPA ପ୍ରୋଟୋକଲ ଚୟନକର୍ତ୍ତାକୁ ଦର୍ଶାଇବା ପାଇଁ "
-"TRUE ସେଟ କରନ୍ତୁ।"
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
 
-#: ../nm-connection-editor.desktop.in.h:2
-msgid "Manage and change your network connection settings"
-msgstr "ଆପଣଙ୍କର ନେଟୱର୍କ ସଂଯୋଗ ସଂରଚନାକୁ ପରିଚାଳନା କରନ୍ତୁ ଏବଂ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
 
-#: ../src/applet-dbus-manager.c:165
-#, c-format
-msgid "An instance of nm-applet is already running.\n"
-msgstr "nm-applet ର ଗୋଟିଏ ଦୃଷ୍ଟାନ୍ତ ପୂର୍ବରୁ ଚାଲୁଅଛି।\n"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
 
-#: ../src/applet-dbus-manager.c:167
-#, c-format
-msgid "Could not acquire the %s service. (%d)\n"
-msgstr "%s ସର୍ଭିସକୁ ଅଧିକାର କରିପାରିଲା ନାହିଁ। (%d)\n"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "ନେଟୱର୍କ ପରିଚାଳକ"
 
-#: ../src/applet-device-bond.c:74 ../src/applet-device-bridge.c:74
-#: ../src/applet-device-bt.c:95 ../src/applet-device-cdma.c:329
-#: ../src/applet-device-gsm.c:372 ../src/applet-device-infiniband.c:131
-#: ../src/applet-device-vlan.c:189 ../src/applet-device-wifi.c:782
-#: ../src/applet-device-wired.c:135
-msgid "Available"
-msgstr "ଉପଲବ୍ଧ"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "ନେଟୱର୍କ ପରିଚାଳକ"
 
-#: ../src/applet-device-bond.c:87 ../src/applet-device-bridge.c:87
-#: ../src/applet-device-bt.c:107 ../src/applet-device-cdma.c:368
-#: ../src/applet-device-gsm.c:411 ../src/applet-device-infiniband.c:146
-#: ../src/applet-device-vlan.c:202 ../src/applet-device-wifi.c:1231
-#: ../src/applet-device-wired.c:150
-msgid "Connection Established"
-msgstr "ସଂଯୋଗ ସ୍ଥାପନ ହୋଇସାରିଛି"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
 
-#: ../src/applet-device-bond.c:88
-msgid "You are now connected to the bonded network."
-msgstr "ଆପଣ ବର୍ତ୍ତମାନ ବନ୍ଧନ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ।"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
 
-#: ../src/applet-device-bond.c:112
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "ବନ୍ଧନ ସଂଯୋଗ '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି..."
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#, fuzzy
+msgid "802.1X authentication"
+msgstr "ତାରଯୁକ୍ତ 802.1X ବୈଧିକରଣ"
 
-#: ../src/applet-device-bond.c:115
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "ବନ୍ଧନ ସଂଯୋଗ ସଂରଚନା କରୁଅଛି '%s'..."
+#: ../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
+msgid "_Cancel"
+msgstr ""
 
-#: ../src/applet-device-bond.c:118
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "ବନ୍ଧନ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "ସଂଯୋଗ କରନ୍ତୁ (_o)"
 
-#: ../src/applet-device-bond.c:121 ../src/applet-device-bridge.c:121
-#: ../src/applet-device-infiniband.c:180 ../src/applet-device-vlan.c:236
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "'%s' ପାଇଁ ଠିକଣା ଅନୁରୋଧ କରୁଅଛି..."
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "ନେଟୱର୍କ ନାମ (_N):"
 
-#: ../src/applet-device-bond.c:125 ../src/applet-device-bridge.c:125
-#: ../src/applet-device-vlan.c:240
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VLAN ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "ଏଡ-ହକ"
 
-#: ../src/applet-device-bridge.c:88
-msgid "You are now connected to the bridged network."
-msgstr "ଆପଣ ବର୍ତ୍ତମାନ ବ୍ରିଜ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ।"
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
 
-#: ../src/applet-device-bridge.c:112
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "ବ୍ରିଜ ସଂଯୋଗ '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି..."
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
 
-#: ../src/applet-device-bridge.c:115
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "ବ୍ରିଜ ସଂଯୋଗ '%s' କୁ ବିନ୍ୟାସ କରୁଅଛି..."
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "ଅଜଣା"
 
-#: ../src/applet-device-bridge.c:118
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "ବ୍ରିଜ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "ସଂଯୋଗ ଯୋଗକରିବା ବିଫଳ ହୋଇଛି"
 
-#: ../src/applet-device-bt.c:108
-msgid "You are now connected to the mobile broadband network."
-msgstr "ଆପମ ବର୍ତ୍ତମାନ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "ଅସଂଯୋଜିତ"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "ସଂଯୋଗ ଯୋଗକରିବା ବିଫଳ ହୋଇଛି"
 
-#: ../src/applet-device-bt.c:132 ../src/applet-device-cdma.c:397
-#: ../src/applet-device-gsm.c:440
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "ଏହି ସନ୍ଦେଶକୁ ପୁଣିଥରେ ଦର୍ଶାନ୍ତୁ ନାହିଁ"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପ୍ରସ୍ତୁତ କରୁଅଛି '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ ନେଟୱର୍କ ସଂଯୋଗ ବାଧାପ୍ରାପ୍ତ ହୋଇଛି।"
 
-#: ../src/applet-device-bt.c:135 ../src/applet-device-cdma.c:400
-#: ../src/applet-device-gsm.c:443
+#: ../src/applet.c:847
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସଂରଚନା କରୁଅଛି '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଅପ୍ରତ୍ୟାଶିତ ଭାବରେ ବନ୍ଦ ହୋଇଯାଇଛି।"
 
-#: ../src/applet-device-bt.c:138 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:446
+#: ../src/applet.c:850
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଅବୈଧ ସଂରଚନାରେ ପରିବର୍ତ୍ତିତ ହୋଇଛି।"
 
-#: ../src/applet-device-bt.c:141 ../src/applet-device-cdma.c:406
-#: ../src/applet-device-gsm.c:449 ../src/applet.c:2568
+#: ../src/applet.c:853
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "'%s' ପାଇଁ ନେଟୱର୍କ ଠିକଣା ଅନୁରୋଧ କରୁଅଛି..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ ସଂଯୋଗର ସମୟ ସମାପ୍ତ ପାଇଁ ପ୍ରୟାସ କରୁଅଛି।"
 
-#: ../src/applet-device-bt.c:145 ../src/applet-device-cdma.c:423
-#: ../src/applet-device-gsm.c:461
+#: ../src/applet.c:856
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଉଚିତ ସମୟରେ ଆରମ୍ଭ ହୋଇନଥିଲା।"
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:638
-#: ../src/mb-menu-item.c:55
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:859
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଆରମ୍ଭ ହେବାରେ ବିଫଳ ହୋଇଛି।"
 
-#: ../src/applet-device-cdma.c:278 ../src/applet-device-gsm.c:322
+#: ../src/applet.c:862
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ ସେଠାରେ କୌଣସି ବୈଧ VPN ଗୁପ୍ତ ତଥ୍ୟ ନଥିଲା।"
 
-#: ../src/applet-device-cdma.c:280 ../src/applet-device-gsm.c:324
-#: ../src/connection-editor/new-connection.c:118
-#: ../src/connection-editor/page-mobile.c:326
-msgid "Mobile Broadband"
-msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ"
+#: ../src/applet.c:865
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"ଅବୈଧ VPN ଗୁପ୍ତ ତଥ୍ୟଗୁଡ଼ିକ ହେତୁ VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି।"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:342
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "ନୂତନ ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ (CDMA) ସଂଯୋଗ..."
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି।"
 
-#: ../src/applet-device-cdma.c:369
-msgid "You are now connected to the CDMA network."
-msgstr "ଆପଣ ବର୍ତ୍ତମାନ CDMA ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
+#: ../src/applet.c:888
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ସଂଯୋଗ ବିଛିନ୍ନ ହୋଇଛି କାରଣ ନେଟୱର୍କ ସଂଯୋଗ ବାଧାପ୍ରାପ୍ତ ହୋଇଛି।"
 
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-gsm.c:456
+#: ../src/applet.c:891
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ସଂଯୋଗ ବିଛିନ୍ନ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ବନ୍ଦ ହୋଇଯାଇଛି।"
 
-#: ../src/applet-device-cdma.c:421 ../src/applet-device-gsm.c:459
-msgid "roaming"
-msgstr "ରୋମିଙ୍ଗ"
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ବିଚ୍ଛିନ୍ନ ହୋଇଛି।"
 
-#: ../src/applet-device-gsm.c:210 ../src/connection-editor/page-mobile.c:641
-#: ../src/mb-menu-item.c:60
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:385
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "ନୂତନ ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ (GSM) ସଂଯୋଗ..."
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
 
-#: ../src/applet-device-gsm.c:412
-msgid "You are now connected to the GSM network."
-msgstr "ଆପମ ବର୍ତ୍ତମାନ GSM ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "VPN ଲଗଇନ ସନ୍ଦେଶ"
 
-#: ../src/applet-device-gsm.c:688
-msgid "PIN code required"
-msgstr "PIN ସଂକେତ ଆବଶ୍ୟକ"
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "VPN ସଂଯୋଗ ବିଫଳ ହୋଇଛି"
 
-#: ../src/applet-device-gsm.c:690
-msgid "PUK code required"
-msgstr "PUK ସଂକେତ ଆବଶ୍ୟକ"
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଆରମ୍ଭ ହେବାରେ ବିଫଳ ହୋଇଛି।\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:701
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣ ପାଇଁ PIN ସଂକେତ ଆବଶ୍ୟକ"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN ସଂଯୋଗ '%s' ଆରମ୍ଭ ହେବାରେ ବିଫଳ।\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:703
-msgid "PUK code is needed for the mobile broadband device"
-msgstr "ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣ ପାଇଁ PUK ସଂକେତ ଆବଶ୍ୟକ"
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "ଉପକରଣ ପ୍ରସ୍ତୁତ ନାହିଁ (ଫର୍ମୱେର ଅନୁପସ୍ଥିତ)"
 
-#: ../src/applet-device-gsm.c:836
-msgid "Wrong PIN code; please contact your provider."
-msgstr "ଭୁଲ PIN ସଂକେତ; ଦୟାକରି ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ।"
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "ଉପକରଣ ପ୍ରସ୍ତୁତ ନାହିଁ"
 
-#: ../src/applet-device-gsm.c:859
-msgid "Wrong PUK code; please contact your provider."
-msgstr "ଭୁଲ PUK ସଂକେତ; ଦୟାକରି ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ।"
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
 
-#. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:886
-msgid "Sending unlock code..."
-msgstr "ଅନଲକ ସଂକେତ ପଠାଉଅଛି..."
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
 
-#: ../src/applet-device-gsm.c:946
-msgid "SIM PIN unlock required"
-msgstr "SIM PIN ଅନଲକ ଆବଶ୍ୟକ"
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "ଉପକରଣ ପରିଚାଳିତ ନୁହଁ"
 
-#: ../src/applet-device-gsm.c:947
-msgid "SIM PIN Unlock Required"
-msgstr "SIM PIN ଅନଲକ ଆବଶ୍ୟକ"
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "କୌଣସି ନେଟୱର୍କ ଉପକରଣ ଉପଲବ୍ଧ ନାହିଁ"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:949
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣ '%s' ବ୍ୟବହାର ହେବା ପୂର୍ବରୁ ଗୋଟିଏ SIM PIN ସଂକେତ "
-"ଆବଶ୍ୟକ କରିଥାଏ।"
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "VPN ସଂଯୋଗଗୁଡ଼ିକ (_V)"
 
-#: ../src/applet-device-gsm.c:950
-msgctxt "PIN code entry label"
-msgid "PIN code:"
-msgstr "PIN ସଂକେତ:"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "VPN ବିନ୍ୟାସ କରନ୍ତୁ (_C)..."
 
-#: ../src/applet-device-gsm.c:953
-msgctxt "Show/obscure PIN checkbox label"
-msgid "Show PIN code"
-msgstr "PIN ସଂକେତ ଦର୍ଶାନ୍ତୁ"
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "VPN ର ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ (_D)"
 
-#: ../src/applet-device-gsm.c:956
-msgid "SIM PUK unlock required"
-msgstr "SIM PUK ଅନଲକ ଆବଶ୍ୟକ"
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "ନେଟୱର୍କ ପରିଚାଳକ ଚାଲୁନାହିଁ..."
 
-#: ../src/applet-device-gsm.c:957
-msgid "SIM PUK Unlock Required"
-msgstr "SIM PUK ଅନଲକ ଆବଶ୍ୟକ"
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "ନେଟୱର୍କିଙ୍ଗ ନିଷ୍କ୍ରିୟ ହୋଇଛି"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:959
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣ '%s' ବ୍ୟବହାର ହେବା ପୂର୍ବରୁ ଗୋଟିଏ SIM PUK ସଂକେତ "
-"ଆବଶ୍ୟକ କରିଥାଏ।"
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "ନେଟୱର୍କିଙ୍ଗ ସକ୍ରିୟ କରନ୍ତୁ (_N)"
 
-#: ../src/applet-device-gsm.c:960
-msgctxt "PUK code entry label"
-msgid "PUK code:"
-msgstr "PUK ସଂକେତ:"
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "ବେତାର ସଂଯୋଗକୁ ସକ୍ରିୟ କରନ୍ତୁ (_W)"
 
-#: ../src/applet-device-gsm.c:962
-msgctxt "New PIN entry label"
-msgid "New PIN code:"
-msgstr "ନୂତନ PIN ସଂକେତ:"
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡକୁ ସକ୍ରିୟ କରନ୍ତୁ (_M)"
 
-#: ../src/applet-device-gsm.c:963
-msgctxt "New PIN verification entry label"
-msgid "Re-enter new PIN code:"
-msgstr "ନୂତନ PIN ସଂକେତକୁ ପୁଣିଥରେ ଭରଣ କରନ୍ତୁ:"
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ (_o)"
 
-#: ../src/applet-device-gsm.c:967
-msgctxt "Show/obscure PIN/PUK checkbox label"
-msgid "Show PIN/PUK codes"
-msgstr "PIN/PUK ସଂକେତଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ"
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "ସଂଯୋଗ ସୂଚନା (_I)"
 
-#: ../src/applet-device-infiniband.c:41
-msgid "Auto InfiniBand"
-msgstr "ସ୍ୱୟଂଚାଳିତ ଇନଫିବ୍ୟାଣ୍ଡ"
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "ସଂଯୋଗଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ..."
 
-#: ../src/applet-device-infiniband.c:96
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "ଇନଫିବ୍ୟାଣ୍ଡ ନେଟୱର୍କଗୁଡ଼ିକ (%s)"
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "ବିବରଣୀ (_A)"
 
-#: ../src/applet-device-infiniband.c:98
+#: ../src/applet.c:2179
 #, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ନେଟୱର୍କ (%s)"
-
-#: ../src/applet-device-infiniband.c:101
-msgid "InfiniBand Networks"
-msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ନେଟୱର୍କଗୁଡ଼ିକ"
-
-#: ../src/applet-device-infiniband.c:103
-msgid "InfiniBand Network"
-msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ନେଟୱର୍କ"
+msgid "You are now connected to '%s'."
+msgstr "ଆପଣ ବର୍ତ୍ତମାନ '%s' ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-infiniband.c:123 ../src/applet-device-vlan.c:180
-#: ../src/applet-device-wired.c:127 ../src/applet.c:1358
-msgid "disconnected"
-msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "ଅସଂଯୋଜିତ"
 
-#: ../src/applet-device-infiniband.c:147
-msgid "You are now connected to the InfiniBand network."
-msgstr "ଆପଣ ବର୍ତ୍ତମାନ ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ।"
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ବିଛିନ୍ନ ହୋଇଛି।"
 
-#: ../src/applet-device-infiniband.c:171
+#: ../src/applet.c:2474
 #, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି..."
+msgid "Preparing network connection '%s'..."
+msgstr "ନେଟୱର୍କ ସଂଯୋଗ '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି..."
 
-#: ../src/applet-device-infiniband.c:174
+#: ../src/applet.c:2477
 #, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସଂରଚନା କରୁଅଛି '%s'..."
+msgid "User authentication required for network connection '%s'..."
+msgstr "ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
 
-#: ../src/applet-device-infiniband.c:177
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+msgid "Requesting a network address for '%s'..."
+msgstr "'%s' ପାଇଁ ନେଟୱର୍କ ଠିକଣା ଅନୁରୋଧ କରୁଅଛି..."
 
-#: ../src/applet-device-infiniband.c:184
+#: ../src/applet.c:2483
 #, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
+msgid "Network connection '%s' active"
+msgstr "ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
 
-#: ../src/applet-device-vlan.c:203
-msgid "You are now connected to the VLAN."
-msgstr "ଆପଣ ବର୍ତ୍ତମାନ VLAN ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "VPN ସଂଯୋଗ ଆରମ୍ଭ କରୁଅଛି '%s'..."
 
-#: ../src/applet-device-vlan.c:227
+#: ../src/applet.c:2560
 #, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "VLAN ସଂଯୋଗ ଆରମ୍ଭ କରୁଅଛି '%s'..."
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
 
-#: ../src/applet-device-vlan.c:230
+#: ../src/applet.c:2563
 #, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "VLAN ସଂଯୋଗ ଆରମ୍ଭ କରୁଅଛି '%s'..."
+msgid "Requesting a VPN address for '%s'..."
+msgstr "'%s' ପାଇଁ VPN ଠିକଣା ଅନୁରୋଧ କରୁଅଛି..."
 
-#: ../src/applet-device-vlan.c:233
+#: ../src/applet.c:2566
 #, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "VLAN ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+msgid "VPN connection '%s' active"
+msgstr "VPN ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
 
-#: ../src/applet-device-wifi.c:88
-msgid "_Connect to Hidden Wireless Network..."
-msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ହୁଅନ୍ତୁ (_C)..."
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "କୌଣସି ନେଟୱର୍କ ସଂଯୋଗ ନାହିଁ"
 
-#: ../src/applet-device-wifi.c:121
-msgid "Create _New Ad-Hoc Wireless Network..."
-msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ ସୃଷ୍ଟି କରନ୍ତୁ (_N)..."
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "ନେଟୱର୍କ ପରିଚାଳକ ଆପଲେଟ"
 
-#: ../src/applet-device-wifi.c:718
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "ବେତାର ନେଟୱର୍କଗୁଡ଼ିକ (%s)"
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr "ଭୁଲ PUK ସଂକେତ; ଦୟାକରି ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ।"
 
-#: ../src/applet-device-wifi.c:720
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "ବେତାର ନେଟୱର୍କ (%s)"
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "ଭୁଲ PIN ସଂକେତ; ଦୟାକରି ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ।"
 
-#: ../src/applet-device-wifi.c:722
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "ବେତାର ନେଟୱର୍କ"
-msgstr[1] "ବେତାର ନେଟୱର୍କଗୁଡ଼ିକ"
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr "ଅନଲକ ସଂକେତ ପଠାଉଅଛି..."
 
-#: ../src/applet-device-wifi.c:748
-msgid "wireless is disabled"
-msgstr "ବେତାର ସଂଯୋଗକୁ ନିଷ୍କ୍ରିୟ କରାଯାଇଛି"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ (%s)"
 
-#: ../src/applet-device-wifi.c:809
-msgid "More networks"
-msgstr "ଅଧିକ ନେଟୱର୍କଗୁଡ଼ିକ"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ"
 
-#: ../src/applet-device-wifi.c:1012
-msgid "Wireless Networks Available"
-msgstr "ବେତାର ନେଟୱର୍କ ଉପଲବ୍ଧ ଅଛି"
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "ଉପଲବ୍ଧ"
 
-#: ../src/applet-device-wifi.c:1013
-msgid "Click on this icon to connect to a wireless network"
-msgstr ""
-"ଗୋଟିଏ ବେତାର ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ସ୍ଥାପନ କରିବା ପାଇଁ ଏହି ଚିତ୍ରସଂକେତ ଉପରେ କ୍ଲିକ "
-"କରନ୍ତୁ"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "ନୂତନ ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ"
 
-#: ../src/applet-device-wifi.c:1016 ../src/applet.c:723
-msgid "Don't show this message again"
-msgstr "ଏହି ସନ୍ଦେଶକୁ ପୁଣିଥରେ ଦର୍ଶାନ୍ତୁ ନାହିଁ"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "ସଂଯୋଗ ସ୍ଥାପନ ହୋଇସାରିଛି"
 
-#: ../src/applet-device-wifi.c:1229
-#, c-format
-msgid "You are now connected to the Wi-Fi network '%s'."
-msgstr "ଆପଣ ବର୍ତ୍ତମାନ ୱାଇଫାଇ ନେଟୱର୍କ '%s' ସହିତ ସଂଯୁକ୍ତ।"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "ଆପମ ବର୍ତ୍ତମାନ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
 
-#: ../src/applet-device-wifi.c:1230 ../src/applet-device-wifi.c:1260
-msgid "(none)"
-msgstr "(କିଛି ନାହିଁ)"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ନେଟୱର୍କ ପ୍ରବେଶ ସଂକେତ"
 
-#: ../src/applet-device-wifi.c:1270
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ପ୍ରସ୍ତୁତ କରୁଅଛି..."
+#: ../src/applet-device-broadband.c:957
+#, fuzzy
+msgid "You are now registered on the home network."
+msgstr "ଆପଣ ବର୍ତ୍ତମାନ ବନ୍ଧନ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ।"
 
-#: ../src/applet-device-wifi.c:1273
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' କୁ ବିନ୍ୟାସ କରୁଅଛି..."
+#: ../src/applet-device-broadband.c:963
+#, fuzzy
+msgid "You are now registered on a roaming network."
+msgstr "ଆପଣ ବର୍ତ୍ତମାନ ବ୍ରିଜ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ।"
 
-#: ../src/applet-device-wifi.c:1276
+#: ../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
 #, c-format
-msgid "User authentication required for wireless network '%s'..."
-msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପ୍ରସ୍ତୁତ କରୁଅଛି '%s'..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "'%s' ପାଇଁ ଗୋଟିଏ ବେତାର ନେଟୱର୍କ ଠିକଣା ପାଇବା ପାଇଁ ଅନୁରୋଧ କରୁଅଛି..."
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସଂରଚନା କରୁଅଛି '%s'..."
 
-#: ../src/applet-device-wifi.c:1299
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
-msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି: %s (%d%%)"
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ '%s'..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
+msgid "Mobile broadband connection '%s' active"
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
 
-#: ../src/applet-device-wired.c:45
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "ସ୍ୱୟଂଚାଳିତ ଇଥରନେଟ"
 
-#: ../src/applet-device-wired.c:100
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କଗୁଡ଼ିକ (%s)"
 
-#: ../src/applet-device-wired.c:102
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ (%s)"
 
-#: ../src/applet-device-wired.c:105
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କଗୁଡ଼ିକ"
 
-#: ../src/applet-device-wired.c:107
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ"
 
-#: ../src/applet-device-wired.c:151
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "ଆପଣ ବର୍ତ୍ତମାନ ତାରଯୁକ୍ତ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ।"
 
-#: ../src/applet-device-wired.c:175
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ପ୍ରସ୍ତୁତ କରୁଅଛି..."
 
-#: ../src/applet-device-wired.c:178
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' କୁ ବିନ୍ୟାସ କରୁଅଛି..."
 
-#: ../src/applet-device-wired.c:181
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
 
-#: ../src/applet-device-wired.c:184
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' ପାଇଁ ଗୋଟିଏ ତାରଯୁକ୍ତ ନେଟୱର୍କ ଠିକଣା ପାଇବା ପାଇଁ ଅନୁରୋଧ କରୁଅଛି..."
 
-#: ../src/applet-device-wired.c:188
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
 
-#: ../src/applet-device-wired.c:439
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL ବୈଧିକରଣ"
 
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ହୁଅନ୍ତୁ (_C)..."
+
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
+msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ ସୃଷ୍ଟି କରନ୍ତୁ (_N)..."
+
+#: ../src/applet-device-wifi.c:431
+msgid "(none)"
+msgstr "(କିଛି ନାହିଁ)"
+
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କଗୁଡ଼ିକ (%s)"
+
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ (%s)"
+
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "ତାରଯୁକ୍ତ ନେଟୱର୍କ"
+msgstr[1] "ତାରଯୁକ୍ତ ନେଟୱର୍କ"
+
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "ବେତାର ସଂଯୋଗକୁ ନିଷ୍କ୍ରିୟ କରାଯାଇଛି"
+
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:996
+msgid "More networks"
+msgstr "ଅଧିକ ନେଟୱର୍କଗୁଡ଼ିକ"
+
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
+msgstr "ବେତାର ନେଟୱର୍କ ଉପଲବ୍ଧ ଅଛି"
+
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr "ଗୋଟିଏ ବେତାର ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ସ୍ଥାପନ କରିବା ପାଇଁ ଏହି ଚିତ୍ରସଂକେତ ଉପରେ କ୍ଲିକ କରନ୍ତୁ"
+
+#: ../src/applet-device-wifi.c:1364
+#, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "ଆପଣ ବର୍ତ୍ତମାନ ୱାଇଫାଇ ନେଟୱର୍କ '%s' ସହିତ ସଂଯୁକ୍ତ।"
+
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "ନେଟୱର୍କ ସଂଯୋଗ '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି..."
+
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' କୁ ବିନ୍ୟାସ କରୁଅଛି..."
+
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "'%s' ପାଇଁ ନେଟୱର୍କ ଠିକଣା ଅନୁରୋଧ କରୁଅଛି..."
+
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି: %s (%d%%)"
+
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "ତାରଯୁକ୍ତ ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
+
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
+
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "ନୂତନ ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
+
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "ସଂଯୋଗ ସୂଚନା ଦର୍ଶାଇବାରେ ତ୍ରୁଟି:"
 
-#: ../src/applet-dialogs.c:110
-#: ../src/connection-editor/page-wireless-security.c:287
-#: ../src/wireless-dialog.c:957
-#: ../src/wireless-security/wireless-security.c:418
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:112
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "ଗତିଜ WEP"
 
-#: ../src/applet-dialogs.c:114 ../src/applet-dialogs.c:229
-#: ../src/applet-dialogs.c:231
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:227
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+msgid "More addresses"
+msgstr ""
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:235
-#: ../src/connection-editor/page-wireless-security.c:241
-#: ../src/wireless-dialog.c:914
-msgctxt "No wifi security used"
-msgid "None"
-msgstr "କିଛି ନୁହେଁ"
-
-#: ../src/applet-dialogs.c:244
-msgctxt "No wired security used"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "କିଛି ନୁହେଁ"
 
-#: ../src/applet-dialogs.c:247
-msgctxt "Unknown/unrecognized wired or wifi security"
-msgid "Unknown"
-msgstr "ଅଜଣା"
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ"
 
-#: ../src/applet-dialogs.c:317 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:319 ../src/applet-dialogs.c:425
-#: ../src/applet-dialogs.c:459 ../src/applet-dialogs.c:475
-#: ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#, fuzzy
+msgctxt "Speed"
+msgid "Unknown"
+msgstr "ଅଜଣା"
+
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#, fuzzy
+msgctxt "Address"
+msgid "Unknown"
+msgstr "ଅଜଣା"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP ଠିକଣା:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "ବ୍ରୋଡକାଷ୍ଟ ଠିକଣା:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+#, fuzzy
+msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "ଅଜଣା"
 
-#: ../src/applet-dialogs.c:354
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "ସବନେଟ ମାସ୍କ:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ଇଥରନେଟ (%s)"
 
-#: ../src/applet-dialogs.c:356
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:358
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:360
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:366
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "ସାଧାରଣ"
 
-#: ../src/applet-dialogs.c:370
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "ଅନ୍ତରାପୃଷ୍ଠ:"
 
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "ହାର୍ଡୱେର ଠିକଣା:"
 
 #. Driver
-#: ../src/applet-dialogs.c:392
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ଚାଳକ:"
 
-#: ../src/applet-dialogs.c:428
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "ବେଗ:"
 
-#. Security
-#: ../src/applet-dialogs.c:435
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "ସୁରକ୍ଷା:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:446
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:457 ../src/applet-dialogs.c:562
-msgid "IP Address:"
-msgstr "IP ଠିକଣା:"
-
-#: ../src/applet-dialogs.c:473
-msgid "Broadcast Address:"
-msgstr "ବ୍ରୋଡକାଷ୍ଟ ଠିକଣା:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:482
-msgid "Subnet Mask:"
-msgstr "ସବନେଟ ମାସ୍କ:"
-
-#: ../src/applet-dialogs.c:492 ../src/applet-dialogs.c:577
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ପଥ:"
 
-#: ../src/applet-dialogs.c:504
-msgid "Primary DNS:"
-msgstr "ପ୍ରାଥମିକ DNS:"
-
-#: ../src/applet-dialogs.c:513
-msgid "Secondary DNS:"
-msgstr "ଦ୍ବିତୀୟକ DNS:"
-
-#: ../src/applet-dialogs.c:523
-msgid "Ternary DNS:"
-msgstr "ତୃତୀୟ DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:538
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:547
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "ଆଗ୍ରହ୍ଯ କରିଦିଅନ୍ତୁ"
 
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "ପ୍ରକାର (_T):"
+
+#: ../src/applet-dialogs.c:822
+#, fuzzy
+msgid "VPN Gateway:"
+msgstr "ପ୍ରବେଶ ଦ୍ୱାର"
+
+#: ../src/applet-dialogs.c:828
+#, fuzzy
+msgid "VPN Username:"
+msgstr "ଚାଳକ ନାମ (_U):"
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "ସଂଯୋଗ (_n):"
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr "ଅଜଣା"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:653
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "କୌଣସି ବୈଧ ସକ୍ରିୟ ସଂଯୋଗ ମିଳିଲା ନାହିଁ!"
 
-#: ../src/applet-dialogs.c:765
-msgid "Copyright © 2004-2012 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc."
+#: ../src/applet-dialogs.c:985
+#, fuzzy
+msgid ""
+"Copyright © 2004-2014 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:767
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr ""
-"ଆପଣଙ୍କର ନେଟୱର୍କ ଉପକରଣ ଏବଂ ସଂଯୋଗଗୁଡ଼ିକୁ ପରିଚାଳନା କରିବା ପାଇଁ ବିଜ୍ଞପ୍ତି କ୍ଷେତ୍ର "
-"ଆପଲେଟ।"
+msgstr "ଆପଣଙ୍କର ନେଟୱର୍କ ଉପକରଣ ଏବଂ ସଂଯୋଗଗୁଡ଼ିକୁ ପରିଚାଳନା କରିବା ପାଇଁ ବିଜ୍ଞପ୍ତି କ୍ଷେତ୍ର ଆପଲେଟ।"
 
-#: ../src/applet-dialogs.c:769
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "ନେଟୱର୍କ ପରିଚାଳକ ୱେବସାଇଟ"
 
-#: ../src/applet-dialogs.c:772
-msgid "translator-credits"
-msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
-
-#: ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "ଅନୁପସ୍ଥିତ ଉତ୍ସଗୁଡ଼ିକ"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ନେଟୱର୍କ ପ୍ରବେଶ ସଂକେତ"
 
-#: ../src/applet-dialogs.c:824
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' ସହିତ ସଂଯୁକ୍ତ ହେବା ପାଇଁ ଗୋଟିଏ ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ।"
 
-#: ../src/applet-dialogs.c:845
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "ପ୍ରବେଶ ସଙ୍କେତ:"
 
-#: ../src/applet.c:836
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
-msgstr "\n"
-"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ ନେଟୱର୍କ ସଂଯୋଗ ବାଧାପ୍ରାପ୍ତ ହୋଇଛି।"
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "SIM PIN ଅନଲକ ଆବଶ୍ୟକ"
 
-#: ../src/applet.c:839
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "SIM PIN ଅନଲକ ଆବଶ୍ୟକ"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଅପ୍ରତ୍ୟାଶିତ ଭାବରେ ବନ୍ଦ ହୋଇଯାଇଛି।"
+"ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣ '%s' ବ୍ୟବହାର ହେବା ପୂର୍ବରୁ ଗୋଟିଏ SIM PIN ସଂକେତ ଆବଶ୍ୟକ କରିଥାଏ।"
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+#, fuzzy
+msgid "PIN code:"
+msgstr "PIN ସଂକେତ:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+#, fuzzy
+msgid "Show PIN code"
+msgstr "PIN ସଂକେତ ଦର୍ଶାନ୍ତୁ"
 
-#: ../src/applet.c:842
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "SIM PUK ଅନଲକ ଆବଶ୍ୟକ"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "SIM PUK ଅନଲକ ଆବଶ୍ୟକ"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଅବୈଧ ସଂରଚନାରେ ପରିବର୍ତ୍ତିତ ହୋଇଛି।"
+"ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣ '%s' ବ୍ୟବହାର ହେବା ପୂର୍ବରୁ ଗୋଟିଏ SIM PUK ସଂକେତ ଆବଶ୍ୟକ କରିଥାଏ।"
 
-#: ../src/applet.c:845
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
-msgstr "\n"
-"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ ସଂଯୋଗର ସମୟ ସମାପ୍ତ ପାଇଁ ପ୍ରୟାସ କରୁଅଛି।"
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+#, fuzzy
+msgid "PUK code:"
+msgstr "PUK ସଂକେତ:"
 
-#: ../src/applet.c:848
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
-""
-msgstr "\n"
-"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଉଚିତ ସମୟରେ ଆରମ୍ଭ ହୋଇନଥିଲା।"
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+#, fuzzy
+msgid "New PIN code:"
+msgstr "ନୂତନ PIN ସଂକେତ:"
 
-#: ../src/applet.c:851
-#, c-format
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+#, fuzzy
+msgid "Re-enter new PIN code:"
+msgstr "ନୂତନ PIN ସଂକେତକୁ ପୁଣିଥରେ ଭରଣ କରନ୍ତୁ:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+#, 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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
+
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
-msgstr "\n"
-"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଆରମ୍ଭ ହେବାରେ ବିଫଳ ହୋଇଛି।"
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
+msgstr ""
+"IP ଠିକଣା ଆପଣ କମ୍ପୁଟରକୁ ନେଟୱର୍କରେ ଚିହ୍ନିପାରିଛି।  ଗୋଟିଏ IP ଠିକଣା ଯୋଗ କରିବା ପାଇଁ \"Add\" ବଟନକୁ "
+"କ୍ଲିକ କରନ୍ତୁ।"
 
-#: ../src/applet.c:854
-#, c-format
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "ଅପସାରଣ କରନ୍ତୁ (_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+#, 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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ ସେଠାରେ କୌଣସି ବୈଧ VPN ଗୁପ୍ତ ତଥ୍ୟ ନଥିଲା।"
+"ଯଦି ସକ୍ରିୟ ଅଛି, ତେବେ ଏହି ସଂଯୋଗକୁ କଦାପି ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନେଟୱର୍କ ସଂଯୋଗ ଭାବରେ ବ୍ୟବହାର କରାଯିବ "
+"ନାହିଁ।"
+
+#: ../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/applet.c:857
-#, c-format
-msgid "\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
-msgstr "\n"
-"ଅବୈଧ VPN ଗୁପ୍ତ ତଥ୍ୟଗୁଡ଼ିକ ହେତୁ VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି।"
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+#, fuzzy
+msgid "Create…"
+msgstr "ସୃଷ୍ଟି କରନ୍ତୁ (_r)"
 
-#: ../src/applet.c:864
-#, c-format
-msgid "\n"
-"The VPN connection '%s' failed."
-msgstr "\n"
-"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି।"
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "ନୂତନ ସଂଯୋଗକୁ ନିର୍ମାଣ କରନ୍ତୁ"
 
-#: ../src/applet.c:882
-#, c-format
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+"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."
 msgstr ""
-"\n"
-"VPN ସଂଯୋଗ '%s' ସଂଯୋଗ ବିଛିନ୍ନ ହୋଇଛି କାରଣ ନେଟୱର୍କ ସଂଯୋଗ ବାଧାପ୍ରାପ୍ତ ହୋଇଛି।"
 
-#: ../src/applet.c:885
-#, c-format
-msgid "\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
-msgstr "\n"
-"VPN ସଂଯୋଗ '%s' ସଂଯୋଗ ବିଛିନ୍ନ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ବନ୍ଦ ହୋଇଯାଇଛି।"
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr "ରାଉଣ୍ଡ-ରବିନ"
 
-#: ../src/applet.c:891
-#, c-format
-msgid "\n"
-"The VPN connection '%s' disconnected."
-msgstr "\n"
-"VPN ସଂଯୋଗ '%s' ବିଚ୍ଛିନ୍ନ ହୋଇଛି।"
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr "ସକ୍ରିୟ ନକଲ ସଂରକ୍ଷଣ"
 
-#: ../src/applet.c:922
-msgid "VPN Login Message"
-msgstr "VPN ଲଗଇନ ସନ୍ଦେଶ"
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr "XOR"
 
-#: ../src/applet.c:934 ../src/applet.c:942 ../src/applet.c:989
-msgid "VPN Connection Failed"
-msgstr "VPN ସଂଯୋଗ ବିଫଳ ହୋଇଛି"
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr "ବ୍ରୋଡକାଷ୍ଟ"
 
-#: ../src/applet.c:996
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr "802.3ad"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr "ଅନୁକୂଳ ପରିବହନ ଭାର ସନ୍ତୁଳନ"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr "ଅନୁକୂଳ ଭାର ସନ୍ତୁଳନ"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr "MII (ପରାମର୍ଶିତ)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr "ARP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+msgid "Bonded _connections:"
+msgstr "ବନ୍ଧିତ ସଂଯୋଗଗୁଡ଼ିକ (_c):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "ସମ୍ପାଦନ କରନ୍ତୁ (_E)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr "ପୁନରାବୃତ୍ତି ନିରୀକ୍ଷଣ କରୁଅଛି (_f):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:"
+msgstr "ଅନ୍ତରାପୃଷ୍ଠ ନାମ (_I):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr "ଲିଙ୍କ ନିରୀକ୍ଷଣ (_L):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr "ARP ଲକ୍ଷ୍ଯସ୍ଥଳ (_t):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"VPN ସଂଯୋଗ '%s' ବିଫଳ ହୋଇଛି କାରଣ VPN ସର୍ଭିସ ଆରମ୍ଭ ହେବାରେ ବିଫଳ ହୋଇଛି।\n"
-"\n"
-"%s"
+"IP ଠିକଣା, ଅଥବା IP ଠିକଣାଗୁଡ଼ିକର କୋମା ଦ୍ୱାରା ପୃଥକ ତାଲିକା, ଲିଙ୍କସ୍ଥିତି ଯାଞ୍ଚ କରିବା ସମୟରେ "
+"ଦେଖିଥାଏ।"
 
-#: ../src/applet.c:999
-#, c-format
-msgid "\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
-msgstr "\n"
-"VPN ସଂଯୋଗ '%s' ଆରମ୍ଭ ହେବାରେ ବିଫଳ।\n"
-"\n"
-"%s"
-
-#: ../src/applet.c:1346
-msgid "device not ready (firmware missing)"
-msgstr "ଉପକରଣ ପ୍ରସ୍ତୁତ ନାହିଁ (ଫର୍ମୱେର ଅନୁପସ୍ଥିତ)"
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr "ଲିଙ୍କ ଅପ୍‌ ବିଳମ୍ବ (_u):"
 
-#: ../src/applet.c:1348
-msgid "device not ready"
-msgstr "ଉପକରଣ ପ୍ରସ୍ତୁତ ନାହିଁ"
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr "ଲିଙ୍କ ଡାଉନ୍‌ ବିଳମ୍ବ (_d):"
 
-#: ../src/applet.c:1374
-msgid "Disconnect"
-msgstr "ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି"
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "ପ୍ରାଥମିକ DNS:"
 
-#: ../src/applet.c:1388
-msgid "device not managed"
-msgstr "ଉପକରଣ ପରିଚାଳିତ ନୁହଁ"
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr ""
 
-#: ../src/applet.c:1546
-msgid "No network devices 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+msgid "_MTU:"
+msgstr "MTU (_M):"
 
-#: ../src/applet.c:1599
-msgid "_VPN Connections"
-msgstr "VPN ସଂଯୋଗଗୁଡ଼ିକ (_V)"
+#: ../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
+msgid "bytes"
+msgstr "ବାଇଟଗୁଡିକ"
 
-#: ../src/applet.c:1652
-msgid "_Configure VPN..."
-msgstr "VPN ବିନ୍ୟାସ କରନ୍ତୁ (_C)..."
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
 
-#: ../src/applet.c:1656
-msgid "_Disconnect VPN"
-msgstr "VPN ର ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ (_D)"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "ସୁରକ୍ଷା (_S):"
 
-#: ../src/applet.c:1765
-msgid "NetworkManager is not running..."
-msgstr "ନେଟୱର୍କ ପରିଚାଳକ ଚାଲୁନାହିଁ..."
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+#, fuzzy
+msgid "_Hairpin mode:"
+msgstr "ପରିବହନ ଧାରା (_T):"
 
-#: ../src/applet.c:1770 ../src/applet.c:2696
-msgid "Networking disabled"
-msgstr "ନେଟୱର୍କିଙ୍ଗ ନିଷ୍କ୍ରିୟ ହୋଇଛି"
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "ବନ୍ଧିତ ସଂଯୋଗଗୁଡ଼ିକ (_c):"
 
-#. 'Enable Networking' item
-#: ../src/applet.c:1998
-msgid "Enable _Networking"
-msgstr "ନେଟୱର୍କିଙ୍ଗ ସକ୍ରିୟ କରନ୍ତୁ (_N)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#, fuzzy
+msgid "_Forward delay:"
+msgstr "ଲିଙ୍କ ଡାଉନ୍‌ ବିଳମ୍ବ (_d):"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2007
-msgid "Enable _Wireless"
-msgstr "ବେତାର ସଂଯୋଗକୁ ସକ୍ରିୟ କରନ୍ତୁ (_W)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2016
-msgid "Enable _Mobile Broadband"
-msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡକୁ ସକ୍ରିୟ କରନ୍ତୁ (_M)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#, fuzzy
+msgid "s"
+msgstr "ms"
 
-#. Toggle notifications item
-#: ../src/applet.c:2027
-msgid "Enable N_otifications"
-msgstr "ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ (_o)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "ନେଟୱର୍କିଙ୍ଗ ସକ୍ରିୟ କରନ୍ତୁ (_N)"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2038
-msgid "Connection _Information"
-msgstr "ସଂଯୋଗ ସୂଚନା (_I)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2048
-msgid "Edit Connections..."
-msgstr "ସଂଯୋଗଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ..."
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2062
-msgid "_Help"
-msgstr "ସହାୟତା (_H)"
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2071
-msgid "_About"
-msgstr "ବିବରଣୀ (_A)"
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "ସ୍ବୟଂଚାଳିତ"
 
-#: ../src/applet.c:2340
+#: ../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
-msgid "You are now connected to '%s'."
-msgstr "ଆପଣ ବର୍ତ୍ତମାନ '%s' ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
+msgid "default"
+msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ"
 
-#: ../src/applet.c:2380
-msgid "Disconnected"
-msgstr "ଅସଂଯୋଜିତ"
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
 
-#: ../src/applet.c:2381
-msgid "The network connection has been disconnected."
-msgstr "ନେଟୱର୍କ ସହିତ ସଂଯୋଗ ବିଛିନ୍ନ ହୋଇଛି।"
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "ଠିକଣା"
 
-#: ../src/applet.c:2562
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "ନେଟୱର୍କ ସଂଯୋଗ '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି..."
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "ଠିକଣା"
 
-#: ../src/applet.c:2565
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+msgid "invalid %s for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2571
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid "Network connection '%s' active"
-msgstr "ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
+msgid "invalid %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2652
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "VPN ସଂଯୋଗ ଆରମ୍ଭ କରୁଅଛି '%s'..."
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2655
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+msgid "invalid interface-name (%s)"
+msgstr ""
 
-#: ../src/applet.c:2658
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "'%s' ପାଇଁ VPN ଠିକଣା ଅନୁରୋଧ କରୁଅଛି..."
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "କୌଣସି ଉପଦେଶ ଅଛି କି"
 
-#: ../src/applet.c:2661
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "ଗୋଟିଏ ଅଜଣା ତ୍ରୁଟି ହେତୁ ସଂଯୋଗ ଗୁପ୍ତ ତଥ୍ୟଗୁଡ଼ିକୁ ଅଦ୍ୟତନ କରିବାରେ ବିଫଳ।"
 
-#: ../src/applet.c:2700
-msgid "No network connection"
-msgstr "କୌଣସି ନେଟୱର୍କ ସଂଯୋଗ ନାହିଁ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "ଏହି ସଂଯୋଗ ପାଇଁ 802.1X ସୁରକ୍ଷାକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
-#: ../src/applet.c:3255
-msgid "NetworkManager Applet"
-msgstr "ନେଟୱର୍କ ପରିଚାଳକ ଆପଲେଟ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
 
-#: ../src/applet.c:3261 ../src/wired-dialog.c:132
-msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
 msgstr ""
-"ନେଟୱର୍କ ପରିଚାଳକ ଆପଲେଟ କିଛି ଆବଶ୍ୟକୀୟ ଉତ୍ସ ପାଇଲା ନାହିଁ (ଗ୍ଲେଡ଼ ଫାଇଲ ମିଳିଲା "
-"ନାହିଁ)।"
 
-#: ../src/applet.glade.h:1
-msgid "Other Wireless Network..."
-msgstr "ଅନ୍ୟାନ୍ୟ ବେତାର ନେଟୱର୍କ..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.glade.h:2
-msgid "_Wireless security:"
-msgstr "ବେତାର ସୁରକ୍ଷା (_W):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.glade.h:3
-msgid " "
-msgstr " "
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.glade.h:4
-msgid "_Network name:"
-msgstr "ନେଟୱର୍କ ନାମ (_N):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.glade.h:5
-msgid "Co_nnection:"
-msgstr "ସଂଯୋଗ (_n):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.glade.h:6
-msgid "Wireless _adapter:"
-msgstr "ବେତାର ଏଡପ୍ଟର (_a):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.glade.h:7
-msgid "C_onnect"
-msgstr "ସଂଯୋଗ କରନ୍ତୁ (_o)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.glade.h:8
-msgid "Connection Information"
-msgstr "ସଂଯୋଗ ସୂଚନା"
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.glade.h:9
-msgid "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">ସକ୍ରିୟ ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ</span>"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#: ../src/applet.glade.h:10
-msgid "_Key:"
-msgstr "କି (_K):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#: ../src/applet.glade.h:11
-msgid "Sho_w key"
-msgstr "କି ଦର୍ଶାନ୍ତୁ (_w)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#: ../src/applet.glade.h:12
-msgid "_Authentication:"
-msgstr "ବୈଧିକରଣ (_A):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
 
-#: ../src/applet.glade.h:13
-msgid "Open System\n"
-"Shared Key"
-msgstr "ଖୋଲା ତନ୍ତ୍ର\n"
-"ସହଭାଗୀ କି"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
 
-#: ../src/applet.glade.h:15
-msgid "WEP inde_x:"
-msgstr "WEP ଅନୁକ୍ରମଣିକା (_x):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
 
-#: ../src/applet.glade.h:16
-msgid "1 (Default)\n"
-"2\n"
-"3\n"
-"4"
-msgstr "1 (ପୂର୍ବନିର୍ଦ୍ଧାରିତ)\n"
-"2\n"
-"3\n"
-"4"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#: ../src/applet.glade.h:20 ../src/connection-editor/ce-page-dsl.ui.h:1
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
-msgid "_Username:"
-msgstr "ଚାଳକ ନାମ (_U):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#: ../src/applet.glade.h:21 ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "_Password:"
-msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#: ../src/applet.glade.h:22 ../src/connection-editor/ce-page-dsl.ui.h:3
-msgid "Sho_w password"
-msgstr "ପ୍ରବେଶ ସଙ୍କେତ ଦର୍ଶାନ୍ତୁ (_w)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.glade.h:23
-msgid "WPA Protocol:"
-msgstr "WPA ପ୍ରୋଟୋକଲ:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.glade.h:24
-msgid "Anony_mous identity:"
-msgstr "ଅଜଣା ପରିଚୟ (_m):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.glade.h:25
-msgid "_PAC file:"
-msgstr "PAC ଫାଇଲ (_P):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.glade.h:26
-msgid "I_nner authentication:"
-msgstr "ଆଭ୍ୟନ୍ତରୀଣ ବୈଧିକରଣ (_n):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.glade.h:27
-msgid "_Allow automatic PAC provisioning"
-msgstr "ସ୍ୱୟଂଚାଳିତ PAC ସୁବିଧାକୁ ଅନୁମତି ଦିଅନ୍ତୁ (_A)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.glade.h:28
-msgid "Anonymous\n"
-"Authenticated\n"
-"Both"
-msgstr "ଅଜ୍ଞାତ\n"
-"ବୈଧିକୃତ\n"
-"ଉଭୟ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.glade.h:31
-msgid "I_dentity:"
-msgstr "ପରିଚୟ (_d):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
 
-#: ../src/applet.glade.h:32
-msgid "_User certificate:"
-msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
 
-#: ../src/applet.glade.h:33
-msgid "C_A certificate:"
-msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
 
-#: ../src/applet.glade.h:34
-msgid "No CA certificate is _required"
-msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.glade.h:35
-msgid "Private _key:"
-msgstr "ବ୍ୟକ୍ତିଗତ କି (_k):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/applet.glade.h:36
-msgid "_Private key password:"
-msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_P):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/applet.glade.h:37
-msgid "As_k for this password every time"
-msgstr "ପ୍ରତ୍ୟେକ ଥର ଏହି ପ୍ରବେଶ ସଂକେତକୁ ପଚାରନ୍ତୁ (_k)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/applet.glade.h:38
-msgid "_PEAP version:"
-msgstr "PEAP ସଂସ୍କରଣ (_P):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/applet.glade.h:39
-msgid "Automatic\n"
-"Version 0\n"
-"Version 1"
-msgstr "ସ୍ୱୟଂଚାଳିତ\n"
-"ସଂସ୍କରଣ 0\n"
-"ସଂସ୍କରଣ 1"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/applet.glade.h:42
-msgid "label"
-msgstr "ନାମପଟି"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/applet.glade.h:43
-msgid "Show it"
-msgstr "ଏହାକୁ ଦର୍ଶାନ୍ତୁ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/applet.glade.h:44
-msgid "_Unlock"
-msgstr "ଖୋଲନ୍ତୁ (_U)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "ସ୍ବୟଂଚାଳିତ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:236
-#: ../src/connection-editor/nm-connection-editor.c:822
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "ଗୋଟିଏ ଅଜଣା ତ୍ରୁଟି ହେତୁ ସଂଯୋଗ ଗୁପ୍ତ ତଥ୍ୟଗୁଡ଼ିକୁ ଅଦ୍ୟତନ କରିବାରେ ବିଫଳ।"
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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-bond.ui.h:1
-msgid "Round-robin"
-msgstr "ରାଉଣ୍ଡ-ରବିନ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:2
-msgid "Active backup"
-msgstr "ସକ୍ରିୟ ନକଲ ସଂରକ୍ଷଣ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:3
-msgid "XOR"
-msgstr "XOR"
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+msgid "Enter the traffic class for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:4
-msgid "Broadcast"
-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:"
+msgstr "ଚାଳକ ନାମ (_U):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:5
-msgid "802.3ad"
-msgstr "802.3ad"
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "_Service:"
+msgstr "ସର୍ଭିସ (_S):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:6
-msgid "Adaptive transmit load balancing"
-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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+msgid "Sho_w password"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତ ଦର୍ଶାନ୍ତୁ (_w)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:7
-msgid "Adaptive load balancing"
-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:"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:8
-msgid "MII (recommended)"
-msgstr "MII (ପରାମର୍ଶିତ)"
+#: ../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
+msgid "Automatic"
+msgstr "ସ୍ବୟଂଚାଳିତ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:9
-msgid "ARP"
-msgstr "ARP"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "ମୋଡିହୋଇଥିବା ଯୁଗଳ (TP)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:10
-msgid "Bonded _connections:"
-msgstr "ବନ୍ଧିତ ସଂଯୋଗଗୁଡ଼ିକ (_c):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "ସଂଲଗ୍ନକ ଏକକ ଅନ୍ତରାପୃଷ୍ଠ (AUI)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "ଧାରା (_M):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-msgid "_Edit"
-msgstr "ସମ୍ପାଦନ କରନ୍ତୁ (_E)"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "ମେଡିଆ ନିର୍ଭରଶୀଳ ହୋଇନଥିବା ଅନ୍ତରାପୃଷ୍ଠ (MII)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:13
-msgid "_Delete"
-msgstr "ଅପସାରଣ କରନ୍ତୁ (_D)"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
-msgid "Monitoring _frequency:"
-msgstr "ପୁନରାବୃତ୍ତି ନିରୀକ୍ଷଣ କରୁଅଛି (_f):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
-msgid "ms"
-msgstr "ms"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-msgid "_Interface name:"
-msgstr "ଅନ୍ତରାପୃଷ୍ଠ ନାମ (_I):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
-msgid "_Link Monitoring:"
-msgstr "ଲିଙ୍କ ନିରୀକ୍ଷଣ (_L):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "ସଂଯୋଗିକୀ (_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
-msgid "ARP _targets:"
-msgstr "ARP ଲକ୍ଷ୍ଯସ୍ଥଳ (_t):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "ଗତି (_S):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "ସମ୍ପୂର୍ଣ୍ଣ ଡୁପ୍ଲେକ୍ସ (_x)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "ସ୍ୱୟଂ ବ୍ୟବସ୍ଥା କରିବା (_o)"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "ସର୍ଭିସ (_S):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#, fuzzy
+msgid "C_loned MAC address:"
+msgstr "କ୍ଲୋନ କରାଯାଇଥିବା MAC ଠିକଣା (_C):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid ""
-"An IP address, or a comma-separated list of IP addresses, to look for when "
-"checking the link status."
+"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 ""
-"IP ଠିକଣା, ଅଥବା IP ଠିକଣାଗୁଡ଼ିକର କୋମା ଦ୍ୱାରା ପୃଥକ ତାଲିକା, ଲିଙ୍କସ୍ଥିତି ଯାଞ୍ଚ "
-"କରିବା ସମୟରେ ଦେଖିଥାଏ।"
+"ଏଠାରେ ଭରଣ କରାଯାଇଥିବା MAC ଠିକଣାକୁ  ହାର୍ଡୱେର ଠିକଣା ଭାବରେ ବ୍ୟବହାର କରାଯାଇଥାଏ 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-bond.ui.h:20
-msgid "Link _up delay:"
-msgstr "ଲିଙ୍କ ଅପ୍‌ ବିଳମ୍ବ (_u):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
-msgid "Link _down delay:"
-msgstr "ଲିଙ୍କ ଡାଉନ୍‌ ବିଳମ୍ବ (_d):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:2
-msgid "_Service:"
-msgstr "ସର୍ଭିସ (_S):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "ଆଗ୍ରହ୍ଯ କରିଦିଅନ୍ତୁ"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:1
-msgid "_Transport mode:"
-msgstr "ପରିବହନ ଧାରା (_T):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "_Device MAC address:"
-msgstr "ଉପକରଣ MAC ଠିକଣା (_D):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wired.ui.h:19
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "ବାଇଟଗୁଡିକ"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-msgid "_MTU:"
-msgstr "MTU (_M):"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "ବ୍ରୋଡକାଷ୍ଟ"
 
-#: ../src/connection-editor/ce-page-infiniband.ui.h:5
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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"
 msgstr ""
-"ଏହି ବିକଳ୍ପ ସଂଯୋଗକୁ ଏଠାରେ ଭରଣ କରାଯାଇଥିବା ସ୍ଥାୟୀ MAC ଠିକଣା ଦ୍ୱାରା ଉଲ୍ଲିଖିତ "
-"ନେଟୱର୍କ ଉପକରଣରେ ଅପରିବର୍ତ୍ତନୀୟ କରିଥାଏ।  ଉଦାହରଣ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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:7
+#: ../src/connection-editor/ce-page-infiniband.ui.h:6
 msgid "Datagram"
 msgstr "ଡେଟାଗ୍ରାମ"
 
 #. IP-over-InfiniBand "connected mode"
-#: ../src/connection-editor/ce-page-infiniband.ui.h:9
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 msgid "Connected"
 msgstr "ସଂଯୁକ୍ତ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:1
-#: ../src/connection-editor/ce-page-ip6.ui.h:1
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#: ../src/connection-editor/page-ip6.c:135
-msgid "Automatic"
-msgstr "ସ୍ବୟଂଚାଳିତ"
-
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1350,7 +1740,7 @@ msgstr "ହସ୍ତକୃତ DNS ସେଟିଙ୍ଗଗୁଡ଼ିକ ସହ
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:162
+#: ../src/connection-editor/page-ip4.c:166
 #: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "ହସପତ ପୁ୍ତିକା"
@@ -1362,197 +1752,181 @@ 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:180
+#: ../src/connection-editor/page-ip4.c:186
 #: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "ଅନ୍ୟ କମ୍ପୁଟର ସହିତ ସହଭାଗ କରାଯାଇଛି"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "ପଦ୍ଧତି (_M):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "<b>Addresses</b>"
-msgstr "<b>ଠିକଣାଗୁଡ଼ିକ</b>"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
-msgstr ""
-"IP ଠିକଣା ଆପଣ କମ୍ପୁଟରକୁ ନେଟୱର୍କରେ ଚିହ୍ନିପାରିଛି।  ଗୋଟିଏ IP ଠିକଣା ଯୋଗ କରିବା "
-"ପାଇଁ \"Add\" ବଟନକୁ କ୍ଲିକ କରନ୍ତୁ।"
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#, fuzzy
+msgid "Addresses"
+msgstr "ଠିକଣା"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 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 କ୍ଲାଏଣ୍ଟ ପରିଚାୟକ ଆପଣଙ୍କ କମ୍ପୁଟରର ସଂରଚନାକୁ ଇଚ୍ଛାରୂପଣ କରିବା ପାଇଁ ନେଟୱର୍କ ପ୍ରଶାସକଙ୍କୁ "
+"ଅନୁମତି ଦେଇଥାଏ।  ଯଦି ଆପଣ ଗୋଟିଏ DHCP କ୍ଲାଏଣ୍ଟ ପରିଚାୟକଙ୍କୁ ବ୍ୟବହାର କରିବା ପାଇଁ ଚାହାନ୍ତି, ତେବେ "
+"ଏହାକୁ ଏଠାରେ ଭରଣ କରନ୍ତୁ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 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.h:13
 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:10
-msgid "_Search domains:"
+#: ../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
+#, fuzzy
+msgid "S_earch domains:"
 msgstr "ପରିସରଗୁଡ଼ିକୁ ସନ୍ଧାନ କରନ୍ତୁ (_S):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "_DNS servers:"
+#: ../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:"
 msgstr "DNS ସର୍ଭରଗୁଡ଼ିକ (_D):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 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
-msgid "Require IPv4 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#, 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"IPv6-ସକ୍ଷମ ନେଟୱର୍କଗୁଡ଼ିକ ସହିତ ସଂଯୋଗ କରିବା ସମୟରେ, ସେହି ସଂଯୋଗକୁ ସମ୍ପୂର୍ଣ୍ଣ "
-"ହେବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ ଯଦି IPv4 ସଂରଚନା ବିଫଳ ହୋଇଥାଏ କିନ୍ତୁ IPv6 ସଂରଚନା ସଫଳ "
-"ହୋଇଥାଏ।"
+"IPv6-ସକ୍ଷମ ନେଟୱର୍କଗୁଡ଼ିକ ସହିତ ସଂଯୋଗ କରିବା ସମୟରେ, ସେହି ସଂଯୋଗକୁ ସମ୍ପୂର୍ଣ୍ଣ ହେବା ପାଇଁ ଅନୁମତି "
+"ଦିଅନ୍ତୁ ଯଦି IPv4 ସଂରଚନା ବିଫଳ ହୋଇଥାଏ କିନ୍ତୁ IPv6 ସଂରଚନା ସଫଳ ହୋଇଥାଏ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "_Routes&#x2026;"
-msgstr "_Routes&#x2026;"
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:18
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "Ig_nore automatically obtained routes"
-msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ମିଳିଥିବା ପଥକୁ ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ (_n)"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "ନିଷ୍କ୍ରିୟ ହୋଇଛି"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:19
 #: ../src/connection-editor/ce-page-ip6.ui.h:17
-msgid "Use this c_onnection only for resources on its network"
+#, fuzzy
+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 ""
-"ଏହି ସଂଯୋଗକୁ କେବଳ ଏହି ନେଟୱର୍କରେ ଥିବା ଉତ୍ସଗୁଡିକ ପାଇଁ ବ୍ୟବହାର କରନ୍ତୁ (_o)"
+"ହୋଷ୍ଟ ନାମଗୁଡ଼ିକୁ ସମାଧାନ କରିବା ପାଇଁ ବ୍ୟବହୃତ ଡମେନ ନାମ ସର୍ଭରଗୁଡ଼ିକର IP ଠିକଣା। ଏକାଧିକ ଡମେନ ନାମ "
+"ସର୍ଭର ଠିକଣାଗୁଡ଼ିକୁ ପୃଥକ କରିବା ପାଇଁ କୋମା ବ୍ୟବହାର କରନ୍ତୁ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:20
 #: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+msgid "IPv6 _privacy extensions:"
 msgstr ""
-"ଯଦି ସକ୍ରିୟ ଅଛି, ତେବେ ଏହି ସଂଯୋଗକୁ କଦାପି ପୂର୍ବନିର୍ଦ୍ଧାରିତ ନେଟୱର୍କ ସଂଯୋଗ ଭାବରେ "
-"ବ୍ୟବହାର କରାଯିବ ନାହିଁ।"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
-msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#, fuzzy
+msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "ଏହି ସଂଯୋଗକୁ ସମ୍ପୂର୍ଣ୍ଣ କରିବା ପାଇଁ IPv6 ଠିକଣା ଆବଶ୍ୟକ"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
 msgstr ""
-"IPv4-ସକ୍ଷମ ନେଟୱର୍କଗୁଡ଼ିକ ସହିତ ସଂଯୋଗ କରିବା ସମୟରେ, ସେହି ସଂଯୋଗକୁ ସମ୍ପୂର୍ଣ୍ଣ "
-"ହେବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ ଯଦି IPv6 ସଂରଚନା ବିଫଳ ହୋଇଥାଏ କିନ୍ତୁ IPv4 ସଂରଚନା ସଫଳ "
-"ହୋଇଥାଏ।"
+"IPv4-ସକ୍ଷମ ନେଟୱର୍କଗୁଡ଼ିକ ସହିତ ସଂଯୋଗ କରିବା ସମୟରେ, ସେହି ସଂଯୋଗକୁ ସମ୍ପୂର୍ଣ୍ଣ ହେବା ପାଇଁ ଅନୁମତି "
+"ଦିଅନ୍ତୁ ଯଦି IPv6 ସଂରଚନା ବିଫଳ ହୋଇଥାଏ କିନ୍ତୁ IPv4 ସଂରଚନା ସଫଳ ହୋଇଥାଏ।"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "ଯେକୌଣସି"
+msgid "Basic"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA) କୁ ପସନ୍ଦ କରିଥାଏ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE) କୁ ପସନ୍ଦ କରିଥାଏ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "<b>Basic</b>"
-msgstr "<b>ମୌଳିକ</b>"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "Nu_mber:"
 msgstr "ସଂଖ୍ୟା (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "<b>Advanced</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#, fuzzy
+msgid "Advanced"
 msgstr "<b>ଉନ୍ନତ</b>"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "APN (_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "ନେଟୱର୍କ ID (_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
-msgid "_Type:"
-msgstr "ପ୍ରକାର (_T):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "ପରିବର୍ତ୍ତନ କରନ୍ତୁ..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-msgid "PI_N:"
-msgstr "PIN (_N):"
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-msgid "Allow roaming if home network is not available"
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#, fuzzy
+msgid "Allow _roaming if home network is not available"
 msgstr "ସ୍ଥାନୀୟ ନେଟୱର୍କ ଉପଲବ୍ଧ ନହେଲେ ରୋମିଙ୍ଗକୁ ଅନୁମତି ଦିଅନ୍ତୁ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "<b>Authentication</b>"
-msgstr "<b>ବୈଧିକରଣ</b>"
+#, fuzzy
+msgid "Authentication"
+msgstr "ବୈଧିକରଣ (_A):"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
 msgid "Allowed methods:"
 msgstr "ଅନୁମତି ପ୍ରାପ୍ତ ପଦ୍ଧତିଗୁଡ଼ିକ:"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:3
-msgid "Configure _Methods&#x2026;"
+#, fuzzy
+msgid "Configure _Methods…"
 msgstr "Methods&#x2026; କୁ ବିନ୍ୟାସ କରନ୍ତୁ (_M)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "<b>Compression</b>"
+#, fuzzy
+msgid "Compression"
 msgstr "<b>ସଙ୍କୁଚନ</b>"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:5
@@ -1580,424 +1954,759 @@ msgid "Use TCP _header compression"
 msgstr "TCP ଶୀର୍ଷକ ସଙ୍କୋଚନକୁ ବ୍ୟବହାର କରନ୍ତୁ (_h)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "<b>Echo</b>"
-msgstr "<b>ପ୍ରତିଧ୍ୱନି</b>"
+msgid "Echo"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
 msgid "Send PPP _echo packets"
 msgstr "PPP ପ୍ରତିଧ୍ୱନି ପ୍ୟାକେଟଗୁଡ଼ିକୁ ପଠାନ୍ତୁ (_e)"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:13
-msgid "<b>Allowed Authentication Methods</b>"
-msgstr "<b>ଅନୁମତିପ୍ରାପ୍ତ ବୈଧିକରଣ ପଦ୍ଧତିଗୁଡ଼ିକ</b>"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:14
-msgid "_EAP"
-msgstr "EAP (_E)"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:15
-msgid "Extensible Authentication Protocol"
-msgstr "ବିସ୍ତାରଣୀୟ ବୈଧିକରଣ ପ୍ରୋଟୋକଲ"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:16
-msgid "_PAP"
-msgstr "PAP (_P)"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:17
-msgid "Password Authentication Protocol"
-msgstr "ପ୍ରବେଶ ସଂକେତ ବୈଧିକରଣ ପ୍ରୋଟୋକଲ"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:18
-msgid "C_HAP"
-msgstr "CHAP (_H)"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:19
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "ଚ୍ୟାଲେଞ୍ଜ ହ୍ୟାଣ୍ଡସେକ ଅଥେଣ୍ଟିକେଶନ ପ୍ରୋଟୋକଲ"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:20
-msgid "_MSCHAP"
-msgstr "MSCHAP (_M)"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:21
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Microsoft ଚ୍ୟାଲେଞ୍ଜ ହ୍ୟାଣ୍ଡସେକ ଅଥେଣ୍ଟିକେଶନ ପ୍ରୋଟୋକଲ"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:22
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+msgid "_Import team configuration from a file..."
+msgstr "ସଂରକ୍ଷିତ VPN ସଂରଚନାକୁ ଆଣନ୍ତୁ..."
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:23
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft ଚ୍ୟାଲେଞ୍ଜ ହ୍ୟାଣ୍ଡସେକ ଅଥେଣ୍ଟିକେଶନ ପ୍ରୋଟୋକଲ ସଂସ୍କରଣ 2"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "ବନ୍ଧିତ ସଂଯୋଗଗୁଡ଼ିକ (_c):"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:24
-msgid ""
-"<i>In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods.</i>"
-msgstr ""
-"<i>ଅଧିକାଂଶ ପରିସ୍ଥିତିରେ, ପ୍ରଦାତାର PPP ସର୍ଭରଗୁଡ଼ିକ ସମସ୍ତ ବୈଧିକରଣ ପଦ୍ଧତିକୁ "
-"ସମର୍ଥନ କରିବ। ଯଦି ସଂଯୋଗ ବିଫଳ ହୁଏ, ତେବେ କିଛି ପଦ୍ଧତିର ସମର୍ଥନକୁ ନିଷ୍କ୍ରିୟ କରି "
-"ଚେଷ୍ଟା କରନ୍ତୁ।</i>"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "ସଂରକ୍ଷିତ VPN ସଂରଚନାକୁ ଆଣନ୍ତୁ..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "ମୂଖ୍ୟ ଅନ୍ତରାପୃଷ୍ଠ (_P):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN ଅନ୍ତରାପୃଷ୍ଠ ନାମ (_n):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "କ୍ଲୋନ କରାଯାଇଥିବା MAC ଠିକଣା (_C):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN _id:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
-#: ../src/connection-editor/ce-page-vlan.ui.h:8
-msgid "Device name + number"
-msgstr "ଉପକରଣ ନାମ + ନମ୍ବର"
-
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
-msgid "\"vlan\" + number"
-msgstr "\"vlan\" + ନମ୍ବର"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "ମୋଡିହୋଇଥିବା ଯୁଗଳ (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "ସଂଲଗ୍ନକ ଏକକ ଅନ୍ତରାପୃଷ୍ଠ (AUI)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "ମେଡିଆ ନିର୍ଭରଶୀଳ ହୋଇନଥିବା ଅନ୍ତରାପୃଷ୍ଠ (MII)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "ସଂଯୋଗିକୀ (_P):"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "ଗତି (_S):"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "ସମ୍ପୂର୍ଣ୍ଣ ଡୁପ୍ଲେକ୍ସ (_x)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "ସ୍ୱୟଂ ବ୍ୟବସ୍ଥା କରିବା (_o)"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
+msgstr "ଉପକରଣ ନାମ + ନମ୍ବର"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.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 ""
-"ଏଠାରେ ଭରଣ କରାଯାଇଥିବା MAC ଠିକଣାକୁ  ହାର୍ଡୱେର ଠିକଣା ଭାବରେ ବ୍ୟବହାର କରାଯାଇଥାଏ "
-"this connection is activated on.  This feature is known as MAC cloning or "
-"spoofing.  Example: 00:11:22:33:44:55"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr "\"vlan\" + ନମ୍ବର"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "MT_U:"
-msgstr "MTU (_U):"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "ସୁରକ୍ଷା:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "Infrastructure"
-msgstr "ଅବସଂରଚନା"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "ଏଡ-ହକ"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "ପରିବହନ ଶକ୍ତି (_w):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "ହାର (_R):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"ଏହି ବିକଳ୍ପ ଏଠାରେ ଭରଣ କରାଯାଇଥିବା BSSID ଦ୍ୱାରା ଉଲ୍ଲେଖ କରାଯାଇଥିବା ବେତାର ଅଭିଗମ୍ୟ "
-"ବିନ୍ଦୁରେ ସଂଯୋଗକୁ ଅପରିବର୍ତ୍ତନୀୟ କରିଥାଏ (AP)।  ଉଦାହରଣ: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "ଚ୍ୟାନେଲ (_h):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "ବ୍ୟାଣ୍ଡ (_d):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "M_ode:"
-msgstr "ଅବସ୍ଥା (_o):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:21
-msgid "_SSID:"
-msgstr "SSID (_S):"
+#: ../src/connection-editor/ce-polkit-button.c:74
+msgid "No polkit authorization to perform the action"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
-msgstr "ସୁରକ୍ଷା (_S):"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#, fuzzy
+msgid "Allowed Authentication Methods"
+msgstr "<b>ଅନୁମତିପ୍ରାପ୍ତ ବୈଧିକରଣ ପଦ୍ଧତିଗୁଡ଼ିକ</b>"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:504
-#: ../src/connection-editor/ip6-routes-dialog.c:462
-#: ../src/connection-editor/page-ip4.c:738
-#: ../src/connection-editor/page-ip6.c:723
-msgid "Address"
-msgstr "ଠିକଣା"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr "EAP (_E)"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:520
-#: ../src/connection-editor/page-ip4.c:755
-msgid "Netmask"
-msgstr "ନେଟମାସ୍କ"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr "ବିସ୍ତାରଣୀୟ ବୈଧିକରଣ ପ୍ରୋଟୋକଲ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:536
-#: ../src/connection-editor/ip6-routes-dialog.c:494
-#: ../src/connection-editor/page-ip4.c:772
-#: ../src/connection-editor/page-ip6.c:757
-msgid "Gateway"
-msgstr "ପ୍ରବେଶ ଦ୍ୱାର"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr "PAP (_P)"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:552
-#: ../src/connection-editor/ip6-routes-dialog.c:510
-msgid "Metric"
-msgstr "Metric"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr "ପ୍ରବେଶ ସଂକେତ ବୈଧିକରଣ ପ୍ରୋଟୋକଲ"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:478
-#: ../src/connection-editor/page-ip6.c:740
-msgid "Prefix"
-msgstr "ଉପସର୍ଗ"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr "CHAP (_H)"
 
-#: ../src/connection-editor/new-connection.c:106
-#: ../src/connection-editor/page-wired.c:236
-msgid "Wired"
-msgstr "ତାରଯୁକ୍ତ"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "ଚ୍ୟାଲେଞ୍ଜ ହ୍ୟାଣ୍ଡସେକ ଅଥେଣ୍ଟିକେଶନ ପ୍ରୋଟୋକଲ"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr "MSCHAP (_M)"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft ଚ୍ୟାଲେଞ୍ଜ ହ୍ୟାଣ୍ଡସେକ ଅଥେଣ୍ଟିକେଶନ ପ୍ରୋଟୋକଲ"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft ଚ୍ୟାଲେଞ୍ଜ ହ୍ୟାଣ୍ଡସେକ ଅଥେଣ୍ଟିକେଶନ ପ୍ରୋଟୋକଲ ସଂସ୍କରଣ 2"
 
-#: ../src/connection-editor/new-connection.c:112
-#: ../src/connection-editor/page-wireless.c:435
-msgid "Wireless"
-msgstr "ବେତାର"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#, 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 ""
+"<i>ଅଧିକାଂଶ ପରିସ୍ଥିତିରେ, ପ୍ରଦାତାର PPP ସର୍ଭରଗୁଡ଼ିକ ସମସ୍ତ ବୈଧିକରଣ ପଦ୍ଧତିକୁ ସମର୍ଥନ କରିବ। ଯଦି ସଂଯୋଗ "
+"ବିଫଳ ହୁଏ, ତେବେ କିଛି ପଦ୍ଧତିର ସମର୍ଥନକୁ ନିଷ୍କ୍ରିୟ କରି ଚେଷ୍ଟା କରନ୍ତୁ।</i>"
+
+#: ../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 "ସ୍ୱୟଂଚାଳିତ ଇଥରନେଟ"
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
 
-#: ../src/connection-editor/new-connection.c:124
-#: ../src/connection-editor/page-dsl.c:161
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:130
-#: ../src/connection-editor/page-infiniband.c:157
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "ଇନଫିନିବ୍ୟାଣ୍ଡ"
 
-#: ../src/connection-editor/new-connection.c:136
-#: ../src/connection-editor/page-bond.c:798 ../src/utils/utils.c:216
+#: ../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
 msgid "Bond"
 msgstr "ବନ୍ଧନ"
 
-#: ../src/connection-editor/new-connection.c:142
-#: ../src/connection-editor/page-vlan.c:606 ../src/utils/utils.c:220
+#: ../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
+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
+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"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:155
-#: ../src/connection-editor/new-connection.c:295
-#: ../src/connection-editor/page-vpn.c:116
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:245
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "ହାର୍ଡୱେର"
 
-#: ../src/connection-editor/new-connection.c:265
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "ଆଭାସୀ"
 
-#: ../src/connection-editor/new-connection.c:333
-#: ../src/connection-editor/new-connection.c:335
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "ସଂରକ୍ଷିତ VPN ସଂରଚନାକୁ ଆଣନ୍ତୁ..."
 
-#: ../src/connection-editor/new-connection.c:363
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "ସଂଯୋଗ ସମ୍ପାଦକ ସଂଳାପକୁ ଅଜଣା ତ୍ରୁଟି କାରଣରୁ ଆରମ୍ଭ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/new-connection.c:372
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "ନୂତନ ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
 
-#: ../src/connection-editor/new-connection.c:516
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "ସଂଯୋଗ ଅପସାରଣ ବିଫଳ ହୋଇଛି"
 
-#: ../src/connection-editor/new-connection.c:596
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "ସଂଯୋଗ %s କୁ ଅପସାରଣ କରିବେ ବୋଲି ଆପଣ ନିଶ୍ଚିତ କି?"
 
-#: ../src/connection-editor/page-bond.c:579
+#: ../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
+msgid "Address"
+msgstr "ଠିକଣା"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "ନେଟମାସ୍କ"
+
+#: ../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
+msgid "Gateway"
+msgstr "ପ୍ରବେଶ ଦ୍ୱାର"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Metric"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "ଉପସର୍ଗ"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
-msgid "%s slave %d"
-msgstr "%s ସ୍ଲେଭ %d"
+msgid "Editing %s"
+msgstr "ସମ୍ପାଦନ କରୁଅଛି %s"
 
-#: ../src/connection-editor/page-bond.c:616
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "ବେନାମୀ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରୁଅଛି"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "ସଂଯୋଗ ନାମ (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "ସମ୍ପାଦକଙ୍କୁ ଆରମ୍ଭ କରିବା ସମୟରେ ତ୍ରୁଟି"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "ସଂଯୋଗ ଅଦ୍ୟତନ ବିଫଳ ହୋଇଛି"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
-"Select the type of connection that will be used for the slaves of this bond."
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr "ସଂଯୋଗ ସମ୍ପାଦକ କିଛି ଆବଶ୍ୟକୀୟ ଉତ୍ସ ପାଇଲା ନାହିଁ (.ui ଫାଇଲ ମିଳି ନଥିଲା)।"
+
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "_Save"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "ଏହି ସଂଯୋଗରେ କରାଯାଇଥିବା କୌଣସି ପରିବର୍ତ୍ତନକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ।"
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "ଏହି ଯନ୍ତ୍ରର ସମସ୍ତ ଚାଳକମାନଙ୍କ ପାଇଁ ଏହି ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ ବୈଧିକରଣ କରନ୍ତୁ।"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not create connection"
+msgstr "ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "ସଂଯୋଗକୁ ସମ୍ପାଦନ କରାଯାଇପାରିଲା ନାହିଁ"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr "ସଂଯୋଗ ସମ୍ପାଦକ ସଂଳାପ ନିର୍ମାଣ କରିବାରେ ତ୍ରୁଟି।"
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "ସମ୍ପାଦକଙ୍କୁ ଆରମ୍ଭ କରିବା ସମୟରେ ତ୍ରୁଟି"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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/page-bond.c:785
-#: ../src/connection-editor/page-bond.c:792
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+msgid "Connection _name:"
+msgstr "ସଂଯୋଗ ନାମ (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
+msgstr "ରପ୍ତାନୀ କରନ୍ତୁ (_E)..."
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "କଦାପି ନୁହଁ"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "ବର୍ତ୍ତମାନ"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d ବର୍ଷ ପୂର୍ବେ"
+msgstr[1] "%d ବର୍ଷ ପୂର୍ବେ"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "ନାମ"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "ଅନ୍ତିମ ଥର ବ୍ୟବହୃତ"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରନ୍ତୁ"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରିବା ପାଇଁ ବିଧିମାନ୍ୟ କରନ୍ତୁ"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ଅପସାରଣ କରନ୍ତୁ"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରିବା ପାଇଁ ବିଧିମାନ୍ୟ କରନ୍ତୁ"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, fuzzy, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+#, fuzzy
+msgid "Error creating connection"
+msgstr "ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "802.1x ସୁରକ୍ଷା"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "WiFi ସୁରକ୍ଷା ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
+
+#: ../src/connection-editor/page-8021x-security.c:125
+#, fuzzy
+msgid "Use 802.1_X security for this connection"
+msgstr "ଏହି ସଂଯୋଗ ପାଇଁ 802.1X ସୁରକ୍ଷାକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "ବ୍ଲୁଟୁଥ ଉପକରଣକୁ ଖୋଜି ପାରିଲା ନାହିଁ।"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "ବନ୍ଧନ ସଂଯୋଗ %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+#, fuzzy
+msgid "Select the type of the Bluetooth connection profile."
+msgstr "ଆପଣ ପ୍ରସ୍ତୁତ କରିବାକୁ ଚାହୁଁଥିବା ସଂଯୋଗର ପ୍ରକାର ବାଛନ୍ତୁ:"
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "ନେଟୱର୍କିଙ୍ଗ ସକ୍ରିୟ କରନ୍ତୁ (_N)"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "ବେତାର ନେଟୱର୍କ"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-bond.c:960
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "ପ୍ରାଥମିକ DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "ବନ୍ଧନ ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-dsl.c:148
-#: ../src/connection-editor/page-dsl.c:155
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "ବନ୍ଧନ ସଂଯୋଗ %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+#, fuzzy
+msgid "Bridge Port"
+msgstr "ବ୍ରିଜ"
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "DSL ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-dsl.c:252
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-infiniband.c:144
-#: ../src/connection-editor/page-infiniband.c:151
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"ଏହି ବିକଳ୍ପ ସଂଯୋଗକୁ ଏଠାରେ ଭରଣ କରାଯାଇଥିବା ସ୍ଥାୟୀ MAC ଠିକଣା ଦ୍ୱାରା ଉଲ୍ଲିଖିତ ନେଟୱର୍କ ଉପକରଣରେ "
+"ଅପରିବର୍ତ୍ତନୀୟ କରିଥାଏ।  ଉଦାହରଣ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "ତାରଯୁକ୍ତ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "ଇଥରନେଟ (%s)"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "କ୍ଲୋନ କରାଯାଇଥିବା MAC ଠିକଣା (_C):"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ"
+
+#: ../src/connection-editor/page-general.c:52
+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 "ନେଟୱର୍କ ପରିଚାଳକ ଚାଲୁନାହିଁ..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "ଇନଫିବ୍ୟାଣ୍ଡ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-infiniband.c:243
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "ଇନଫିବ୍ୟାଣ୍ଡ ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:125
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "ସ୍ୱୟଂଚାଳିତ (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:127
-#: ../src/connection-editor/page-ip6.c:126
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "କେବଳ ସ୍ୱୟଂଚାଳିତ (VPN) ଠିକଣାଗୁଡ଼ିକ"
 
 #: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:129
-msgid "Automatic (PPP)"
-msgstr "ସ୍ୱୟଂଚାଳିତ (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:130
-msgid "Automatic (PPP) addresses only"
-msgstr "କେବଳ ସ୍ୱୟଂଚାଳିତ (PPP) ଠିକଣାଗୁଡ଼ିକ"
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "ସ୍ୱୟଂଚାଳିତ, କେବଳ ଠିକଣାଗୁଡ଼ିକ"
 
-#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip4.c:132
 #: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "ସ୍ୱୟଂଚାଳିତ (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:134
+#: ../src/connection-editor/page-ip4.c:133
 #: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "କେବଳ ସ୍ୱୟଂଚାଳିତ (PPPoE) ଠିକଣାଗୁଡ଼ିକ"
 
-#: ../src/connection-editor/page-ip4.c:136
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "ସ୍ୱୟଂଚାଳିତ (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "କେବଳ ସ୍ୱୟଂଚାଳିତ (DHCP) ଠିକଣାଗୁଡ଼ିକ"
 
-#: ../src/connection-editor/page-ip4.c:174
+#: ../src/connection-editor/page-ip4.c:179
 #: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "କେବଳ ସଂଯୋଗ-ସ୍ଥାନୀୟ"
 
-#: ../src/connection-editor/page-ip4.c:190
-msgid "Disabled"
-msgstr "ନିଷ୍କ୍ରିୟ ହୋଇଛି"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "DNS ସର୍ଭରଗୁଡ଼ିକ (_D):"
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "ପରିସରଗୁଡ଼ିକୁ ସନ୍ଧାନ କରନ୍ତୁ (_S):"
 
-#: ../src/connection-editor/page-ip4.c:700
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s ପାଇଁ IPv4 ପଥକୁ ସମ୍ପାଦନ କରୁଅଛି"
 
-#: ../src/connection-editor/page-ip4.c:827
-#: ../src/connection-editor/page-ip4.c:834
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr "IPv4 ସଂରଚନା"
+
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-ip4.c:840
-msgid "IPv4 Settings"
-msgstr "IPv4 ସଂରଚନା"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic, addresses only"
-msgstr "ସ୍ୱୟଂଚାଳିତ, କେବଳ ଠିକଣାଗୁଡ଼ିକ"
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
 #: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
@@ -2007,121 +2716,224 @@ msgstr "ଆଗ୍ରହ୍ଯ କରିଦିଅନ୍ତୁ"
 msgid "Automatic, DHCP only"
 msgstr "ସ୍ୱୟଂଚାଳିତ, କେବଳ DHCP"
 
-#: ../src/connection-editor/page-ip6.c:685
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s ପାଇଁ IPv6 ପଥକୁ ସମ୍ପାଦନ କରୁଅଛି"
 
-#: ../src/connection-editor/page-ip6.c:810
-#: ../src/connection-editor/page-ip6.c:817
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr "IPv6 ସଂରଚନା"
+
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-ip6.c:823
-msgid "IPv6 Settings"
-msgstr "IPv6 ସଂରଚନା"
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr "%s ସ୍ଲେଭ %d"
 
-#: ../src/connection-editor/page-mobile.c:313
-#: ../src/connection-editor/page-mobile.c:320
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-mobile.c:341
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "ଅସମର୍ଥିତ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ପ୍ରକାର।"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:591
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ପ୍ରଦାତା ପ୍ରକାରକୁ ବାଛନ୍ତୁ"
 
-#: ../src/connection-editor/page-mobile.c:618
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr ""
-"ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ପ୍ରଦାତା ବ୍ୟବହାର କରୁଥିବା ପ୍ରଯୁକ୍ତିଜ୍ଞାନକୁ "
-"ବାଛନ୍ତୁ।  ଯଦି ଆପଣ ନିଶ୍ଚିତ ନୁହଁନ୍ତି, ତେବେ ଆପଣଙ୍କ ପ୍ରଦାତାଙ୍କୁ ପଚାରନ୍ତୁ।"
+"ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ପ୍ରଦାତା ବ୍ୟବହାର କରୁଥିବା ପ୍ରଯୁକ୍ତିଜ୍ଞାନକୁ ବାଛନ୍ତୁ।  ଯଦି ଆପଣ ନିଶ୍ଚିତ "
+"ନୁହଁନ୍ତି, ତେବେ ଆପଣଙ୍କ ପ୍ରଦାତାଙ୍କୁ ପଚାରନ୍ତୁ।"
 
-#: ../src/connection-editor/page-mobile.c:623
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
-"ମୋର ପ୍ରଦାତା GSM-ଆଧାରିତ ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବାହର କରନ୍ତି (ଯେପରିକି, GPRS, EDGE, "
-"UMTS, HSDPA) (_G)"
+"ମୋର ପ୍ରଦାତା GSM-ଆଧାରିତ ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବାହର କରନ୍ତି (ଯେପରିକି, GPRS, EDGE, UMTS, HSDPA) "
+"(_G)"
 
-#: ../src/connection-editor/page-mobile.c:628
-msgid "My provider uses _CDMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr ""
-"ମୋର ପ୍ରଦାତା CDMA-ଆଧାରିତ ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବାହର କରନ୍ତି (ଯେପରିକି, 1xRTT, EVDO) "
-"( _C)"
+#: ../src/connection-editor/page-mobile.c:568
+#, fuzzy
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr "ମୋର ପ୍ରଦାତା CDMA-ଆଧାରିତ ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବାହର କରନ୍ତି (ଯେପରିକି, 1xRTT, EVDO) ( _C)"
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:135
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:241
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-fast.c:276
-#: ../src/wireless-security/eap-method-peap.c:258
-#: ../src/wireless-security/eap-method-ttls.c:273
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:257
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:142
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "କିଛି ନୁହେଁ"
 
-#: ../src/connection-editor/page-ppp.c:202
+#: ../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:294
-#: ../src/connection-editor/page-ppp.c:301
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr "PPP ବିନ୍ଯାସ"
+
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-ppp.c:307
-msgid "PPP Settings"
-msgstr "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 "ଆମଦାନୀ ପାଇଁ ଫାଇଲ ଚୟନ କରନ୍ତୁ"
 
-#: ../src/connection-editor/page-vlan.c:593
-#: ../src/connection-editor/page-vlan.c:600
-msgid "Could not load VLAN user interface."
-msgstr "VLAN ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "ତାରଯୁକ୍ତ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-vlan.c:801
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "କୌଣସି ନେଟୱର୍କ ସଂଯୋଗ ନାହିଁ"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "ବନ୍ଧନ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-vpn.c:127
+#: ../src/connection-editor/page-vpn.c:103
+#, fuzzy
+msgid "Could not load VPN user interface."
+msgstr "VLAN ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
+
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' ପାଇଁ VPN ପ୍ଲଗଇନ ସର୍ଭିସକୁ ସନ୍ଧାନ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-vpn.c:242
-#: ../src/connection-editor/page-vpn.c:309
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-vpn.c:268
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2131,303 +2943,116 @@ msgstr ""
 "\n"
 "ତ୍ରୁଟି: କୌଣସି VPN ସର୍ଭିସ ପ୍ରକାର ନାହିଁ।"
 
-#: ../src/connection-editor/page-wired.c:223
-#: ../src/connection-editor/page-wired.c:230
-msgid "Could not load wired user interface."
-msgstr "ତାରଯୁକ୍ତ ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
-
-#: ../src/connection-editor/page-wired.c:371
-#, c-format
-msgid "Wired connection %d"
-msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
+#: ../src/connection-editor/page-vpn.c:254
+#, fuzzy
+msgid "Choose a VPN Connection Type"
+msgstr "VPN ସଂଯୋଗ ବିଫଳ ହୋଇଛି"
 
-#: ../src/connection-editor/page-wired-security.c:125
-msgid "802.1x Security"
-msgstr "802.1x ସୁରକ୍ଷା"
+#: ../src/connection-editor/page-vpn.c:255
+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-wired-security.c:133
-msgid "Use 802.1X security for this connection"
-msgstr "ଏହି ସଂଯୋଗ ପାଇଁ 802.1X ସୁରକ୍ଷାକୁ ବ୍ୟବହାର କରନ୍ତୁ"
+#: ../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 ଦ୍ୱାରା ଉଲ୍ଲେଖ କରାଯାଇଥିବା ବେତାର ଅଭିଗମ୍ୟ ବିନ୍ଦୁରେ "
+"ସଂଯୋଗକୁ ଅପରିବର୍ତ୍ତନୀୟ କରିଥାଏ (AP)।  ଉଦାହରଣ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:146
-#: ../src/connection-editor/page-wireless.c:150
-#: ../src/connection-editor/page-wireless.c:171
-#, c-format
-msgid "default"
-msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ"
+#: ../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)\""
+msgstr ""
+"ଏହି ବିକଳ୍ପ ସଂଯୋଗକୁ ଏଠାରେ ଭରଣ କରାଯାଇଥିବା ସ୍ଥାୟୀ MAC ଠିକଣା ଦ୍ୱାରା ଉଲ୍ଲିଖିତ ନେଟୱର୍କ ଉପକରଣରେ "
+"ଅପରିବର୍ତ୍ତନୀୟ କରିଥାଏ।  ଉଦାହରଣ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:175
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:422
-#: ../src/connection-editor/page-wireless.c:429
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "WiFi ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରାଯାଇପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/page-wireless.c:601
-#, c-format
-msgid "Wireless connection %d"
-msgstr "ବେତାର ସଂଯୋଗ %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "କୌଣସି ଉପଦେଶ ଅଛି କି"
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "ତାରଯୁକ୍ତ ସଂଯୋଗ %d"
 
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/wireless-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:274
-#: ../src/wireless-dialog.c:940
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-ବିଟ ପ୍ରବେଶ ସଂକେତ"
 
-#: ../src/connection-editor/page-wireless-security.c:300
-#: ../src/wireless-dialog.c:970
+#: ../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)"
 msgstr "ଗତିଜ WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:314
-#: ../src/wireless-dialog.c:984
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ବ୍ୟକ୍ତିଗତ"
 
-#: ../src/connection-editor/page-wireless-security.c:328
-#: ../src/wireless-dialog.c:998
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ଉଦ୍ଦୋଗ"
 
-#: ../src/connection-editor/page-wireless-security.c:374
-msgid "Could not load WiFi security user interface; missing WiFi setting."
-msgstr ""
-"WiFi ସୁରକ୍ଷା ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ; WiFi ସଂରଚନା ଅନୁପସ୍ଥିତ ଅଛି।"
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr "WiFi ସୁରକ୍ଷା ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ; WiFi ସଂରଚନା ଅନୁପସ୍ଥିତ ଅଛି।"
 
-#: ../src/connection-editor/page-wireless-security.c:383
-#: ../src/connection-editor/page-wireless-security.c:390
-msgid "Could not load WiFi security user interface."
-msgstr "WiFi ସୁରକ୍ଷା ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
-
-#: ../src/connection-editor/page-wireless-security.c:396
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "ବେତାର ସୁରକ୍ଷା"
 
-#: ../src/connection-editor/nm-connection-editor.c:110
-#, c-format
-msgid "Editing %s"
-msgstr "ସମ୍ପାଦନ କରୁଅଛି %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:114
-msgid "Editing un-named connection"
-msgstr "ବେନାମୀ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରୁଅଛି"
-
-#: ../src/connection-editor/nm-connection-editor.c:308
-msgid ""
-"The connection editor could not find some required resources (the "
-"NetworkManager applet .glade file was not found)."
-msgstr ""
-"ସଂଯୋଗ ସମ୍ପାଦକ କିଛି ଆବଶ୍ୟକୀୟ ଉତ୍ସ ପାଇଲା ନାହିଁ (NetworkManager ଆପଲେଟ .glade  "
-"ଫାଇଲ ମିଳିଲା ନାହିଁ)।"
-
-#: ../src/connection-editor/nm-connection-editor.c:326
-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:482
-msgid ""
-"Support for bond, bridge, and VLAN interfaces must be enabled by setting the "
-"NM_BOND_BRIDGE_VLAN_ENABLED key to 'yes' in <tt>/etc/sysconfig/network</tt>:\n"
-"\n"
-"	<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
-"\n"
-"After making this modification, NetworkManager must be restarted to ensure "
-"the new functionality is enabled."
-msgstr ""
-"ବନ୍ଧନ, ବ୍ରିଜ, ଏବଂ VLAN ଅନ୍ତରାପୃଷ୍ଠଗୁଡ଼ିକ ପାଇଁ ସହାୟତାକୁ ନିଶ୍ଚିତ ଭାବରେ "
-"NM_BOND_BRIDGE_VLAN_ENABLED କୁ <tt>/etc/sysconfig/network</tt> ରେ  'yes' ସେଟ "
-"କରି ସକ୍ରିୟ କରିବା ଉଚିତ:\n"
-"\n"
-"	<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
-"\n"
-"ଏହି ପରିବର୍ତ୍ତନ କରିସାରିବା ପରେ ନୂତନ ପରିବର୍ତ୍ତନଗୁଡ଼ିକ ସକ୍ରିୟ ହୋଇଛି କି ନାହିଁ "
-"ନିଶ୍ଚିତ କରିବା ପାଇଁ, NetworkManager କୁ ନିଶ୍ଚିତ ଭାବରେ ପୁନଃଚାଳନ କରିବା ଉଚିତ।"
-
-#: ../src/connection-editor/nm-connection-editor.c:494
-msgid "Bridging, bonding, and VLAN functionality not enabled"
-msgstr "ବ୍ରିଜିଙ୍ଗ, ବଣ୍ଡିଙ୍ଗ, ଏବଂ VLAN ଫଳନକୁ ସକ୍ରିୟ କରାଯାଇ ନାହିଁ"
-
-#: ../src/connection-editor/nm-connection-editor.c:541
-msgid "Apply"
-msgstr "ପ୍ରଯୋଗ କରନ୍ତୁ"
-
-#: ../src/connection-editor/nm-connection-editor.c:542
-msgid "Save any changes made to this connection."
-msgstr "ଏହି ସଂଯୋଗରେ କରାଯାଇଥିବା କୌଣସି ପରିବର୍ତ୍ତନକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ।"
-
-#: ../src/connection-editor/nm-connection-editor.c:543
-msgid "Apply..."
-msgstr "ପ୍ରୟୋଗ କରନ୍ତୁ..."
-
-#: ../src/connection-editor/nm-connection-editor.c:544
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr ""
-"ଏହି ଯନ୍ତ୍ରର ସମସ୍ତ ଚାଳକମାନଙ୍କ ପାଇଁ ଏହି ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବା ପାଇଁ ବୈଧିକରଣ "
-"କରନ୍ତୁ।"
-
-#: ../src/connection-editor/nm-connection-editor.c:560
-msgid "Could not create connection"
-msgstr "ସଂଯୋଗକୁ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ"
-
-#: ../src/connection-editor/nm-connection-editor.c:560
-msgid "Could not edit connection"
-msgstr "ସଂଯୋଗକୁ ସମ୍ପାଦନ କରାଯାଇପାରିଲା ନାହିଁ"
-
-#: ../src/connection-editor/nm-connection-editor.c:562
-msgid "Unknown error creating connection editor dialog."
-msgstr "ସଂଯୋଗ ସମ୍ପାଦକ ସଂଳାପ ନିର୍ମାଣ କରିବାରେ ତ୍ରୁଟି।"
-
-#: ../src/connection-editor/nm-connection-editor.c:577
-msgid "Bonding, bridging, and VLANs are disabled in NetworkManager."
-msgstr ""
-"ବଣ୍ଡିଙ୍ଗ, ବ୍ରିଜିଙ୍ଗ, ଏବଂ VLANs କୁ  NetworkManaer ରେ ନିଷ୍କ୍ରିୟ କରାଯାଇଛି।"
-
-#: ../src/connection-editor/nm-connection-editor.c:650
-msgid "Error saving connection"
-msgstr "ସଂଯୋଗକୁ ସଂରକ୍ଷଣ କରିବାରେ ତ୍ରୁଟି"
-
-#: ../src/connection-editor/nm-connection-editor.c:651
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "ଗୁଣଧର୍ମ '%s' / '%s' ଅବୈଧ: %d"
-
-#: ../src/connection-editor/nm-connection-editor.c:743
-msgid "Error initializing editor"
-msgstr "ସମ୍ପାଦକଙ୍କୁ ଆରମ୍ଭ କରିବା ସମୟରେ ତ୍ରୁଟି"
-
-#: ../src/connection-editor/nm-connection-editor.c:1037
-msgid "Connection update failed"
-msgstr "ସଂଯୋଗ ଅଦ୍ୟତନ ବିଫଳ ହୋଇଛି"
-
-#: ../src/connection-editor/nm-connection-editor.c:1097
-msgid "Connection add failed"
-msgstr "ସଂଯୋଗ ଯୋଗକରିବା ବିଫଳ ହୋଇଛି"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Create New Connection"
-msgstr "ନୂତନ ସଂଯୋଗକୁ ନିର୍ମାଣ କରନ୍ତୁ"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Select the type of connection to create:"
-msgstr "ଆପଣ ପ୍ରସ୍ତୁତ କରିବାକୁ ଚାହୁଁଥିବା ସଂଯୋଗର ପ୍ରକାର ବାଛନ୍ତୁ:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-msgid "Connection _name:"
-msgstr "ସଂଯୋଗ ନାମ (_n):"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "Connect _automatically"
-msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ସଂଯୁକ୍ତ (_a)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "Available to all users"
-msgstr "ସମସ୍ତ ଚାଳକ ମାନଙ୍କ ପାଇଁ ଉପଲବ୍ଧ"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "_Export..."
-msgstr "ରପ୍ତାନୀ କରନ୍ତୁ (_E)..."
-
-#: ../src/connection-editor/nm-connection-list.c:143
-msgid "never"
-msgstr "କଦାପି ନୁହଁ"
-
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
-msgid "now"
-msgstr "ବର୍ତ୍ତମାନ"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d ମିନଟ ପୂର୍ବେ"
-msgstr[1] "%d ମିନଟ ପୂର୍ବେ"
-
-#: ../src/connection-editor/nm-connection-list.c:176
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d ଘଣ୍ଟା ପୂର୍ବରୁ"
-msgstr[1] "%d ଘଣ୍ଟା ପୂର୍ବରୁ"
-
-#: ../src/connection-editor/nm-connection-list.c:188
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d ଦିନ ପୂର୍ବେ"
-msgstr[1] "%d ଦିନ ପୂର୍ବେ"
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
+msgstr "WiFi ସୁରକ୍ଷା ଚାଳକ ଅନ୍ତରାପୃଷ୍ଠକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ।"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d ମାସ ପୂର୍ବେ"
-msgstr[1] "%d ମାସ ପୂର୍ବେ"
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d ବର୍ଷ ପୂର୍ବେ"
-msgstr[1] "%d ବର୍ଷ ପୂର୍ବେ"
-
-#: ../src/connection-editor/nm-connection-list.c:629
-msgid "Name"
-msgstr "ନାମ"
-
-#: ../src/connection-editor/nm-connection-list.c:640
-msgid "Last Used"
-msgstr "ଅନ୍ତିମ ଥର ବ୍ୟବହୃତ"
-
-#. Edit
-#: ../src/connection-editor/nm-connection-list.c:679
-msgid "Edit"
-msgstr "ସମ୍ପାଦନ କରନ୍ତୁ"
-
-#: ../src/connection-editor/nm-connection-list.c:680
-msgid "Edit the selected connection"
-msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରନ୍ତୁ"
-
-#: ../src/connection-editor/nm-connection-list.c:681
-msgid "Edit..."
-msgstr "ସମ୍ପାଦନ କରନ୍ତୁ..."
-
-#: ../src/connection-editor/nm-connection-list.c:682
-msgid "Authenticate to edit the selected connection"
-msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରିବା ପାଇଁ ବିଧିମାନ୍ୟ କରନ୍ତୁ"
-
-#. Delete
-#: ../src/connection-editor/nm-connection-list.c:695
-msgid "Delete"
-msgstr "ବିଲୋପ କରନ୍ତୁ"
-
-#: ../src/connection-editor/nm-connection-list.c:696
-msgid "Delete the selected connection"
-msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ଅପସାରଣ କରନ୍ତୁ"
-
-#: ../src/connection-editor/nm-connection-list.c:697
-msgid "Delete..."
-msgstr "ବିଲୋପ କରନ୍ତୁ..."
-
-#: ../src/connection-editor/nm-connection-list.c:698
-msgid "Authenticate to delete the selected connection"
-msgstr "ବଚ୍ଛିତ ସଂଯୋଗକୁ ସମ୍ପାଦନ କରିବା ପାଇଁ ବିଧିମାନ୍ୟ କରନ୍ତୁ"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN ସଂଯୋଗକୁ ଆମଦାନୀ କରାଯାଇପାରିବ ନାହିଁ"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2439,235 +3064,94 @@ msgstr ""
 "\n"
 "ତ୍ରୁଟି: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:240
-msgid "Select file to import"
-msgstr "ଆମଦାନୀ ପାଇଁ ଫାଇଲ ଚୟନ କରନ୍ତୁ"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "ଅଜଣା"
 
-#: ../src/connection-editor/vpn-helpers.c:288
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" ନାମକ ଗୋଟିଏ ଫାଇଲ ପୂର୍ବରୁ ଅବସ୍ଥିତ ଅଛି।"
 
-#: ../src/connection-editor/vpn-helpers.c:290
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "ବଦଳାନ୍ତୁ (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:328
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN ସଂଯୋଗକୁ ରପ୍ତାନୀ କରାଯାଇପାରିବ ନାହିଁ"
 
-#: ../src/connection-editor/vpn-helpers.c:330
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
-msgid "The VPN connection '%s' could not be exported to %s.\n"
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
 "\n"
 "Error: %s."
-msgstr "VPN ସଂଯୋଗ '%s' କୁ %sକୁ ରପ୍ତାନୀ କରାଯାଇପାରିବ ନାହିଁ।\n"
+msgstr ""
+"VPN ସଂଯୋଗ '%s' କୁ %sକୁ ରପ୍ତାନୀ କରାଯାଇପାରିବ ନାହିଁ।\n"
 "\n"
 "ତ୍ରୁଟି: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:364
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN ସଂଯୋଗକୁ ରପ୍ତାନୀ କରନ୍ତୁ..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:213
-#, c-format
-msgid "%s Network"
-msgstr "%s ନେଟୱର୍କ"
-
-#: ../src/gnome-bluetooth/bt-widget.c:322
-#, c-format
-msgid "Error: %s"
-msgstr "ତ୍ରୁଟି: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Mobile wizard was canceled"
-msgstr "ମୋବାଇଲ ୱିଜାର୍ଡ ବାତିଲ ହୋଇଛି"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "ଅଜଣା ଫୋନ ଉପକରଣ ପ୍ରକାର (GSM କିମ୍ବା CDMA ନୁହଁ)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:478
-msgid "Your phone is now ready to use!"
-msgstr "ଆପଣଙ୍କର ଫୋନ ବର୍ତ୍ତମାନ ବ୍ୟବହାର ପାଇଁ ପ୍ରସ୍ତୁତ!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:648
-#: ../src/gnome-bluetooth/bt-widget.c:654
-msgid "failed to connect to the phone."
-msgstr "ଫୋନ ସହିତ ସହିତ ସଂଯୋଗ ହେବାରେ ବିଫଳ।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:687
-msgid "unexpectedly disconnected from the phone."
-msgstr "ଅପ୍ରତ୍ୟାଶିତ ଭାବରେ ଫୋନରୁ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:696
-msgid "timed out detecting phone details."
-msgstr "ଫୋନ ବିବରଣୀ ପାଇସାରିବା ପରେ ସମୟ ସମାପ୍ତ ହୋଇଛି।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:711
-msgid "could not connect to the system bus."
-msgstr "ତନ୍ତ୍ର ବସ ସହିତ ସଂଯୋଗ ସ୍ଥାପନ କରିପାରିଲା ନାହିଁ।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:716
-msgid "Detecting phone configuration..."
-msgstr "ଫୋନ ସଂରଚନାକୁ ଯାଞ୍ଚ କରୁଅଛି..."
-
-#: ../src/gnome-bluetooth/bt-widget.c:782
-msgid "could not find the Bluetooth device."
-msgstr "ବ୍ଲୁଟୁଥ ଉପକରଣକୁ ଖୋଜି ପାରିଲା ନାହିଁ।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:912
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"ପୂର୍ବନିର୍ଦ୍ଧାରିତ ବ୍ଲୁଟୁଥ ଏଡ଼ପଟର ନିଶ୍ଚିତ ଭାବରେ ଗୋଟିଏ ଡାଏଲ-ଅପ-ନେଟୱର୍କିଙ୍ଗ "
-"ସଂଯୋଗ ସ୍ଥାପନ କରିବା ପୂର୍ବରୁ ସକ୍ରିୟ ହେବା ଉଚିତ।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:944
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "ବ୍ଲୁଟୁଥ ସଂରଚନା ସମ୍ଭବ ନୁହଁ (D-Bus ସହିତ ସଂଯୋଗ ହେବାରେ ବିଫଳ: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:954
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "ବ୍ଲୁଟୁଥ ସଂରଚନା ସମ୍ଭବ ନୁହଁ (D-Bus ପ୍ରକ୍ସି ନିର୍ମାଣ କରିବାରେ ବିଫଳ)।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:963
-#, c-format
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
+#, fuzzy
 msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "ବ୍ଲୁଟୁଥ ସଂରଚନା ସମ୍ଭବ ନୁହଁ (NetworkManager କୁ ଖୋଜି ପାଇବାରେ ବିଫଳ : %s)।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1014
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "ଆପଣଙ୍କର ମୋବାଇଲ ଫୋନକୁ ନେଟୱର୍କ ଉପକରଣ ଭାବରେ ବ୍ୟବହାର କରନ୍ତୁ (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1023
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "ଆପମଙ୍କର ମୋବାଇଲ ଫୋନ ବ୍ଯବହାର କରି ଇଣ୍ଟର୍ନେଟ ସୁବିଧାକୁ ଉପଲବ୍ଧ କରନ୍ତୁ (DUN)"
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr "ନେଟୱର୍କ ପରିଚାଳକ ଆପଲେଟ କିଛି ଆବଶ୍ୟକୀୟ ଉତ୍ସ ପାଇଲା ନାହିଁ (ଗ୍ଲେଡ଼ ଫାଇଲ ମିଳିଲା ନାହିଁ)।"
 
-#: ../src/main.c:70
-msgid "Usage:"
-msgstr "ବ୍ୟବହାର ବିଧି:"
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "ଖୋଲନ୍ତୁ (_U)"
 
-#: ../src/main.c:72
-msgid ""
-"This program is a component of NetworkManager (http://projects.gnome.org/"
-"NetworkManager)."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
 msgstr ""
-"ଏହି ପ୍ରଗ୍ରାମଟି NetworkManager ର ଗୋଟିଏ ଉପାଦାନ (http://projects.gnome.org/"
-"NetworkManager)."
 
-#: ../src/main.c:73
-msgid ""
-"It is not intended for command-line interaction but instead runs in the "
-"GNOME desktop environment."
-msgstr ""
-"ନିର୍ଦ୍ଦେଶ-ନାମା କାର୍ଯକଳାପ ପାଇଁ ଏହା ଇଚ୍ଛୁକ ନୁହଁ କିନ୍ତୁ ଏହା ପରିବର୍ତ୍ତେGNOME "
-"ଡେସ୍କଟପ ପରିବେଶରେ ଚାଲିଥାଏ।"
-
-#: ../src/mb-menu-item.c:58
-msgid "EVDO"
-msgstr "EVDO"
-
-#: ../src/mb-menu-item.c:62
-msgid "GPRS"
-msgstr "GPRS"
-
-#: ../src/mb-menu-item.c:64
-msgid "EDGE"
-msgstr "EDGE"
-
-#: ../src/mb-menu-item.c:66
-msgid "UMTS"
-msgstr "UMTS"
-
-#: ../src/mb-menu-item.c:68
-msgid "HSDPA"
-msgstr "HSDPA"
-
-#: ../src/mb-menu-item.c:70
-msgid "HSUPA"
-msgstr "HSUPA"
-
-#: ../src/mb-menu-item.c:72
-msgid "HSPA"
-msgstr "HSPA"
-
-#: ../src/mb-menu-item.c:104
-msgid "not enabled"
-msgstr "ସକ୍ରିୟ ହୋଇନାହିଁ"
-
-#: ../src/mb-menu-item.c:110
-msgid "not registered"
-msgstr "ପଞ୍ଜିକୃତ ହୋଇନାହିଁ"
-
-#: ../src/mb-menu-item.c:128
-#, c-format
-msgid "Home network (%s)"
-msgstr "ନିଜସ୍ୱ ନେଟୱର୍କ (%s)"
-
-#: ../src/mb-menu-item.c:130
-#, c-format
-msgid "Home network"
-msgstr "ନିଜସ୍ୱ ନେଟୱର୍କ"
-
-#: ../src/mb-menu-item.c:138
-msgid "searching"
-msgstr "ସନ୍ଧାନ କରୁଅଛି"
-
-#: ../src/mb-menu-item.c:141
-msgid "registration denied"
-msgstr "ପଞ୍ଜିକରଣ ବାରଣ ହୋଇଛି"
-
-#: ../src/mb-menu-item.c:146 ../src/mb-menu-item.c:152
-#, c-format
-msgid "%s (%s roaming)"
-msgstr "%s (%s ରୋମିଙ୍ଗ)"
-
-#: ../src/mb-menu-item.c:148 ../src/mb-menu-item.c:154
-#, c-format
-msgid "%s (roaming)"
-msgstr "%s (ରୋମିଙ୍ଗ)"
-
-#: ../src/mb-menu-item.c:157
-#, c-format
-msgid "Roaming network (%s)"
-msgstr "ରୋମିଙ୍ଗ ନେଟୱର୍କ (%s)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "ସଂଯୋଗ ସୂଚନା"
 
-#: ../src/mb-menu-item.c:159
-#, c-format
-msgid "Roaming network"
-msgstr "ରୋମିଙ୍ଗ ନେଟୱର୍କ"
+#: ../src/info.ui.h:3
+#, fuzzy
+msgid "Active Network Connections"
+msgstr "ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ"
 
-#: ../src/utils/mobile-wizard.c:196
+#: ../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 ""
-"ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ନିମ୍ନଲିଖିତ ସଂରଚନା ଦ୍ୱାରା ବିନ୍ୟାସ କରାଯାଇଛି:"
+msgstr "ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ନିମ୍ନଲିଖିତ ସଂରଚନା ଦ୍ୱାରା ବିନ୍ୟାସ କରାଯାଇଛି:"
 
 #. Device
-#: ../src/utils/mobile-wizard.c:203
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "ଆପଣଙ୍କର ଉପକରଣ:"
 
 #. Provider
-#: ../src/utils/mobile-wizard.c:214
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "ଆପଣଙ୍କର ପ୍ରଦାତା:"
 
 #. Plan and APN
-#: ../src/utils/mobile-wizard.c:225
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "ଆପଣଙ୍କର ଯୋଜନା:"
 
-#: ../src/utils/mobile-wizard.c:246
+#: ../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 "
@@ -2675,279 +3159,633 @@ msgid ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 msgstr ""
-"ଆପଣ ବାଛିଥିବା ସଂରଚନାକୁ ବ୍ୟବହାର କରି ଗୋଟିଏ ସଂଯୋଗକୁ ବର୍ତ୍ତମାନ ଆପଣଙ୍କର ମୋବାଇଲ "
-"ବ୍ରୋଡବ୍ୟାଣ୍ଡ ପ୍ରଦାତାଙ୍କ ସହିତ ସ୍ଥାପନ କରାଯିବ।  ଯଦି ସେହି ସଂଯୋଗଟି ବିଫଳ ହୁଏ "
-"କିମ୍ବା ଯଦି ଆପଣ ନେଟୱର୍କ ଉତ୍ସଗୁଡ଼ିକୁ ଅଭିଗମ୍ୟ କରିନପାରନ୍ତି, ତେବେ ଆପଣଙ୍କ ସଂରଚନାକୁ "
-"ପୁଣିଥରେ ଯାଞ୍ଚ କରନ୍ତୁ।  ଆପମଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସଂରଚନାକୁ ପରିବର୍ତ୍ତନ "
-"କରିବା ପାଇଁ, \"Network Connections\" କୁ ତନ୍ତ୍ର >> ପସନ୍ଦ ତାଲିକାରୁ ବାଛନ୍ତୁ।"
-
-#: ../src/utils/mobile-wizard.c:258
+"ଆପଣ ବାଛିଥିବା ସଂରଚନାକୁ ବ୍ୟବହାର କରି ଗୋଟିଏ ସଂଯୋଗକୁ ବର୍ତ୍ତମାନ ଆପଣଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ "
+"ପ୍ରଦାତାଙ୍କ ସହିତ ସ୍ଥାପନ କରାଯିବ।  ଯଦି ସେହି ସଂଯୋଗଟି ବିଫଳ ହୁଏ କିମ୍ବା ଯଦି ଆପଣ ନେଟୱର୍କ ଉତ୍ସଗୁଡ଼ିକୁ "
+"ଅଭିଗମ୍ୟ କରିନପାରନ୍ତି, ତେବେ ଆପଣଙ୍କ ସଂରଚନାକୁ ପୁଣିଥରେ ଯାଞ୍ଚ କରନ୍ତୁ।  ଆପମଙ୍କର ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ "
+"ସଂଯୋଗ ସଂରଚନାକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ, \"Network Connections\" କୁ ତନ୍ତ୍ର >> ପସନ୍ଦ "
+"ତାଲିକାରୁ ବାଛନ୍ତୁ।"
+
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂରଚନାକୁ ନିଶ୍ଚିତ କରନ୍ତୁ"
 
-#: ../src/utils/mobile-wizard.c:319
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "ତାଲିକାଭୁକ୍ତ ହୋଇନଥିବା"
 
-#: ../src/utils/mobile-wizard.c:437
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "ଆପଣଙ୍କର ଯୋଜନାକୁ ବାଛନ୍ତୁ (_S):"
 
-#: ../src/utils/mobile-wizard.c:461
+#: ../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/utils/mobile-wizard.c:480
+#: ../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"
 "\n"
-"ଯଦି ଆପଣ ଆପଣଙ୍କ ଯୋଜନା ବିଷୟରେ ନିଶ୍ଚିତ ନୁହଁନ୍ତି ତେବେ ଦୟାକରି ଆପଣଙ୍କ ପ୍ରଦାତାଙ୍କୁ "
-"ଆପଣଙ୍କ ଯୋଜନାର APN ବିଷୟରେ ପଚାରନ୍ତୁ।"
+"ଯଦି ଆପଣ ଆପଣଙ୍କ ଯୋଜନା ବିଷୟରେ ନିଶ୍ଚିତ ନୁହଁନ୍ତି ତେବେ ଦୟାକରି ଆପଣଙ୍କ ପ୍ରଦାତାଙ୍କୁ ଆପଣଙ୍କ ଯୋଜନାର "
+"APN ବିଷୟରେ ପଚାରନ୍ତୁ।"
 
-#: ../src/utils/mobile-wizard.c:487
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "ଆପଣଙ୍କର ବିଲିଙ୍ଗ ଯୋଜନା ବାଛନ୍ତୁ"
 
-#: ../src/utils/mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "ମୋର ଯୋଜନା ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ..."
 
-#: ../src/utils/mobile-wizard.c:688
+#: ../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/utils/mobile-wizard.c:701
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ପ୍ରଦାତା"
 
-#: ../src/utils/mobile-wizard.c:726
+#: ../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):"
+msgstr "ମୁଁ ମୋର ପ୍ରଦାତାଙ୍କୁ ପାଇଲି ନାହିଁ ଏବଂ ମୁ ଏହାକୁ ହସ୍ତକୃତ ଭାବରେ ଭରଣ କରିବାକୁ ଚାହୁଁଛି (_m):"
 
-#: ../src/utils/mobile-wizard.c:737
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "ପ୍ରଦାତା:"
 
-#: ../src/utils/mobile-wizard.c:753
+#: ../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)"
+msgstr "ମୋର ପ୍ରଦାତା GSM ପ୍ରଯୁକ୍ତିଜ୍ଞାନ ବ୍ୟବହାର କରିଥାଏ (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/utils/mobile-wizard.c:755
+#: ../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/utils/mobile-wizard.c:766
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "ଆପଣଙ୍କର ପ୍ରଦାତାଙ୍କୁ ବାଛନ୍ତୁ"
 
-#: ../src/utils/mobile-wizard.c:1012
-msgid "Country List:"
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
+#, fuzzy
+msgid "Country or Region List:"
 msgstr "ଦେଶ ତାଲିକା:"
 
-#: ../src/utils/mobile-wizard.c:1024
-msgid "Country"
-msgstr "ଦେଶ"
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
+#, fuzzy
+msgid "Country or region"
+msgstr "ଦେଶ ତାଲିକା:"
 
-#: ../src/utils/mobile-wizard.c:1031
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "ମୋର ଦେଶ ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ"
 
-#: ../src/utils/mobile-wizard.c:1077
-msgid "Choose your Provider's Country"
+#: ../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/utils/mobile-wizard.c:1126
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ସ୍ଥାପିତ GSM ଉପକରଣ"
 
-#: ../src/utils/mobile-wizard.c:1129
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ସ୍ଥାପିତ CDMA ଉପକରଣ"
 
-#: ../src/utils/mobile-wizard.c:1297
+#: ../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 ""
-"ସହାୟକ ଆପଣଙ୍କୁ ସହଜରେ ଗୋଟିଏ ସେଲ୍ୟୁଲାର (3G) ନେଟୱର୍କ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ "
-"ସ୍ଥାପନ କରିବାରେ ସାହାଯ୍ୟ କରିବେ।"
+"ସହାୟକ ଆପଣଙ୍କୁ ସହଜରେ ଗୋଟିଏ ସେଲ୍ୟୁଲାର (3G) ନେଟୱର୍କ ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସ୍ଥାପନ "
+"କରିବାରେ ସାହାଯ୍ୟ କରିବେ।"
 
-#: ../src/utils/mobile-wizard.c:1302
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "ଆପଣ ନିମ୍ନଲିଖିତ ସୂଚନା ଆବଶ୍ୟକ କରିବେ:"
 
-#: ../src/utils/mobile-wizard.c:1313
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ପ୍ରଦାତାଙ୍କ ନାମ"
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ବିଲିଙ୍ଗ ଯୋଜନା ନାମ"
 
-#: ../src/utils/mobile-wizard.c:1325
+#: ../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 (ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ "
-"ନାମ)"
+msgstr "(କିଛି ପରିସ୍ଥିତିରେ) ଆପଣଙ୍କର ବ୍ରୋଡବ୍ୟାଣ୍ଡ ବିଲିଙ୍ଗ ଯୋଜନା APN (ଅଭିଗମ୍ୟତା ବିନ୍ଦୁ ନାମ)"
 
-#: ../src/utils/mobile-wizard.c:1352
+#: ../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 "ଏହି ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ଉପକରଣ ପାଇଁ ଗୋଟିଏ ସଂଯୋଗ ନିର୍ମାଣ କରନ୍ତୁ (_t)"
 
-#: ../src/utils/mobile-wizard.c:1367
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "କୌଣସି ଉପଦେଶ ଅଛି କି"
 
-#: ../src/utils/mobile-wizard.c:1380
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସ୍ଥାପନ କରନ୍ତୁ"
 
-#: ../src/utils/mobile-wizard.c:1554
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "ନୂତନ ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ"
 
-#: ../src/utils/nmn-mobile-providers.c:76
-msgid "United Kingdom"
-msgstr "ୟୁନାଇଟେଡ କିଙ୍ଗଡମ"
+#: ../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/utils/nmn-mobile-providers.c:508
-msgid "Default"
-msgstr "ପୂର୍ବନିର୍ଦ୍ଧାରିତ"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/utils/utils.c:218
-msgid "Bridge"
-msgstr "ବ୍ରିଜ"
+#: ../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/vpn-password-dialog.c:141 ../src/vpn-password-dialog.c:268
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "VPN ସଂଯୋଗ '%s' କୁ ଆରମ୍ଭ କରିପାରିବେ ନାହିଁ"
+#: ../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/vpn-password-dialog.c:144
-#, c-format
-msgid ""
-"Could not find the authentication dialog for VPN connection type '%s'. "
-"Contact your system administrator."
-msgstr ""
-"'%s' ପ୍ରକାରର VPN ସଂଯୋଗ ପାଇଁ ବୈଧିକରଣ ସଂଳାପ ପାଇଲା ନାହିଁ।ଆପଣଙ୍କର ତନ୍ତ୍ର "
-"ପ୍ରଶାସକଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ।"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
 
-#: ../src/vpn-password-dialog.c:271
-#, c-format
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_P):"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "ପ୍ରବେଶ ସଂକେତ ଦର୍ଶାନ୍ତୁ (_w)"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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 ""
-"There was a problem launching the authentication dialog for VPN connection "
-"type '%s'. Contact your system administrator."
+"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 ""
-"'%s' ପ୍ରକାରର VPN ସଂଯୋଗ ପାଇଁ ବୈଧିକରଣ ସଂଳାପ ଆରମ୍ଭ କରିବାରେ ସମସ୍ୟା ଦେଖାଦେଇଛି। "
-"ଆପଣଙ୍କର ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ।"
 
-#: ../src/wired-dialog.c:100
-msgid "Wired 802.1X authentication"
-msgstr "ତାରଯୁକ୍ତ 802.1X ବୈଧିକରଣ"
-
-#: ../src/wireless-dialog.c:469
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "ନୂତନ..."
 
-#: ../src/wireless-dialog.c:1089
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "କିଛି ନୁହେଁ"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "ସୃଷ୍ଟି କରନ୍ତୁ (_r)"
 
-#: ../src/wireless-dialog.c:1170
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
-msgstr ""
-"ବେତାର ନେଟୱର୍କ '%s' କୁ ଅଭିଗମ୍ୟ କରିବା ପାଇଁ ପ୍ରବେଶ ସଂକେତ କିମ୍ବା ସଂଗୁପ୍ତ "
-"କିଗୁଡ଼ିକ ଆବଶ୍ୟକ।"
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr "ବେତାର ନେଟୱର୍କ '%s' କୁ ଅଭିଗମ୍ୟ କରିବା ପାଇଁ ପ୍ରବେଶ ସଂକେତ କିମ୍ବା ସଂଗୁପ୍ତ କିଗୁଡ଼ିକ ଆବଶ୍ୟକ।"
 
-#: ../src/wireless-dialog.c:1172
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "ବେତାର ନେଟୱର୍କ ବୈଧିକରଣ ଆବଶ୍ୟକ"
 
-#: ../src/wireless-dialog.c:1174
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "ବେତାର ନେଟୱର୍କ ପାଇଁ ପ୍ରାଧିକରଣ ଆବଶ୍ୟକ"
 
-#: ../src/wireless-dialog.c:1179
-msgid "Create New Ad-Hoc Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ ନିର୍ମାଣ କରନ୍ତୁ"
 
-#: ../src/wireless-dialog.c:1181
-msgid "New ad-hoc wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "ନୂତନ ବେତାର ନେଟୱର୍କ"
 
-#: ../src/wireless-dialog.c:1182
-msgid "Enter a name for the wireless network you wish to create."
-msgstr ""
-"ଆପଣ ନିର୍ମାଣ କରିବାକୁ ଚାହୁଁଥିବା ବେତାର ନେଟୱର୍କ ପାଇଁ ଗୋଟିଏ ନାମ ଭରଣ କରନ୍ତୁ।"
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr "ଆପଣ ନିର୍ମାଣ କରିବାକୁ ଚାହୁଁଥିବା ବେତାର ନେଟୱର୍କ ପାଇଁ ଗୋଟିଏ ନାମ ଭରଣ କରନ୍ତୁ।"
 
-#: ../src/wireless-dialog.c:1184
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ ସହିତ ସଂଯୋଗ କରନ୍ତୁ"
 
-#: ../src/wireless-dialog.c:1186
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "ଲୁକ୍କାଇତ ବେତାର ନେଟୱର୍କ"
 
-#: ../src/wireless-dialog.c:1187
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, 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:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ସୁରକ୍ଷା (_S):"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#, fuzzy
+msgid "C_onnection:"
+msgstr "ସଂଯୋଗ (_n):"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "ବେତାର ଏଡପ୍ଟର (_a):"
+
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr "ବ୍ୟବହାର ବିଧି:"
+
+#: ../src/main.c:44
+#, fuzzy
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+"ଏହି ପ୍ରଗ୍ରାମଟି NetworkManager ର ଗୋଟିଏ ଉପାଦାନ (http://projects.gnome.org/"
+"NetworkManager)."
+
+#: ../src/main.c:45
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
 msgstr ""
-"ଆପଣ ସଂଯୋଗ ସ୍ଥାପନ କରିବାକୁ ଚାହୁଁଥିବା ଲୁକ୍କାୟିତ ବେତାର ନେଟୱର୍କର ନାମ ଏବଂ ସୁରକ୍ଷା "
-"ବିବରଣୀଗୁଡ଼ିକୁ ଭରଣ କରନ୍ତୁ।"
+"ନିର୍ଦ୍ଦେଶ-ନାମା କାର୍ଯକଳାପ ପାଇଁ ଏହା ଇଚ୍ଛୁକ ନୁହଁ କିନ୍ତୁ ଏହା ପରିବର୍ତ୍ତେGNOME ଡେସ୍କଟପ ପରିବେଶରେ "
+"ଚାଲିଥାଏ।"
+
+#: ../src/mb-menu-item.c:52
+msgid "EVDO"
+msgstr "EVDO"
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr "GPRS"
 
-#: ../src/wireless-security/eap-method.c:440
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr "EDGE"
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr "UMTS"
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr "HSDPA"
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr "HSUPA"
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr "ସକ୍ରିୟ ହୋଇନାହିଁ"
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr "ପଞ୍ଜିକୃତ ହୋଇନାହିଁ"
+
+#: ../src/mb-menu-item.c:141
+#, c-format
+msgid "Home network (%s)"
+msgstr "ନିଜସ୍ୱ ନେଟୱର୍କ (%s)"
+
+#: ../src/mb-menu-item.c:143
+#, c-format
+msgid "Home network"
+msgstr "ନିଜସ୍ୱ ନେଟୱର୍କ"
+
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr "ସନ୍ଧାନ କରୁଅଛି"
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr "ପଞ୍ଜିକରଣ ବାରଣ ହୋଇଛି"
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr "%s (ରୋମିଙ୍ଗ)"
+
+#: ../src/mb-menu-item.c:170
+#, c-format
+msgid "Roaming network (%s)"
+msgstr "ରୋମିଙ୍ଗ ନେଟୱର୍କ (%s)"
+
+#: ../src/mb-menu-item.c:172
+#, c-format
+msgid "Roaming network"
+msgstr "ରୋମିଙ୍ଗ ନେଟୱର୍କ"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "PIN ସଂକେତ ଆବଶ୍ୟକ"
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣ ପାଇଁ PIN ସଂକେତ ଆବଶ୍ୟକ"
+
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "ରୋମିଙ୍ଗ"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "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/wireless-security/eap-method.c:452
+#, 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER କିମ୍ବା PEM ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:260
-#: ../src/wireless-security/eap-method-peap.c:290
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:398
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "ଗୋଟିଏ PAC ଫାଇଲ ଚୟନ କରନ୍ତୁ..."
 
-#: ../src/wireless-security/eap-method-fast.c:405
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC ଫାଇଲଗୁଡ଼ିକ (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:409
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "ସମସ୍ତ ଫାଇଲଗୁଡ଼ିକ"
 
-#: ../src/wireless-security/eap-method-peap.c:274
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "ଅଜଣା ପରିଚୟ (_m):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "ବୈଧିକରଣ (_A):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
+msgstr "ଅଜଣା ପରିଚୟ (_m):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+#, fuzzy
+msgid "PAC _file:"
+msgstr "PAC ଫାଇଲ (_P):"
+
+#: ../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
+#, fuzzy
+msgid "_Inner authentication:"
+msgstr "ଆଭ୍ୟନ୍ତରୀଣ ବୈଧିକରଣ (_n):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+#, fuzzy
+msgid "Allow automatic PAC pro_visioning"
+msgstr "ସ୍ୱୟଂଚାଳିତ PAC ସୁବିଧାକୁ ଅନୁମତି ଦିଅନ୍ତୁ (_A)"
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:369
-#: ../src/wireless-security/eap-method-tls.c:456
-#: ../src/wireless-security/eap-method-ttls.c:368
+#: ../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 "ଗୋଟିଏ ପ୍ରମାଣପତ୍ର ଅଧିକାରୀ ପ୍ରମାଣପତ୍ର ବାଛନ୍ତୁ..."
 
-#: ../src/wireless-security/eap-method-tls.c:272
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr ""
+
+#: ../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 "CA ପ୍ରମାଣ ପତ୍ର (_A):"
+
+#: ../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
+msgid "No CA certificate is _required"
+msgstr "କୌଣସି CA ପ୍ରମାଣ ପତ୍ର ଆବଶ୍ୟକ ନାହିଁ"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#, fuzzy
+msgid "PEAP _version:"
+msgstr "PEAP ସଂସ୍କରଣ (_P):"
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "CA ପ୍ରମାଣ ପତ୍ର (_A):"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "ଅସଂଗୁପ୍ତ ବ୍ୟକ୍ତିଗତ କିଗୁଡ଼ିକ ଅସୁରକ୍ଷିତ ଅଟେ"
 
-#: ../src/wireless-security/eap-method-tls.c:275
+#: ../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 "
@@ -2955,41 +3793,538 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"ବଚ୍ଛିତ ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ ଦ୍ୱାରା ସୁରକ୍ଷିତ ଥିବା ପରି ଦୃଶ୍ୟମାନ "
-"ହେଉନାହିଁ।ଏହା ଆପଣଙ୍କର ସୁରକ୍ଷା ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକୁ ସଙ୍କଟରେ ପକାଇବା ପାଇଁ ଅନୁମତି "
-"ଦେଇଥାଏ।  ଦୟାକରି ଗୋଟିଏ ପ୍ରବେଶ ସଂକେତ-ସୁରକ୍ଷିତ ବ୍ୟକ୍ତିଗତ କି ବାଛନ୍ତୁ।\n"
+"ବଚ୍ଛିତ ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ ଦ୍ୱାରା ସୁରକ୍ଷିତ ଥିବା ପରି ଦୃଶ୍ୟମାନ ହେଉନାହିଁ।ଏହା ଆପଣଙ୍କର ସୁରକ୍ଷା "
+"ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକୁ ସଙ୍କଟରେ ପକାଇବା ପାଇଁ ଅନୁମତି ଦେଇଥାଏ।  ଦୟାକରି ଗୋଟିଏ ପ୍ରବେଶ ସଂକେତ-ସୁରକ୍ଷିତ "
+"ବ୍ୟକ୍ତିଗତ କି ବାଛନ୍ତୁ।\n"
 "\n"
 "(ଆପଣ ଆପମଙ୍କର ବ୍ୟକିତଗତ କିକୁ openssl ଦ୍ୱାରା ପ୍ରବେଶ ସଂକେତ-ପ୍ରତିରୋଧିତ କରିପାରିବେ)"
 
-#: ../src/wireless-security/eap-method-tls.c:450
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ ପ୍ରମାଣପତ୍ରକୁ ବାଛନ୍ତୁ..."
 
-#: ../src/wireless-security/eap-method-tls.c:462
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "ଆପଣଙ୍କର ବ୍ୟକ୍ତିଗତ କିକୁ ବାଛନ୍ତୁ..."
 
-#: ../src/wireless-security/wireless-security.c:406
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity:"
+msgstr "ପରିଚୟ (_d):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "ଚାଳକ ପ୍ରମାଣପତ୍ର (_U):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "Private _key:"
+msgstr "ବ୍ୟକ୍ତିଗତ କି (_k):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_Private key password:"
+msgstr "ବ୍ୟକ୍ତିଗତ କି ପ୍ରବେଶ ସଂକେତ (_P):"
+
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "ତୀବ୍ର"
 
-#: ../src/wireless-security/wireless-security.c:441
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "ଟନେଲଯୁକ୍ତ TLS"
 
-#: ../src/wireless-security/wireless-security.c:452
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "ସୁରକ୍ଷିତ EAP (PEAP)"
 
-#: ../src/wireless-security/wireless-security.c:593
-msgid "WPA Only"
-msgstr "କେବଳ WPA"
+#: ../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
+#, fuzzy
+msgid "Au_thentication:"
+msgstr "ବୈଧିକରଣ (_A):"
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
+#, fuzzy
+msgid "Open System"
+msgstr ""
+"ଖୋଲା ତନ୍ତ୍ର\n"
+"ସହଭାଗୀ କି"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+#, fuzzy
+msgid "Shared Key"
+msgstr ""
+"ଖୋଲା ତନ୍ତ୍ର\n"
+"ସହଭାଗୀ କି"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "କି (_K):"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr "କି ଦର୍ଶାନ୍ତୁ (_w)"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x:"
+msgstr "WEP ଅନୁକ୍ରମଣିକା (_x):"
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "ପ୍ରକାର (_T):"
+
+#~ msgid "Show WPA protocol chooser widget"
+#~ msgstr "WPA ପ୍ରୋଟୋକଲ ଚୟନକର୍ତ୍ତା ୱିଜେଟ୍‌କୁ ଦର୍ଶାନ୍ତୁ"
+
+#~ msgid ""
+#~ "Set to TRUE to show the WPA protocol chooser when editing connections."
+#~ msgstr ""
+#~ "ସଂଯୋଗଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରିବା ସମୟରେ WPA ପ୍ରୋଟୋକଲ ଚୟନକର୍ତ୍ତାକୁ ଦର୍ଶାଇବା ପାଇଁ TRUE ସେଟ "
+#~ "କରନ୍ତୁ।"
+
+#~ msgid "An instance of nm-applet is already running.\n"
+#~ msgstr "nm-applet ର ଗୋଟିଏ ଦୃଷ୍ଟାନ୍ତ ପୂର୍ବରୁ ଚାଲୁଅଛି।\n"
+
+#~ msgid "Could not acquire the %s service. (%d)\n"
+#~ msgstr "%s ସର୍ଭିସକୁ ଅଧିକାର କରିପାରିଲା ନାହିଁ। (%d)\n"
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "ବନ୍ଧନ ସଂଯୋଗ '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "ବନ୍ଧନ ସଂଯୋଗ ସଂରଚନା କରୁଅଛି '%s'..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "ବନ୍ଧନ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "'%s' ପାଇଁ ଠିକଣା ଅନୁରୋଧ କରୁଅଛି..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "ବ୍ରିଜ ସଂଯୋଗ '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "ବ୍ରିଜ ସଂଯୋଗ '%s' କୁ ବିନ୍ୟାସ କରୁଅଛି..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "ବ୍ରିଜ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "ନୂତନ ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ (CDMA) ସଂଯୋଗ..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "ଆପଣ ବର୍ତ୍ତମାନ CDMA ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "ନୂତନ ମୋବାଇଲ ବ୍ରୋଡ଼ବ୍ୟାଣ୍ଡ (GSM) ସଂଯୋଗ..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "ଆପମ ବର୍ତ୍ତମାନ GSM ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
+
+#~ msgid "PUK code required"
+#~ msgstr "PUK ସଂକେତ ଆବଶ୍ୟକ"
+
+#~ msgid "PUK code is needed for the mobile broadband device"
+#~ msgstr "ମୋବାଇଲ ବ୍ରୋଡବ୍ୟାଣ୍ଡ ଉପକରଣ ପାଇଁ PUK ସଂକେତ ଆବଶ୍ୟକ"
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "ସ୍ୱୟଂଚାଳିତ ଇନଫିବ୍ୟାଣ୍ଡ"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "ଇନଫିବ୍ୟାଣ୍ଡ ନେଟୱର୍କଗୁଡ଼ିକ (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ନେଟୱର୍କ (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ନେଟୱର୍କଗୁଡ଼ିକ"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ନେଟୱର୍କ"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "ଆପଣ ବର୍ତ୍ତମାନ ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ନେଟୱର୍କ ସହିତ ସଂଯୁକ୍ତ।"
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ପ୍ରସ୍ତୁତ କରୁଅଛି..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ସଂଯୋଗ ସଂରଚନା କରୁଅଛି '%s'..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "ଇନ୍‌ଫିବ୍ୟାଣ୍ଡ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "ଆପଣ ବର୍ତ୍ତମାନ VLAN ସହିତ ସଂଯୁକ୍ତ ଅଛନ୍ତି।"
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "VLAN ସଂଯୋଗ ଆରମ୍ଭ କରୁଅଛି '%s'..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "VLAN ସଂଯୋଗ ଆରମ୍ଭ କରୁଅଛି '%s'..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "VLAN ସଂଯୋଗ '%s' ପାଇଁ ଚାଳକ ବୈଧିକରଣ ଆବଶ୍ୟକ..."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "ବେତାର ନେଟୱର୍କଗୁଡ଼ିକ (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "ବେତାର ନେଟୱର୍କ (%s)"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' ପାଇଁ ପ୍ରସ୍ତୁତ କରୁଅଛି..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' କୁ ବିନ୍ୟାସ କରୁଅଛି..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "'%s' ପାଇଁ ଗୋଟିଏ ବେତାର ନେଟୱର୍କ ଠିକଣା ପାଇବା ପାଇଁ ଅନୁରୋଧ କରୁଅଛି..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "ବେତାର ନେଟୱର୍କ ସଂଯୋଗ '%s' ସକ୍ରିୟ ଅଛି"
+
+#~ msgctxt "No wired security used"
+#~ msgid "None"
+#~ msgstr "କିଛି ନୁହେଁ"
+
+#~ msgctxt "Unknown/unrecognized wired or wifi security"
+#~ msgid "Unknown"
+#~ msgstr "ଅଜଣା"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "ଦ୍ବିତୀୟକ DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "ତୃତୀୟ DNS:"
+
+#~ msgid "translator-credits"
+#~ msgstr "ମନୋଜ କୁମାର ଗିରି <mgiri@redhat.com>"
+
+#~ msgid "_Help"
+#~ msgstr "ସହାୟତା (_H)"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "ଅନ୍ୟାନ୍ୟ ବେତାର ନେଟୱର୍କ..."
+
+#~ msgid "_Wireless security:"
+#~ msgstr "ବେତାର ସୁରକ୍ଷା (_W):"
+
+#~ msgid ""
+#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+#~ msgstr "<span size=\"larger\" weight=\"bold\">ସକ୍ରିୟ ନେଟୱର୍କ ସଂଯୋଗଗୁଡ଼ିକ</span>"
+
+#~ msgid "WPA Protocol:"
+#~ msgstr "WPA ପ୍ରୋଟୋକଲ:"
+
+#~ msgid ""
+#~ "Anonymous\n"
+#~ "Authenticated\n"
+#~ "Both"
+#~ msgstr ""
+#~ "ଅଜ୍ଞାତ\n"
+#~ "ବୈଧିକୃତ\n"
+#~ "ଉଭୟ"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Version 0\n"
+#~ "Version 1"
+#~ msgstr ""
+#~ "ସ୍ୱୟଂଚାଳିତ\n"
+#~ "ସଂସ୍କରଣ 0\n"
+#~ "ସଂସ୍କରଣ 1"
+
+#~ msgid "label"
+#~ msgstr "ନାମପଟି"
+
+#~ msgid "Show it"
+#~ msgstr "ଏହାକୁ ଦର୍ଶାନ୍ତୁ"
+
+#~ msgid "_Mode:"
+#~ msgstr "ଧାରା (_M):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "ଉପକରଣ MAC ଠିକଣା (_D):"
+
+#~ msgid "<b>Addresses</b>"
+#~ msgstr "<b>ଠିକଣାଗୁଡ଼ିକ</b>"
+
+#~ msgid "_Routes&#x2026;"
+#~ msgstr "_Routes&#x2026;"
+
+#~ msgid "Any"
+#~ msgstr "ଯେକୌଣସି"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA) କୁ ପସନ୍ଦ କରିଥାଏ"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE) କୁ ପସନ୍ଦ କରିଥାଏ"
+
+#~ msgid "<b>Basic</b>"
+#~ msgstr "<b>ମୌଳିକ</b>"
+
+#~ msgid "PI_N:"
+#~ msgstr "PIN (_N):"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>ବୈଧିକରଣ</b>"
+
+#~ msgid "<b>Echo</b>"
+#~ msgstr "<b>ପ୍ରତିଧ୍ୱନି</b>"
+
+#~ msgid "MT_U:"
+#~ msgstr "MTU (_U):"
+
+#~ msgid "Infrastructure"
+#~ msgstr "ଅବସଂରଚନା"
+
+#~ msgid "_SSID:"
+#~ msgstr "SSID (_S):"
+
+#~ msgid "Wireless"
+#~ msgstr "ବେତାର"
+
+#~ msgid ""
+#~ "Select the type of connection that will be used for the slaves of this "
+#~ "bond."
+#~ msgstr "ଏହି ବନ୍ଧନର ସ୍ୱେଭଗୁଡ଼ିକରେ ବ୍ୟବହାର ହେବାକୁ ଥିବା ସଂଯୋଗଗୁଡ଼ିକର ପ୍ରକାରକୁ ବାଛନ୍ତୁ।"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "ସ୍ୱୟଂଚାଳିତ (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "କେବଳ ସ୍ୱୟଂଚାଳିତ (PPP) ଠିକଣାଗୁଡ଼ିକ"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "ବେତାର ସଂଯୋଗ %d"
+
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the "
+#~ "NetworkManager applet .glade file was not found)."
+#~ msgstr ""
+#~ "ସଂଯୋଗ ସମ୍ପାଦକ କିଛି ଆବଶ୍ୟକୀୟ ଉତ୍ସ ପାଇଲା ନାହିଁ (NetworkManager ଆପଲେଟ .glade  ଫାଇଲ "
+#~ "ମିଳିଲା ନାହିଁ)।"
+
+#~ msgid ""
+#~ "Support for bond, bridge, and VLAN interfaces must be enabled by setting "
+#~ "the NM_BOND_BRIDGE_VLAN_ENABLED key to 'yes' in <tt>/etc/sysconfig/"
+#~ "network</tt>:\n"
+#~ "\n"
+#~ "\t<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
+#~ "\n"
+#~ "After making this modification, NetworkManager must be restarted to "
+#~ "ensure the new functionality is enabled."
+#~ msgstr ""
+#~ "ବନ୍ଧନ, ବ୍ରିଜ, ଏବଂ VLAN ଅନ୍ତରାପୃଷ୍ଠଗୁଡ଼ିକ ପାଇଁ ସହାୟତାକୁ ନିଶ୍ଚିତ ଭାବରେ "
+#~ "NM_BOND_BRIDGE_VLAN_ENABLED କୁ <tt>/etc/sysconfig/network</tt> ରେ  'yes' "
+#~ "ସେଟ କରି ସକ୍ରିୟ କରିବା ଉଚିତ:\n"
+#~ "\n"
+#~ "\t<tt>NM_BOND_BRIDGE_VLAN_ENABLED=yes</tt>\n"
+#~ "\n"
+#~ "ଏହି ପରିବର୍ତ୍ତନ କରିସାରିବା ପରେ ନୂତନ ପରିବର୍ତ୍ତନଗୁଡ଼ିକ ସକ୍ରିୟ ହୋଇଛି କି ନାହିଁ ନିଶ୍ଚିତ କରିବା ପାଇଁ, "
+#~ "NetworkManager କୁ ନିଶ୍ଚିତ ଭାବରେ ପୁନଃଚାଳନ କରିବା ଉଚିତ।"
+
+#~ msgid "Bridging, bonding, and VLAN functionality not enabled"
+#~ msgstr "ବ୍ରିଜିଙ୍ଗ, ବଣ୍ଡିଙ୍ଗ, ଏବଂ VLAN ଫଳନକୁ ସକ୍ରିୟ କରାଯାଇ ନାହିଁ"
+
+#~ msgid "Apply"
+#~ msgstr "ପ୍ରଯୋଗ କରନ୍ତୁ"
+
+#~ msgid "Apply..."
+#~ msgstr "ପ୍ରୟୋଗ କରନ୍ତୁ..."
+
+#~ msgid "Bonding, bridging, and VLANs are disabled in NetworkManager."
+#~ msgstr "ବଣ୍ଡିଙ୍ଗ, ବ୍ରିଜିଙ୍ଗ, ଏବଂ VLANs କୁ  NetworkManaer ରେ ନିଷ୍କ୍ରିୟ କରାଯାଇଛି।"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "ଗୁଣଧର୍ମ '%s' / '%s' ଅବୈଧ: %d"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "ସ୍ୱୟଂଚାଳିତ ଭାବରେ ସଂଯୁକ୍ତ (_a)"
+
+#~ msgid "Available to all users"
+#~ msgstr "ସମସ୍ତ ଚାଳକ ମାନଙ୍କ ପାଇଁ ଉପଲବ୍ଧ"
+
+#~ msgid "Edit"
+#~ msgstr "ସମ୍ପାଦନ କରନ୍ତୁ"
+
+#~ msgid "Edit..."
+#~ msgstr "ସମ୍ପାଦନ କରନ୍ତୁ..."
+
+#~ msgid "Delete"
+#~ msgstr "ବିଲୋପ କରନ୍ତୁ"
+
+#~ msgid "Delete..."
+#~ msgstr "ବିଲୋପ କରନ୍ତୁ..."
+
+#~ msgid "Error: %s"
+#~ msgstr "ତ୍ରୁଟି: %s"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "ମୋବାଇଲ ୱିଜାର୍ଡ ବାତିଲ ହୋଇଛି"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "ଅଜଣା ଫୋନ ଉପକରଣ ପ୍ରକାର (GSM କିମ୍ବା CDMA ନୁହଁ)"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "ଆପଣଙ୍କର ଫୋନ ବର୍ତ୍ତମାନ ବ୍ୟବହାର ପାଇଁ ପ୍ରସ୍ତୁତ!"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "ଫୋନ ସହିତ ସହିତ ସଂଯୋଗ ହେବାରେ ବିଫଳ।"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ଅପ୍ରତ୍ୟାଶିତ ଭାବରେ ଫୋନରୁ ସଂଯୋଗ ବିଚ୍ଛିନ୍ନ ହୋଇଛି।"
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "ଫୋନ ବିବରଣୀ ପାଇସାରିବା ପରେ ସମୟ ସମାପ୍ତ ହୋଇଛି।"
+
+#~ msgid "could not connect to the system bus."
+#~ msgstr "ତନ୍ତ୍ର ବସ ସହିତ ସଂଯୋଗ ସ୍ଥାପନ କରିପାରିଲା ନାହିଁ।"
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "ଫୋନ ସଂରଚନାକୁ ଯାଞ୍ଚ କରୁଅଛି..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "ପୂର୍ବନିର୍ଦ୍ଧାରିତ ବ୍ଲୁଟୁଥ ଏଡ଼ପଟର ନିଶ୍ଚିତ ଭାବରେ ଗୋଟିଏ ଡାଏଲ-ଅପ-ନେଟୱର୍କିଙ୍ଗ ସଂଯୋଗ ସ୍ଥାପନ କରିବା "
+#~ "ପୂର୍ବରୁ ସକ୍ରିୟ ହେବା ଉଚିତ।"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr "ବ୍ଲୁଟୁଥ ସଂରଚନା ସମ୍ଭବ ନୁହଁ (D-Bus ସହିତ ସଂଯୋଗ ହେବାରେ ବିଫଳ: %s)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "ବ୍ଲୁଟୁଥ ସଂରଚନା ସମ୍ଭବ ନୁହଁ (D-Bus ପ୍ରକ୍ସି ନିର୍ମାଣ କରିବାରେ ବିଫଳ)।"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr "ବ୍ଲୁଟୁଥ ସଂରଚନା ସମ୍ଭବ ନୁହଁ (NetworkManager କୁ ଖୋଜି ପାଇବାରେ ବିଫଳ : %s)।"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "ଆପଣଙ୍କର ମୋବାଇଲ ଫୋନକୁ ନେଟୱର୍କ ଉପକରଣ ଭାବରେ ବ୍ୟବହାର କରନ୍ତୁ (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "ଆପମଙ୍କର ମୋବାଇଲ ଫୋନ ବ୍ଯବହାର କରି ଇଣ୍ଟର୍ନେଟ ସୁବିଧାକୁ ଉପଲବ୍ଧ କରନ୍ତୁ (DUN)"
+
+#~ msgid "Country"
+#~ msgstr "ଦେଶ"
+
+#~ msgid "United Kingdom"
+#~ msgstr "ୟୁନାଇଟେଡ କିଙ୍ଗଡମ"
+
+#~ msgid "Cannot start VPN connection '%s'"
+#~ msgstr "VPN ସଂଯୋଗ '%s' କୁ ଆରମ୍ଭ କରିପାରିବେ ନାହିଁ"
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "'%s' ପ୍ରକାରର VPN ସଂଯୋଗ ପାଇଁ ବୈଧିକରଣ ସଂଳାପ ପାଇଲା ନାହିଁ।ଆପଣଙ୍କର ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ "
+#~ "ଯୋଗାଯୋଗ କରନ୍ତୁ।"
+
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "'%s' ପ୍ରକାରର VPN ସଂଯୋଗ ପାଇଁ ବୈଧିକରଣ ସଂଳାପ ଆରମ୍ଭ କରିବାରେ ସମସ୍ୟା ଦେଖାଦେଇଛି। ଆପଣଙ୍କର "
+#~ "ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ।"
 
-#: ../src/wireless-security/wireless-security.c:602
-msgid "WPA2/RSN Only"
-msgstr "କେବଳ WPA2/RSN"
+#~ msgid "WPA Only"
+#~ msgstr "କେବଳ WPA"
 
+#~ msgid "WPA2/RSN Only"
+#~ msgstr "କେବଳ WPA2/RSN"
diff --git a/po/pa.po b/po/pa.po
index a9d77ff0..476fc37a 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-09-21 06:21+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-09-21 09:05-0500\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
@@ -19,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "ਨੈੱਟਵਰਕ"
 
@@ -42,9 +41,7 @@ msgstr "ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ �
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
 msgid "Set this to true to disable notifications when connecting to a network."
-msgstr ""
-"ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਆਯੋਗ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ "
-"ਸੈਟ ਕਰੋ।"
+msgstr "ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਆਯੋਗ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
@@ -53,9 +50,7 @@ msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਨੋਟੀਫਿਕੇ�
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
-msgstr ""
-"ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਡਿਸ-ਕੁਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਆਯੋਗ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ "
-"ਸੱਚ ਸੈਟ ਕਰੋ।"
+msgstr "ਜੇ ਨੈੱਟਵਰਕ ਨਾਲ ਡਿਸ-ਕੁਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਆਯੋਗ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
 msgid "Disable VPN notifications"
@@ -66,8 +61,7 @@ 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
@@ -77,9 +71,7 @@ msgstr "ਨੈੱਟਵਰਕ ਉਪਲੱਬਧਤਾ ਸੂਚਨਾ ਨਾ �
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
-msgstr ""
-"ਜੇ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਆਯੋਗ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ "
-"ਸੱਚ ਸੈਟ ਕਰੋ।"
+msgstr "ਜੇ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਹੋਣ ਦੇ ਦੌਰਾਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਆਯੋਗ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਸੱਚ ਸੈਟ ਕਰੋ।"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
@@ -87,8 +79,7 @@ msgstr "ਸਟੈਂਪ"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:10
 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 WiFi Create"
@@ -97,8 +88,7 @@ msgstr "ਵਾਈ-ਫਾਈ ਬਣਾਉਣਾ ਆਯੋਗ ਕਰੋ"
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
 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
 msgid "Show the applet in notification area"
@@ -117,8 +107,7 @@ 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
@@ -126,50 +115,93 @@ msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
-"ਇਸ ਨੂੰ ਸੱਚ (ture) ਕਰੋ, ਜੇ EAP ਪਰਮਾਣਕਿਤਾ ਦੇ ਦੂਜੇ ਪੜਾਅ ਵਿੱਚ CA ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ "
-"ਚੇਤਾਵਨੀਆਂ ਬੰਦ "
+"ਇਸ ਨੂੰ ਸੱਚ (ture) ਕਰੋ, ਜੇ EAP ਪਰਮਾਣਕਿਤਾ ਦੇ ਦੂਜੇ ਪੜਾਅ ਵਿੱਚ CA ਸਰਟੀਫਿਕੇਟ ਬਾਰੇ ਚੇਤਾਵਨੀਆਂ ਬੰਦ "
 "ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X ਪਰਮਾਣਕਿਤਾ"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "ਕੁਨੈਕਸ਼ਨ(_o)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "ਨੈੱਟਵਰਕ ਨਾਂ(_N):"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "ਐਡ-ਹਾਕ"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਜੋੜਨ/ਐਕਟੀਵੇਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "ਅਣਜਾਣ ਗਲਤੀ"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "ਜੰਤਰ ਡਿਸ-ਕੁਨੈਕਟ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਸਰਗਰਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "ਇਹ ਸੁਨੇਹਾ ਮੁੜ ਨਾ ਵੇਖਾਓ"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -179,7 +211,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਵਿਚੇ ਰੋਕਿਆ ਗਿਆ।"
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -188,7 +220,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ VPN ਸਰਵਿਸ ਅਚਾਨਕ ਰੁਕ ਗਈ।"
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -198,7 +230,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ VPN ਸਰਵਿਸ ਨੇ ਅਢੁੱਕਵੀਂ ਸੰਰਚਨਾ ਦਿੱਤੀ।"
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -207,7 +239,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ ਕੁਨੈਕਸ਼ਨ ਕੋਸ਼ਿਸ਼ ਲਈ ਸਮਾਂ ਸਮਾਪਤ ਹੋਇਆ।"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -216,7 +248,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ VPN ਸਰਵਿਸ ਸਮੇਂ ਸਿਰ ਸ਼ੁਰੂ ਨਹੀਂ ਹੋਈ।"
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -225,7 +257,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ VPN ਸਰਵਿਸ ਸ਼ੁਰੂ ਹੋਣ ਲਈ ਫੇਲ੍ਹ ਹੋਈ।"
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -234,7 +266,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ ਕੋਈ ਢੁੱਕਵੇਂ VPN ਸੀਕਰਟ ਨਹੀਂ ਸਨ"
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -243,7 +275,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਫੇਲ੍ਹ ਹੋਇਆ, ਕਿਉਂਕਿ ਅਢੁੱਕਵੇਂ VPN ਸੀਕਰਟ ਸਨ।"
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -252,7 +284,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਫੇਲ੍ਹ ਹੋਇਆ।"
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -262,7 +294,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਡਿਸ-ਕੁਨੈਕਟ ਹੋਇਆ, ਕਿਉਂਕਿ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਰੁਕ ਗਿਆ।"
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -271,7 +303,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਡਿਸ-ਕੁਨੈਕਟ ਹੋਇਆ, ਕਿਉਂਕਿ VPN ਸਰਵਿਸ ਰੁਕ ਗਈ।"
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -280,7 +312,7 @@ msgstr ""
 "\n"
 "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਡਿਸ-ਕੁਨੈਕਟ ਹੋਇਆ।"
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -291,19 +323,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਠੀਕ ਤਰ੍ਹਾਂ ਬਣਾਇਆ ਗਿਆ ਹੈ।\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN ਲਾਗਇਨ ਸੁਨੇਹਾ"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -316,7 +348,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -329,799 +361,545 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "ਜੰਤਰ ਤਿਆਰ ਨਹੀਂ ਹੈ (ਫਿਰਮਵੇਅਰ ਗੁੰਮ ਹੈ)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "ਜੰਤਰ ਤਿਆਰ ਨਹੀਂ ਹੈ"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਹੈ"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਕਰੋ"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "ਜੰਤਰ ਪਰਬੰਧ ਅਧੀਨ ਨਹੀਂ ਹੈ"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "ਕੋਈ ਨੈੱਟਵਰਕ ਜੰਤਰ ਨਹੀਂ ਉਪਲੱਬਧ ਹੈ"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN ਕੁਨੈਕਸ਼ਨ"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "VPN ਸੰਰਚਨਾ(_C)..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "VPN ਡਿਸ-ਕੁਨੈਕਟ ਕਰੋ(_D)"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਆਯੋਗ ਹੈ"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "ਨੈੱਟਵਰਕਿੰਗ ਚਾਲੂ(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "ਵਾਈ-ਫਾਈ ਚਾਲੂ(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਚਾਲੂ(_M)"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMA_X ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਚਾਲੂ"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਦਿਓ(_o)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "...ਕੁਨੈਕਸ਼ਨ ਸੋਧ"
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "ਮੱਦਦ(_H)"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "ਇਸ ਬਾਰੇ(_A)"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "ਹੁਣ ਤੁਸੀਂ '%s' ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਹੈ"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਡਿਸ-ਕੁਨੈਕਟ ਹੈ।"
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ..."
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' ਲਈ ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ..."
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s' ਲਈ VPN ਐਡਰੈੱਸ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ ਹੈ"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "ਕੋਈ ਨੈਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਐਪਲਿਟ"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "ਉਪਲੱਬਧ"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਗਿਆ"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "ਹੁਣ ਤੁਸੀਂ ਬੌਂਡਡ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "...'%s' ਬੌਂਡ ਕੁਨੈਕਟ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "...'%s' ਬੌਂਡ ਕੁਨੈਕਟ ਸੰਰਚਿਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "...ਬੌਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "...'%s' ਲਈ ਐਡਰੈੱਸ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "ਬੌਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ ਹੈ"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "ਹੁਣ ਤੁਸੀਂ ਬਰਿੱਜ਼ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "...ਬਰਿੱਜ਼ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "...ਬਰਿੱਜ਼ ਕੁਨੈਕਸ਼ਨ '%s' ਨਾਲ ਸੰਰਚਨਾ ਜਾਰੀ"
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "...ਬਰਿੱਜ਼ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "ਬਰਿੱਜ਼ ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ ਹੈ"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "ਗਲਤ PUK ਕੋਡ; ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 msgid "Wrong PIN code; please contact your provider."
 msgstr "ਗਲਤ ਪਿੰਨ ਕੋਡ; ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ ਜੀ।"
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "...ਅਣ-ਲਾਕ ਕੋਡ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "ਉਪਲੱਬਧ"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "...ਨਵਾਂ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ"
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਗਿਆ"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "ਹੁਣ ਤੁਸੀਂ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਨੈੱਟਵਰਕ।"
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "ਹੁਣ ਤੁਸੀਂ ਘਰ ਨੈੱਟਵਰਕ ਨਾਲ ਰਜਿਸਟਰ ਹੋ ਚੁੱਕੇ ਹੋ।"
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "ਹੁਣ ਤੁਸੀਂ ਰੋਮਿੰਗ (roaming) ਨੈੱਟਵਰਕ ਨਾਲ ਰਜਿਸਟਰ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "ਹੁਣ ਤੁਸੀਂ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਤਿਆਰ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਸੰਰਚਨਾ ਜਾਰੀ..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲਾਜ਼ਮੀ"
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "...ਨਵਾਂ ਆਟੋ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ (CDMA) ਕੁਨੈਕਸ਼ਨ"
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "ਹੁਣ ਤੁਸੀਂ CDMA ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "CDMA ਨੈੱਟਵਰਕ।"
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "ਆਟੋ ਈਥਰਨੈੱਟ"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "ਹੁਣ ਤੁਸੀਂ ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਤਿਆਰੀ..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ '%s' ਨਾਲ ਸੰਰਚਨਾ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ..."
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' ਲਈ ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL ਪਰਮਾਣਕਿਤਾ"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "...ਨਵਾਂ ਆਟੋ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ (GSM) ਕੁਨੈਕਸ਼ਨ"
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "ਹੁਣ ਤੁਸੀਂ GSM ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "GSM ਨੈੱਟਵਰਕ।"
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "ਆਟੋ ਇੰਫੀਬੈਂਡ"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "ਇੰਫੀਬੈਂਡ ਨੈੱਟਵਰਕ (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "ਇੰਫੀਬੈਂਡ ਨੈੱਟਵਰਕ (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "ਇੰਫੀਬੈਂਡ ਨੈੱਟਵਰਕ"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "ਇੰਫੀਬੈਂਡ ਨੈੱਟਵਰਕ"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "ਹੁਣ ਤੁਸੀਂ ਇੰਫੀਬੈਂਡ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "....ਇੰਫੀਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "...ਇੰਫੀਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਨਾਲ ਸੰਰਚਨਾ ਜਾਰੀ"
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "...ਇੰਫੀਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "ਇਫੀਂਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਸਰਗਰਮ ਹੈ"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "ਹੁਣ ਤੁਸੀਂ ਟੀਮਡ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "...ਟੀਮ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "...ਟੀਮ ਕੁਨੈਕਸ਼ਨ '%s' ਨਾਲ ਸੰਰਚਨਾ ਜਾਰੀ"
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "ਟੀਮ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "ਟੀਮ ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ ਹੈ"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "ਹੁਣ ਤੁਸੀਂ VLAN ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "...VLAN ਕੁਨੈਕਸ਼ਨ '%s' ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "...VLAN ਕੁਨੈਕਸ਼ਨ '%s' ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "...VLAN ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VLAN ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ ਹੈ"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "...ਲੁਕਵੇਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ(_C)"
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "....ਨਵਾਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਬਣਾਓ(_N)"
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ਕੋਈ ਨਹੀਂ)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ"
 msgstr[1] "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "ਵਾਈ-ਫਾਈ ਬੰਦ ਹੈ"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "ਵਾਈ-ਫਾਈ ਨੂੰ ਹਾਰਡਵੇਅਰ ਸਵਿੱਚ ਰਾਹੀਂ ਬੰਦ ਕੀਤਾ ਹੈ"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "ਹੋਰ ਨੈੱਟਵਰਕ"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਹੈ"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ਨੈੱਟਵਰਕ ਮੇਨੂ ਨੂੰ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਵਰਤੋਂ"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "ਹੁਣ ਤੁਸੀਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ '%s' ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ '%s' ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ '%s' ਨਾਲ ਸੰਰਚਨਾ ਜਾਰੀ..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "'%s' ਲਈ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਐਡਰੈੱਸ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ '%s' ਸਰਗਰਮ: '%s' (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ '%s' ਸਰਗਰਮ"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਸਰਗਰਮ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਜੋੜਨ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX ਬੰਦ ਹੈ"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX ਨੂੰ ਹਾਰਡਵੇਅਰ ਸਵਿੱਚ ਰਾਹੀਂ ਬੰਦ ਕੀਤਾ ਹੋਇਆ ਹੈ"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "ਹੁਣ ਤੁਸੀਂ WiMAX ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "ਰੋਮਿੰਗ"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ ਵੇਖਾਉਣ ਲਈ ਗਲਤੀ:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "ਡਾਇਨੇਮਕ WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "ਐਡਰੈੱਸ"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (ਡਿਫਾਲਟ)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "ਅਣਜਾਣ"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "ਅਣਜਾਣ"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP ਐਡਰੈੱਸ:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP ਐਡਰੈੱਸ:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "ਬਰਾਡਕਾਸਟ ਐਡਰੈੱਸ:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "ਸਬਨੈੱਟ ਮਾਸਕ:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "ਡਿਫਾਲਟ ਰੂਟ:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "ਸਬਨੈੱਟ ਮਾਸਕ:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ਈਥਰਨੈੱਟ (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "ਇੰਟਰਫੇਸ:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "ਹਾਰਡਵੇਅਰ ਐਡਰੈੱਸ:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ਡਰਾਇਵਰ:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "ਸਪੀਡ:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "ਸੁਰੱਖਿਆ:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "ਡਿਫਾਲਟ ਰੂਟ:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "ਅਣਡਿੱਠਾ"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN ਕਿਸਮ:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN ਗੇਟਵੇ:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN ਯੂਜ਼ਰ ਨਾਂ:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN ਬੈਨਰ:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "ਬੇਸ ਕੁਨੈਕਸ਼ਨ:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "ਕੋਈ ਢੁੱਕਵਾਂ ਐਕਟਿਵ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਲੱਭਿਆ!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1129,131 +907,155 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "ਅਤੇ ਕਈ ਹੋਰ ਕਮਿਊਨਟੀ ਯੋਗਦਾਨੀ ਅਤੇ ਅਨੁਵਾਦਕ"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr ""
-"ਤੁਹਾਡੇ ਨੈਟਵਰਕ ਜੰਤਰਾਂ ਅਤੇ ਕੁਨੈਕਸ਼ਨਾਂ ਦੇ ਪਰਬੰਧ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਏਰੀਆ ਐਪਲਿਟ ਹੈ।"
+msgstr "ਤੁਹਾਡੇ ਨੈਟਵਰਕ ਜੰਤਰਾਂ ਅਤੇ ਕੁਨੈਕਸ਼ਨਾਂ ਦੇ ਪਰਬੰਧ ਲਈ ਨੋਟੀਫਿਕੇਸ਼ਨ ਏਰੀਆ ਐਪਲਿਟ ਹੈ।"
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਵੈੱਬਸਾਈਟ"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "ਗੁੰਮ ਸਰੋਤ"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਨੈੱਟਵਰਕ ਪਾਸਵਰਡ"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੈ। "
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "ਪਾਸਵਰਡ:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "ਸਿਮ PIN ਅਣ-ਲਾਕ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "ਸਿਮ PIN ਅਣ-ਲਾਕ ਲੋੜੀਦਾ ਹੈ"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, 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:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN ਕੋਡ:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "ਪਿੰਨ ਕੋਡ ਵੇਖੋ"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "ਸਿਮ PUK ਅਣ-ਲਾਕ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "ਸਿਮ PUK ਅਣ-ਲਾਕ ਲੋੜੀਦਾ ਹੈ"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, 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:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK ਕੋਡ:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "ਨਵਾਂ ਪਿੰਨ ਕੋਡ:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "ਨਵਾਂ ਪਿੰਨ ਕੋਡ ਫੇਰ ਦਿਓ:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK ਕੋਡ ਵੇਖੋ"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
 msgstr ""
-"IP ਐਡਰੈੱਸ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਪਛਾਣਦਾ ਹੈ। ਇੱਕ IP ਐਡਰੈੱਸ ਸ਼ਾਮਲ ਕਰਨ "
-"ਲਈ \"ਸ਼ਾਮਲ\" "
+"IP ਐਡਰੈੱਸ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਨੂੰ ਨੈੱਟਵਰਕ ਉੱਤੇ ਪਛਾਣਦਾ ਹੈ। ਇੱਕ IP ਐਡਰੈੱਸ ਸ਼ਾਮਲ ਕਰਨ ਲਈ \"ਸ਼ਾਮਲ\" "
 "ਕਲਿੱਕ ਕਰੋ।"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "ਹਟਾਓ(_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "ਆਟੋਮੈਟਿਕ ਲਏ ਰੂਟ ਅਣਡਿੱਠੇ ਕਰੋ(_n)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "ਕੇਵਲ ਇਹ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਇਸ ਦੇ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੀ ਸਰੋਤਾਂ ਲਈ ਵਰਤੋਂ(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr ""
-"ਜੇ ਇਹ ਚੋਣ ਕੀਤੀ ਗਈ ਤਾਂ ਇਹ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਕਦੇ ਵੀ ਡਿਫਾਲਟ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਵਜੋਂ "
-"ਨਹੀਂ ਵਰਤਿਆ ਜਾਵੇਗਾ।"
+"ਜੇ ਇਹ ਚੋਣ ਕੀਤੀ ਗਈ ਤਾਂ ਇਹ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਕਦੇ ਵੀ ਡਿਫਾਲਟ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਵਜੋਂ ਨਹੀਂ ਵਰਤਿਆ ਜਾਵੇਗਾ।"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1261,15 +1063,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "ਬਣਾਓ..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ ਚੁਣੋ"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1278,8 +1080,7 @@ msgid ""
 msgstr ""
 "ਕੁਨੈਕਸ਼ਨ ਦੀ ਕਿਸਮ ਚੁਣੋ, ਜੋ ਕਿ ਤੁਸੀਂ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ।\n"
 "\n"
-"ਜੇ ਤੁਸੀਂ VPN ਕੁਨੈਕਸ਼ਨ ਬਣਾ ਰਹੇ ਹੋ ਅਤੇ ਉਹ VPN ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ ਲਿਸਟ ਵਿੱਚ ਨਾ ਹੋਵੇ ਤਾਂ "
-"ਸ਼ਾਇਦ ਤੁਹਾਡੇ ਕੋਲ "
+"ਜੇ ਤੁਸੀਂ VPN ਕੁਨੈਕਸ਼ਨ ਬਣਾ ਰਹੇ ਹੋ ਅਤੇ ਉਹ VPN ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ ਲਿਸਟ ਵਿੱਚ ਨਾ ਹੋਵੇ ਤਾਂ ਸ਼ਾਇਦ ਤੁਹਾਡੇ ਕੋਲ "
 "ਢੁੱਕਵੀਂ VPN ਪਲੱਗਇਨ ਇੰਸਟਾਲ ਨਾ ਹੋਵੇ।"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
@@ -1323,83 +1124,92 @@ msgid "Bonded _connections:"
 msgstr "ਬਾਊਂਡ ਕੀਤੇ ਕੁਨੈਕਸ਼ਨ(_c):"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "ਮੋਡ(_M):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "ਮੋਡ(_o):"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "ਸੋਧ(_E)"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "ਹਟਾਓ(_D)"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "ਸੋਧ(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "ਨਿਗਰਾਨੀ ਫਰੀਕਿਊਂਸੀ(_f):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "ਇੰਟਰਫੇਸ ਨਾਂ(_i):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "ਲਿੰਕ ਨਿਗਰਾਨੀ(_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP ਟਾਰਗੇਟ(_t):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "ਲਿੰਕ ਅੱਪ ਦੇਰੀ(_u):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "ਲਿੰਕ ਡਾਊਨਲੋਡ ਦੇਰੀ(_d):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "ਪ੍ਰਾਇਮਰੀ(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "ਬਾਈਟ"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "ਪਾਥ ਕੀਮਤ(_c):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "ਤਰਜੀਹ(_P):"
 
@@ -1411,44 +1221,89 @@ msgstr "ਹੇਅਰਪਿੰਨ ਮੋਡ(_H):"
 msgid "Bridged _connections:"
 msgstr "ਬਰਿਜ਼ ਕੀਤੇ ਕੁਨੈਕਸ਼ਨ(_c):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "ਫਾਰਵਰਡ ਦੇਰੀ(_F):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "ਹੈਲੋ ਸਮਾਂ(_H):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "ਨੈੱਟਵਰਕਿੰਗ ਚਾਲੂ(_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "_STP (ਸਪੈਨਿੰਗ ਟਰੀ ਪਰੋਟੋਕਾਲ) ਚਾਲੂ"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "ਵੱਧੋ-ਵੱਧ ਉਮਰ(_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "ਉਮਰ ਸਮਾਂ(_A):"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "ਡਿਫਾਲਟ"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "ਐਡਰੈੱਸ"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "ਐਡਰੈੱਸ"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "ਕੋਈ ਵੀ ਜੰਤਰ"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ ਕਰਕੇ ਕੁਨੈਕਸ਼ਨ ਸੀਕਰਟ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
@@ -1547,98 +1402,97 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "ਤਰਜੀਹੀ ਫਲੋ ਕੰਟਰੋਲ"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "ਹਰੇਕ ਯੂਜ਼ਰ ਤਰਜੀਹ ਲਈ ਤਰਜੀਹ ਵਿਰਾਮ ਟਰਾਂਸਮਿਸ਼ਨ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "ਤਰਜੀਹ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "ਟਰੈਫਿਕ ਕੰਟਰੋਲ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "ਸਖਤ ਬੈਂਡਵਿਡਥ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "ਤਰਜੀਹੀ ਬੈਂਡਵਿਡਥ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "ਗਰੁੱਪ ਬੈਂਡਵਿਡਥ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "ਗਰੁੱਪ ਆਈਡੀ:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr "ਹਰੇਕ ਯੂਜ਼ਰ ਤਰਜੀਹ ਲਈ ਤਰਜੀਹ ਗਰੁੱਪ ਆਈਡੀ ਦਿਉ।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr "ਹਰੇਕ ਯੂਜ਼ਰ ਤਰਜੀਹ ਵਲੋਂ ਵਰਤੀ ਜਾਣ ਵਾਲੀ ਤਰਜੀਹ ਗਰੁੱਪ ਬੈਂਡਵਿਡਥ ਦੀ ਫੀਸਦੀ ਦਿਉ।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "ਹਰੇਕ ਯੂਜ਼ਰ ਤਰਜੀਹ ਲਈ ਸਖਤ ਬੈਂਡਵਿਡਥ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ।"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1651,7 +1505,7 @@ 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:4
+#: ../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
@@ -1659,8 +1513,9 @@ msgid "Sho_w password"
 msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_w)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1672,7 +1527,8 @@ msgstr "ਪਾਸਵਰਡ(_P):"
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
@@ -1727,42 +1583,75 @@ msgstr "ਆਟੋ-ਨੈਗੋਸ਼ਿਏਟ(_o)"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "ਜੰਤਰ MAC ਐਡਰੈੱਸ(_D):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "ਸਰਵਿਸ(_S):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "ਕਨੋਲ ਕੀਤਾ MAC ਐਡਰੈੱਸ(_l):"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 ""
-"ਇੱਥੇ ਦਿੱਤਾ ਮੈਕ (MAC) ਐਡਰੈੱਸ ਨੈੱਟਵਰਕ ਜੰਤਰ ਲਈ ਹਾਰਡਵੇਅਰ ਐਡਰੈੱਸ ਵਜੋਂ ਵਰਤਿਆ "
-"ਜਾਵੇਗਾ, ਜਿਸ ਲਈ ਇਸ "
-"ਕੁਨੈਕਸ਼ਨ ਐਕਟੀਵੇਟ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਹ ਫੀਚਰ ਨੂੰ ਮੈਕ ਕਲੋਨਿੰਗ ਜਾਂ ਸਪੂਫਿੰਗ ਕਹਿੰਦੇ ਹਨ। "
-"ਜਿਵੇਂ: "
+"ਇੱਥੇ ਦਿੱਤਾ ਮੈਕ (MAC) ਐਡਰੈੱਸ ਨੈੱਟਵਰਕ ਜੰਤਰ ਲਈ ਹਾਰਡਵੇਅਰ ਐਡਰੈੱਸ ਵਜੋਂ ਵਰਤਿਆ ਜਾਵੇਗਾ, ਜਿਸ ਲਈ ਇਸ "
+"ਕੁਨੈਕਸ਼ਨ ਐਕਟੀਵੇਟ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਹ ਫੀਚਰ ਨੂੰ ਮੈਕ ਕਲੋਨਿੰਗ ਜਾਂ ਸਪੂਫਿੰਗ ਕਹਿੰਦੇ ਹਨ। ਜਿਵੇਂ: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "ਬਾਈਟ"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "ਡਿਫਾਲਟ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "ਅਣਡਿੱਠਾ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "ਬਰਾਡਕਾਸਟ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਪਾਸਵਰਡ(_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1801,8 +1690,8 @@ msgstr "ਦਸਤੀ DNS ਸੈਟਿੰਗ ਨਾਲ ਆਟੋਮੈਟਿਕ"
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "ਦਸਤੀ"
 
@@ -1813,8 +1702,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "ਹੋਰ ਕੰਪਿਊਟਰਾਂ ਨਾਲ ਸਾਂਝਾ"
 
@@ -1828,71 +1717,67 @@ msgstr "ਢੰਗ(_M):"
 msgid "Addresses"
 msgstr "ਐਡਰੈੱਸ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
-msgstr ""
-"ਜਦੋਂ ਹੋਸਟ-ਨਾਂ ਲੱਭਣੇ ਹੋਣ ਤੋਂ ਡੋਮੇਨ ਵਰਤੋਂ। ਵੱਖ ਵੱਖ ਡੋਮੇਨ ਦੇਣ ਲਈ ਕੌਮੇ (,) ਵਰਤੋਂ।"
+msgstr "ਜਦੋਂ ਹੋਸਟ-ਨਾਂ ਲੱਭਣੇ ਹੋਣ ਤੋਂ ਡੋਮੇਨ ਵਰਤੋਂ। ਵੱਖ ਵੱਖ ਡੋਮੇਨ ਦੇਣ ਲਈ ਕੌਮੇ (,) ਵਰਤੋਂ।"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS ਸਰਵਰ:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 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.h:17
 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.h:18
 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "...ਰੂਟ(_R)"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "ਬੰਦ ਹੈ"
 
@@ -1904,101 +1789,65 @@ msgstr "ਚਾਲੂ (ਤਰਜੀਹੀ ਜਨਤਕ ਐਡਰੈਸ)"
 msgid "Enabled (prefer temporary address)"
 msgstr "ਚਾਲੂ (ਤਰਜੀਹੀ ਆਰਜ਼ੀ ਐਡਰੈਸ)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "I_Pv6 ਪਰਦੇਦਾਰੀ ਇਕਸਟੈਨਸ਼ਨ:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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.h:20
 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-mobile.ui.h:1
-msgid "Any"
-msgstr "ਕੋਈ ਵੀ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA) ਨੂੰ ਪਹਿਲ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE) ਨੂੰ ਪਹਿਲ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "4G (LTE) ਪਹਿਲ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "ਕੇਵਲ 4G (LTE) ਹੀ ਵਰਤੋਂ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "ਮੁੱਢਲਾ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "ਨੰਬਰ(_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "ਤਕਨੀਕੀ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "ਨੈੱਟਵਰਕ ID(_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "ਟਾਈਪ(_T):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "...ਬਦਲੋ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "ਜੇ ਘਰ (ਹੋਮ) ਨੈੱਟਵਰਕ ਉਪਲੱਬਧ ਨਾ ਹੋਵੇ ਤਾਂ ਰੋਮਿੰਗ ਮਨਜ਼ੂਰ(_r)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_w)"
 
@@ -2064,32 +1913,55 @@ msgid "_Teamed connections:"
 msgstr "ਟੀਮ ਕੀਤੇ ਕੁਨੈਕਸ਼ਨ(_T):"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "...ਫਾਇਲ ਤੋਂ ਟੀਮ ਸੰਰਚਨਾ ਇੰਪੋਰਟ ਕਰੋ(_m)"
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "...ਫਾਇਲ ਤੋਂ ਟੀਮ ਸੰਰਚਨਾ ਇੰਪੋਰਟ ਕਰੋ(_I)"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "ਮੂਲ ਇੰਟਰਫੇਸ(_P):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLA_N ਇੰਟਰਫੇਸ ਨਾਂ:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "ਕਨੋਲ ਕੀਤਾ MA_C ਐਡਰੈੱਸ:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN _id:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "ਜੰਤਰ ਨਾਂ + ਨੰਬਰ"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + ਨੰਬਰ"
 
@@ -2106,402 +1978,465 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "ਇੰਫਰਾਸਟੱਕਚਰ"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "ਐਡ-ਹਾਕ"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "ਟਰਾਂਸਮਿਸ਼ਨ ਪਾਵਰ(_w):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "ਰੇਟ(_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "ਚੈਨਲ(_h):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "ਬੈਂਡ(_d):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "ਮੋਡ(_o):"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../src/connection-editor/ce-polkit-button.c:74
+#, fuzzy
+msgid "No polkit authorization to perform the action"
+msgstr "ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਮੰਗ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
 msgid "Allowed Authentication Methods"
 msgstr "ਮਨਜ਼ੂਰ ਕੀਤੇ ਪਰਮਾਣਕਿਤਾ ਢੰਗ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "ਐਕਸਟੇਸ਼ੇਬਲ ਅਥੈਂਟੀਕੇਸ਼ਨ ਪਰੋਟੋਕਾਲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "ਪਾਸਵਰਡ ਪਰਮਾਣਕਿਤਾ ਪਰੋਟੋਕਾਲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "ਚੈਲੰਜ਼ ਹੈਂਡਸ਼ੇਕ ਅਥੈਂਟੀਕੇਸ਼ਨ ਪਰੋਟੋਕਾਲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "ਮਾਈਕਰੋਸਾਫ਼ਟ ਚੈਲੰਜ਼ ਹੈਂਡਸ਼ੇਕ ਅਥੈਂਟੀਕੇਸ਼ਨ ਪਰੋਟੋਕਾਲ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "ਮਾਈਕਰੋਸਾਫ਼ਟ ਚੈਲੰਜ਼ ਹੈਂਡਸ਼ੇਕ ਅਥੈਂਟੀਕੇਸ਼ਨ ਪਰੋਟੋਕਾਲ ਵਰਜਨ ੨"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
 msgstr ""
-"ਬਹੁਤੇ ਕੇਸਾਂ ਵਿੱਚ, ਪਰੋਵਾਇਡਰ ਦਾ PPP ਸਰਵਰ ਸਭ ਪਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਲਈ ਸਹਾਇਕ ਹੋਵੇਗਾ। ਜੇ "
-"ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ "
+"ਬਹੁਤੇ ਕੇਸਾਂ ਵਿੱਚ, ਪਰੋਵਾਇਡਰ ਦਾ PPP ਸਰਵਰ ਸਭ ਪਰਮਾਣਕਿਤਾ ਢੰਗਾਂ ਲਈ ਸਹਾਇਕ ਹੋਵੇਗਾ। ਜੇ ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ "
 "ਹੋਵੇ ਤਾਂ ਕੁਝ ਢੰਗ ਆਯੋਗ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ।"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "ਐਡਰੈੱਸ"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "ਨੈੱਟਮਾਸਕ"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "ਗੇਟਵੇ"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "ਮੈਟਰਿਕ"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "ਪ੍ਰੀਫਿਕਸ"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "ਈਥਰਨੈੱਟ"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "ਵਾਈ-ਫਾਈ"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "ਬਲਿਊਟੁੱਥ"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "ਇੰਫੀਬੈਂਡ"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "ਬੌਂਡ"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "ਟੀਮ"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "ਬਰਿੱਜ਼"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "ਹਾਰਡਵੇਅਰ"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "ਵਰਚੁਅਲ"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "...ਸੰਭਾਲੀ VPN ਕੁਨੈਕਸ਼ਨ ਇੰਪੋਰਟ ਕਰੋ"
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "ਅਣਜਾਣ ਗਲਤੀ ਕਰਕੇ ਕੁਨੈਕਸ਼ਨ ਐਡੀਟਰ ਡਾਈਲਾਗ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਹਟਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "ਕੀ ਤੁਸੀਂ ਕੁਨੈਕਸ਼ਨ %s ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "ਐਡਰੈੱਸ"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "ਨੈੱਟਮਾਸਕ"
+
+#: ../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
+msgid "Gateway"
+msgstr "ਗੇਟਵੇ"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "ਮੈਟਰਿਕ"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "ਪ੍ਰੀਫਿਕਸ"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "%s ਸੋਧ"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "ਬੇਨਾਮ ਕੁਨੈਕਸ਼ਨ ਸੋਧ"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਨਾਂ(_n):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "ਐਡੀਟਰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਗਲਤੀ"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "ਸੰਭਾਲੋ(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "ਇਸ ਕੁਨੈਕਸ਼ਨ ਲਈ ਕੀਤੇ ਬਦਲਾਅ ਸੰਭਾਲੋ"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "ਇਸ ਕੁਨੈਕਸ਼ਨ ਲਈ ਪਰਮਾਣਕਿਤਾ ਨੂੰ ਇਸ ਮਸ਼ੀਨ ਉੱਤੇ ਸਭ ਯੂਜ਼ਰਾਂ ਲਈ ਸੰਭਾਲੋ।"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "ਕੁਨੈਕਸ਼ਨ ਐਡੀਟਰ ਡਾਈਲਾਗ ਬਣਾਉਣ ਦੌਰਾਨ ਅਣਜਾਣ ਗਲਤੀ।"
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "ਐਡੀਟਰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਗਲਤੀ"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "ਵਿਸ਼ੇਸ਼ਤਾ '%s' / '%s' ਅਢੁੱਕਵੀਂ: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਨਾਂ(_n):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "...ਐਕਸਪੋਰਟ(_E)"
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "ਕਦੇ ਨਹੀਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "ਹੁਣ"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਘੰਟੇ ਪਹਿਲਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ਮਹੀਨਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ਸਾਲ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਸਾਲ ਪਹਿਲਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "ਨਾਂ"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "ਆਖਰੀ ਵਰਤੇ"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "ਚੁਣਿਆ ਕੁਨੈਕਸ਼ਨ ਸੋਧੋ"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "ਚੁਣੇ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਸੋਧਣ ਲੀ ਪਰਮਾਣਕਿਤਾ"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "ਚੁਣਿਆ ਕੁਨੈਕਸ਼ਨ ਹਟਾਓ"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "ਚੁਣੇ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਹਟਾਉਣ ਲਈ ਪਰਮਾਣਕਿਤਾ"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "ਕੋਈ VPN ਪਲੱਗਇਨ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "ਪਤਾ ਨਹੀਂ ਹੈ ਕਿ '%s' ਕੁਨੈਕਸ਼ਨ ਕਿਵੇਂ ਬਣਾਇਆ ਜਾਵੇ"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਸੋਧਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID '%s' ਨਾਲ ਕੋਈ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x ਸੁਰੱਖਿਆ"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "802.1x ਸੁਰੱਖਿਆ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "ਇਸ ਕੁਨੈਕਸ਼ਨ ਲਈ 802.1_X ਸੁਰੱਖਿਆ ਵਰਤੋਂ"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "DCB ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "ਬਲਿਊਟੁੱਥ ਜੰਤਰ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "ਬੌਂਡ ਕੁਨੈਕਸ਼ਨ %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "ਬਲਿਊਟੁੱਥ"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "ਈਥਰਨੈੱਟ ਨੈੱਟਵਰਕ"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "ਬੌਂਡ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "ਪ੍ਰਾਇਮਰੀ(_P):"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "ਬੌਂਡ ਕੁਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "ਬਰਿਜ਼ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "ਬਰਿਜ਼ ਕੁਨੈਕਸ਼ਨ %d"
@@ -2509,302 +2444,355 @@ msgstr "ਬਰਿਜ਼ ਕੁਨੈਕਸ਼ਨ %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "ਬਰਿਜ਼ ਪੋਰਟ"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "ਬਰਿਜ਼ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "DCB ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ:"
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL ਕੁਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 "
-"ਐਡਰੈੱਸ ਰਾਹੀਂ ਦਿੱਤੇ ਹਨ। "
+"ਇਹ ਚੋਣ ਨੈੱਟਵਰਕ ਜੰਤਰਾਂ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਲਾਕ ਕਰ ਦਿੰਦੀ ਹੈ, ਜੋ ਇੱਥੇ ਦਿੱਤੇ ਪੱਕੇ MAC ਐਡਰੈੱਸ ਰਾਹੀਂ ਦਿੱਤੇ ਹਨ। "
 "ਜਿਵੇਂ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "ਈਥਰਨੈੱਟ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "ਈਥਰਨੈੱਟ"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "ਕਨੋਲ ਕੀਤਾ MAC ਐਡਰੈੱਸ(_l):"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "ਡਿਫਾਲਟ"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "ਫਾਇਰਵਾਲID ਚੱਲ ਨਹੀਂ ਰਹੀ ਹੈ।"
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "ਆਮ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "ਇਫੀਂਬੈਂਡ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "ਇਫੀਂਬੈਂਡ ਕੁਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "ਆਟੋਮੈਟਿਕ (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "ਆਟੋਮੈਟਿਕ (VPN) ਐਡਰੈੱਸ ਹੀ"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "ਆਟੋਮੈਟਿਕ (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "ਆਟੋਮੈਟਿਕ (PPP) ਐਡਰੈੱਸ ਹੀ"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "ਆਟੋਮੈਟਿਕ, ਸਿਰਫ਼ ਐਡਰੈੱਸ ਹੀ"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "ਆਟੋਮੈਟਿਕ(PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "ਆਟੋਮੈਟਿਕ (PPPoE) ਐਡਰੈੱਸ ਹੀ"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "ਆਟੋਮੈਟਿਕ (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "ਆਟੋਮੈਟਿਕ (DHCP) ਐਡਰੈੱਸ ਹੀ"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "ਲਿੰਕ-ਲੋਕਲ ਹੀ"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "ਵਾਧੂ _DNS ਸਰਵਰ:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "ਵਾਧੂ ਖੋਜ ਡੋਮੇਨ(_e):"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s ਲਈ IPv4 ਰੂਟ ਸੋਧ"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 ਸੈਟਿੰਗ"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "ਆਟੋਮੈਟਿਕ, ਸਿਰਫ਼ ਐਡਰੈੱਸ ਹੀ"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "ਅਣਡਿੱਠਾ"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "ਆਟੋਮੈਟਿਕ, ਸਿਰਫ (DHCP)"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s ਲਈ IPv6 ਰੂਟ ਸੋਧ"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 ਸੈਟਿੰਗ"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "ਡੁਪਲੀਕੇਟ ਸਲੇਵ"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "ਸਲੇਵ '%s' ਅਤੇ '%s' ਦੋਵਾਂ ਨੂੰ ਜੰਤਰ '%s' ਲਈ ਲਾਗੂ ਕਰੋ"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, 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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s ਸਲੇਵ %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "ਅਣ-ਸਹਾਇਕ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਕਿਸਮ ਚੁਣੋ"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr ""
-"ਤਕਨਾਲੋਜੀ ਚੁਣੋ, ਜੋ ਕਿ ਤੁਹਾਡਾ ਬਰਾਂਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਵਰਤਦਾ ਹੈ। ਜੇ ਤੁਹਾਨੂੰ ਪੱਕਾ ਪਤਾ "
-"ਨਾ ਹੋਵੇ ਤਾਂ ਆਪਣੇ "
+"ਤਕਨਾਲੋਜੀ ਚੁਣੋ, ਜੋ ਕਿ ਤੁਹਾਡਾ ਬਰਾਂਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਵਰਤਦਾ ਹੈ। ਜੇ ਤੁਹਾਨੂੰ ਪੱਕਾ ਪਤਾ ਨਾ ਹੋਵੇ ਤਾਂ ਆਪਣੇ "
 "ਪਰੋਵਾਇਡਰ ਤੋਂ ਪੁੱਛੋ।"
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 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) ਵਰਤਦਾ ਹੈ।"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ C_DMA ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ 1xRTT, EVDO) ਵਰਤਦਾ ਹੈ।"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP ਸੈਟਿੰਗ"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਫਾਇਲ ਚੁਣੋ"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "ਗਲਤੀ: ਫਾਇਲ ਵਿੱਚ ਠੀਕ JSON ਸੰਰਚਨਾ ਨਹੀਂ ਹੈ"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "ਟੀਮ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "ਟੀਮ ਕੁਨੈਕਸ਼ਨ %d"
@@ -2812,47 +2800,56 @@ msgstr "ਟੀਮ ਕੁਨੈਕਸ਼ਨ %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "ਟੀਮ ਪੋਰਟ"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (\"%s\" ਰਾਹੀਂ)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "ਕੋਈ ਨੈਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "ਵੀਲੈਨ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN ਕੁਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' ਲਈ VPN ਪਲੱਗਇਨ ਸਰਵਿਸ ਲੱਭੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2862,96 +2859,112 @@ msgstr ""
 "\n"
 "ਗਲਤੀ: ਕੋਈ VPN ਸਰਵਿਸ ਟਾਈਪ ਨਹੀਂ।"
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ ਚੁਣੋ"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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:85
+#: ../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 ""
-"ਇਹ ਚੋਣ ਇਸ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਵਾਈ-ਫਾਈ ਐਕਸੈੱਸ ਪੁਆਇੰਟ (AP) ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਤੋਂ ਲਾਕ ਕਰਦੀ "
-"ਹੈ, ਜੋ ਇੱਥੇ ਦਿੱਤੇ "
+"ਇਹ ਚੋਣ ਇਸ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਵਾਈ-ਫਾਈ ਐਕਸੈੱਸ ਪੁਆਇੰਟ (AP) ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਤੋਂ ਲਾਕ ਕਰਦੀ ਹੈ, ਜੋ ਇੱਥੇ ਦਿੱਤੇ "
 "BSSID ਵਲੋਂ ਦਿੱਤਾ ਹੈ। ਜਿਵੇਂ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"ਇਹ ਚੋਣ ਨੈੱਟਵਰਕ ਜੰਤਰਾਂ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਲਾਕ ਕਰ ਦਿੰਦੀ ਹੈ, ਜੋ ਇੱਥੇ ਦਿੱਤੇ ਪੱਕੇ MAC ਐਡਰੈੱਸ ਰਾਹੀਂ ਦਿੱਤੇ ਹਨ। "
+"ਜਿਵੇਂ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "ਵਾਈ-ਫਾਈ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "ਕੋਈ ਵੀ ਜੰਤਰ"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "ਵਾਈ-ਫਾਈ ਕੁਨੈਕਸ਼ਨ %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-ਬਿੱਟ ਸ਼ਬਦ"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "ਡਾਇਨੈਮਿਕ WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ਨਿੱਜੀ"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ਇੰਟਰਪ੍ਰਾਈਜ"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
-msgstr ""
-"ਵਾਈ-ਫਾਈ ਸੁਰੱਖਿਆ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ; ਵਾਈ-ਫਾਈ ਸੈਟਿੰਗ ਗੁੰਮ ਹੈ।"
+msgstr "ਵਾਈ-ਫਾਈ ਸੁਰੱਖਿਆ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ; ਵਾਈ-ਫਾਈ ਸੈਟਿੰਗ ਗੁੰਮ ਹੈ।"
 
-#: ../src/connection-editor/page-wifi-security.c:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "ਵਾਈ-ਫਾਈ ਸੁਰੱਖਿਆ"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "ਵਾਈ-ਫਾਈ ਸੁਰੱਖਿਆ ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "ਵਾਈਮੈਕਸ (WiMAX) ਯੂਜ਼ਰ ਇੰਟਰਫੇਸ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX ਕੁਨੈਕਸ਼ਨ %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਇੰਪੋਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2963,25 +2976,30 @@ msgstr ""
 "\n"
 "ਗਲਤੀ: %s।"
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "ਅਣਜਾਣ ਗਲਤੀ"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "ਫਾਇਲ ਨਾਂ \"%s\" ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "ਬਦਲੋ(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2992,109 +3010,21 @@ msgstr ""
 "\n"
 "ਗਲਤੀ: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਐਕਸਪੋਰਟ..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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 "ਨੈੱਟਵਰਕ-ਮੈਨੇਜਰ ਐਪਲਿਟ ਲੋੜੀਦੇ ਸਰੋਤ ਨਹੀਂ ਲੱਭਿਆ ਸਕਿਆ (.ui ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ)।"
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr ""
-"ਬਲਿਊਟੁੱਥ ਸੰਰਚਨਾ ਸੰਭਵ ਨਹੀਂ ਹੈ (D-Bus ਨਾਲ ਜੁੜਨ ਤੋਂ ਫੇਲ੍ਹ ਹੋਇਆ ਹੈ: (%s) %s)।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "ਬਲਿਊਟੁੱਥ ਸੰਰਚਨਾ ਸੰਭਵ ਨਹੀਂ ਹੈ (ਨੈੱਟਵਰਕ-ਮੈਨੇਜਰ ਲੱਭਣ ਵਿੱਚ ਗਲਤੀ: (%s) %s)।"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "ਆਪਣੇ ਮੋਬਾਇਲ ਫੋਨ ਨੂੰ ਨੈੱਟਵਰਕ ਜੰਤਰ ਵਜੋਂ ਵਰਤੋਂ (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "ਆਪਣੇ ਮੋਬਾਇਲ ਫੋਨ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਵਰਤੋਂ (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "ਗਲਤੀ: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "DUN ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "ਤੁਹਾਡਾ ਫੋਨ ਵਰਤਣ ਲਈ ਤਿਆਰ ਹੈ!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "ਮੋਬਾਇਲ ਸਹਾਇਕ ਰੱਦ ਕੀਤਾ ਗਿਆ"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "ਅਣਜਾਣ ਫੋਨ ਜੰਤਰ ਕਿਸਮ (GSM ਜਾਂ CDMA ਨਹੀਂ)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "ਅਣਜਾਣ ਮਾਡਮ ਕਿਸਮ:"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "ਫੋਨ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "ਬਸ ਕੁਨੈਕਸ਼ਨ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "ਫੋਨ ਤੋਂ ਅਚਾਨਕ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ।"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "ਫੋਨ ਵੇਰਵਾ ਲੈਣ ਲਈ ਸਮਾਂ ਸਮਾਪਤ।"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "ਫੋਨ ਸੰਰਚਨਾ ਲਈ ਜਾ ਰਹੀ ਹੈ..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"ਡਿਫਾਲਟ ਬਲਿਊਟੁੱਥ ਐਡਪਟਰ ਨੂੰ ਡਾਇਲ-ਅੱਪ ਨੈੱਟਵਰਕਿੰਗ ਕੁਨੈਕਸ਼ਨ ਸੈਟਅੱਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ "
-"ਚਾਲੂ ਕਰਨਾ ਲਾਜ਼ਮੀ "
-"ਹੈ।"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "PAN ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "%s ਨੈੱਟਵਰਕ"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "ਅਣ-ਲਾਕ(_U)"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "ਇਹ ਜੰਤਰ ਆਟੋਮੈਟਿਕ ਅਣ-ਲਾਕ ਕਰੋ"
 
@@ -3102,32 +3032,36 @@ msgstr "ਇਹ ਜੰਤਰ ਆਟੋਮੈਟਿਕ ਅਣ-ਲਾਕ ਕਰੋ"
 msgid "Connection Information"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਜਾਣਕਾਰੀ"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "ਸਰਗਰਮ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
-"ਤੁਹਾਡਾ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ ਦੀ ਹੇਠ ਦਿੱਤੀ ਸੈਟਿੰਗ ਨਾਲ ਸੰਰਚਨਾ ਕੀਤੀ ਗਈ ਹੈ।"
+msgstr "ਤੁਹਾਡਾ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ ਦੀ ਹੇਠ ਦਿੱਤੀ ਸੈਟਿੰਗ ਨਾਲ ਸੰਰਚਨਾ ਕੀਤੀ ਗਈ ਹੈ।"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "ਤੁਹਾਡਾ ਜੰਤਰ:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "ਤੁਹਾਡਾ ਪਰੋਵਾਇਡਰ:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "ਤੁਹਾਡਾ ਪਲੈਨ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3135,260 +3069,316 @@ msgid ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 msgstr ""
-"ਤੁਹਾਡੇ ਵਲੋਂ ਚੁਣੀ ਸੈਟਿੰਗ ਨਾਲ ਤੁਹਾਡੇ ਮੋਬਾਇਲ ਬਰਾਂਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ "
-"ਬਣਾਇਆ ਜਾਵੇਗਾ। ਜੇ "
-"ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ ਜਾਂ ਤੁਸੀਂ ਨੈੱਟਵਰਕ ਸਰੋਤਾਂ ਨੂੰ ਨਾ ਅਸੈੱਸ ਕਰ ਸਕੇ ਤਾਂ ਆਪਣੀ "
-"ਸੈਟਿੰਗ ਫੇਰ ਚੈੱਕ ਕਰੋ। ਆਪਣੀ "
-"ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ ਸੈਟਿੰਗ ਨੂੰ ਸੋਧਣ ਲਈ, ਸਿਸਟਮ >> ਪਸੰਦ ਮੇਨੂ ਤੋਂ \"ਨੈੱਟਵਰਕ "
-"ਕੁਨੈਕਸ਼ਨ\" ਚੁਣੋ। "
-
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+"ਤੁਹਾਡੇ ਵਲੋਂ ਚੁਣੀ ਸੈਟਿੰਗ ਨਾਲ ਤੁਹਾਡੇ ਮੋਬਾਇਲ ਬਰਾਂਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਜਾਵੇਗਾ। ਜੇ "
+"ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ ਜਾਂ ਤੁਸੀਂ ਨੈੱਟਵਰਕ ਸਰੋਤਾਂ ਨੂੰ ਨਾ ਅਸੈੱਸ ਕਰ ਸਕੇ ਤਾਂ ਆਪਣੀ ਸੈਟਿੰਗ ਫੇਰ ਚੈੱਕ ਕਰੋ। ਆਪਣੀ "
+"ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ ਸੈਟਿੰਗ ਨੂੰ ਸੋਧਣ ਲਈ, ਸਿਸਟਮ >> ਪਸੰਦ ਮੇਨੂ ਤੋਂ \"ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ\" ਚੁਣੋ। "
+
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਸੈਟਿੰਗ ਪੁਸ਼ਟੀ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "ਬਿਨ-ਲਿਸਟ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "ਆਪਣਾ ਪਲੈਨ ਚੁਣੋ(_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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 ਬਾਰੇ ਪਤਾ ਕਰੋ।"
+"ਜੇ ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਲੈਨ ਬਾਰੇ ਪੱਕਾ ਪਤਾ ਨਾ ਹੋਵੇ ਤਾਂ ਆਪਣੇ ਪਰੋਵਾਇਡਰ ਨੂੰ ਆਪਣੇ ਪਲੈਨ ਦੇ APN ਬਾਰੇ ਪਤਾ ਕਰੋ।"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "ਆਪਣਾ ਬਿੱਲ ਪਲੈਨ ਚੁਣੋ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "ਮੇਰਾ ਪਲੈਨ ਲਿਸਟ 'ਚ ਨਹੀਂ ਹੈ..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ਪਰੋਵਾਇਡਰ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "ਪਰੋਵਾਇਡਰ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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) ਵਰਤਦਾ ਹੈ।"
+msgstr "ਮੇਰਾ ਪਰੋਵਾਇਡਰ GSM ਅਧਾਰਿਤ ਤਕਨਾਲੋਜੀ (ਜਿਵੇਂ GPRS, EDGE, UMTS, HSDPA) ਵਰਤਦਾ ਹੈ।"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "ਆਪਣਾ ਪਰੋਵਾਇਡਰ ਚੁਣੋ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ ਲਿਸਟ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "ਦੇਸ਼ ਜਾਂ ਖੇਤਰ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "ਮੇਰਾ ਦੇਸ਼ ਲਿਸਟ ਵਿੱਚ ਨਹੀਂ ਹੈ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ਇੰਸਟਾਲ ਕੀਤਾ GSM ਜੰਤਰ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ਇੰਸਟਾਲ ਕੀਤਾ CDMA ਜੰਤਰ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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 ""
-"ਇਹ ਸਹਾਇਕ ਤੁਹਾਨੂੰ ਸੈਲੁਲਰ (3G) ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ ਸੈੱਟ ਕਰਨ "
-"ਲਈ ਮੱਦਦ ਕਰਦਾ ਹੈ।"
+"ਇਹ ਸਹਾਇਕ ਤੁਹਾਨੂੰ ਸੈਲੁਲਰ (3G) ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ ਸੈੱਟ ਕਰਨ ਲਈ ਮੱਦਦ ਕਰਦਾ ਹੈ।"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "ਤੁਹਾਨੂੰ ਹੇਠ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਚਾਹੀਦੀ ਹੈ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "ਤੁਹਾਡੇ ਬਰਾਡਬੈਂਡ ਪਰੋਵਾਇਡਰ ਦਾ ਨਾਂ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ਤੁਹਾਡਾ ਬਰਾਡਬੈਂਡ ਬਿੱਲ ਪਲੈਨ ਨਾਂ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "ਇਸ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਲਈ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਓ(_t):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "ਕੋਈ ਵੀ ਜੰਤਰ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬਾਂਡ ਕੁਨੈਕਸ਼ਨ ਸੈੱਟਅੱਪ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "ਨਵਾਂ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "ਤਾਰ"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "ਬਲਿਊਟੁੱਥ"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC ਮਿਸ਼"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "ਸੈਕੰਡਰੀ ਪਾਸਵਰਡ(_S):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "ਸੈਕੰਡਰੀ ਪਾਸਵਰਡ(_S):"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %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-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਹਿਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "ਨਵਾਂ..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "ਬਣਾਓ(_r)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ '%s' ਵਰਤਣ ਲਈ ਪਾਸਵਰਡ ਜਾਂ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ ਦੀ ਲੋੜ ਹੈ।"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਵਲੋਂ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "ਨਵਾਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਬਣਾਓ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "ਨਵਾਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ, ਜੋ ਤੁਸੀਂ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਦਿਓ।"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "ਲੁਕਵੇਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "ਲੁਕਵਾਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr ""
-"ਲੁਕਵੇਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕੁਨੈਕਟ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਅਤੇ "
-"ਸੁਰੱਖਿਆ ਵੇਰਵਾ ਦਿਓ।"
+"ਲੁਕਵੇਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕੁਨੈਕਟ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਲਈ ਨਾਂ ਅਤੇ ਸੁਰੱਖਿਆ ਵੇਰਵਾ ਦਿਓ।"
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "ਸੈਕੰਡਰੀ ਪਾਸਵਰਡ(_S):"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "ਪਾਸਵਰਡ ਵੇਖੋ(_o)"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "ਵਾਈ-ਫਾਈ ਸੁਰੱਖਿਆ(_s):"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "ਕੁਨੈਕਸ਼ਨ(_n):"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "ਵਾਈ-ਫਾਈ ਐਡਪਟਰ(_a):"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC ਮਿਸ਼"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "ਵਰਤੋਂ:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3396,146 +3386,158 @@ msgstr ""
 "ਇਹ ਪਰੋਗਰਾਮ ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਦਾ ਭਾਗ ਹੈ (https://wiki.gnome.org/Projects/"
 "NetworkManager/)"
 
-#: ../src/main.c:76
+#: ../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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ਯੋਗ ਨਹੀਂ"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ਰਜਿਸਟਰ ਨਹੀਂ ਹੈ"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ਘਰ ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "ਘਰ ਨੈੱਟਵਰਕ"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ਖੋਜ ਜਾਰੀ ਹੈ"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "ਰਜਿਸਟਰੇਸ਼ਨ ਪਾਬੰਦੀ ਹੈ"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ਰੋਮਿੰਗ)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ਰੋਮਿੰਗ ਨੈੱਟਵਰਕ (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "ਰੋਮਿੰਗ ਨੈੱਟਵਰਕ"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "SIM ਕਾਰਡ '%s'  '%s' ਉੱਤੇ ਲਈ ਪਿੰਨ ਕੋਡ"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN ਕੋਡ ਲੋੜੀਦਾ ਹੈ"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਲਈ PIN ਕੋਡ ਚਾਹੀਦਾ ਹੈ"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "ਰੋਮਿੰਗ"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s ਕੁਨੈਕਸ਼ਨ"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "ਕੇਵਲ ਇਹ ਯੂਜ਼ਰ ਲਈ ਹੀ ਪਾਸਵਰਡ ਸੰਭਾਲੋ(_u)"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "ਸਭ ਯੂਜ਼ਰ ਲਈ ਹੀ ਪਾਸਵਰਡ ਸੰਭਾਲੋ(_a)"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ਜਾਂ PEM ਸਰਟੀਫਿਕੇਟ (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "ਇੱਕ PAC ਫਾਇਲ ਚੁਣੋ..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC ਫਾਇਲਾਂ (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
@@ -3571,15 +3573,32 @@ msgstr "_Inner ਪਰਮਾਣਕਿਤਾ:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ਆਟੋਮੈਟਿਕ PAC ਪਰੋਵਿਜ਼ਨਿੰਗ ਮਨਜ਼ੂਰ(_v)"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "ਸਰਟੀਫਿਕੇਟ ਅਥਾਰਟੀ ਸਰਫੀਟਿਕੇਟ ਚੁਣੋ।"
 
@@ -3607,15 +3626,46 @@ msgstr "ਕੋਈ CA ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਚਾਹੀਦਾ
 msgid "PEAP _version:"
 msgstr "PEAP ਵਰਜਨ(_v):"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "ਹਰ ਵਾਰ ਇਹ ਪਾਸਵਰਡ ਪੁੱਛੋ(_k)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A ਸਰਟੀਫਿਕੇਟ"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "ਬਿਨ-ਇੰਕ੍ਰਿਪਸ਼ਨ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀਆਂ ਅਸੁਰੱਖਿਅਤ ਹਨ"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3623,17 +3673,16 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"ਚੁਣੀ ਗਈ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਪਾਸਵਰਡ ਨਾਲ ਸੁਰੱਖਿਅਤ ਨਹੀਂ ਜਾਪਦੀ ਹੈ। ਇਹ ਤੁਹਾਡੀ ਸੁਰੱਖਿਅਤ "
-"ਸਨਦ ਨੂੰ ਖਤਰਾ "
+"ਚੁਣੀ ਗਈ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਪਾਸਵਰਡ ਨਾਲ ਸੁਰੱਖਿਅਤ ਨਹੀਂ ਜਾਪਦੀ ਹੈ। ਇਹ ਤੁਹਾਡੀ ਸੁਰੱਖਿਅਤ ਸਨਦ ਨੂੰ ਖਤਰਾ "
 "ਪੈਦਾ ਕਰ ਸਕਦੀ ਹੈ। ਪਾਸਵਰਡ ਨਾਲ ਸੁਰੱਖਿਅਤ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਚੁਣੋ ਜੀ।\n"
 "\n"
 "(ਤੁਸੀਂ openssl ਨਾਲ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਪਾਸਵਰਡ ਸੁਰੱਖਿਅਤ ਕਰ ਸਕਦੇ ਹੋ)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "ਆਪਣਾ ਨਿੱਜੀ ਸਰਟੀਫਿਕੇਟ ਚੁਣੋ..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "ਆਪਣੀ ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਚੁਣੋ..."
 
@@ -3653,23 +3702,36 @@ msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ(_k):"
 msgid "_Private key password:"
 msgstr "ਪ੍ਰਾਈਵੇਟ ਕੁੰਜੀ ਪਾਸਵਰਡ(_P):"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "ਟਨਲ TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "ਸੁਰੱਖਿਅਤ EAP (PEAP)"
 
@@ -3679,6 +3741,44 @@ msgstr "ਸੁਰੱਖਿਅਤ EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "ਪਰਮਾਣਕਿਤਾ(_t):"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (ਡਿਫਾਲਟ)"
@@ -3703,6 +3803,289 @@ msgstr "ਕੁੰਜੀ ਵੇਖੋ(_w)"
 msgid "WEP inde_x:"
 msgstr "WEP ਇੰਡੈਕਸ(_x):"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "ਟਾਈਪ(_T):"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "WiMA_X ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਚਾਲੂ"
+
+#~ msgid "_Help"
+#~ msgstr "ਮੱਦਦ(_H)"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "ਹੁਣ ਤੁਸੀਂ ਬੌਂਡਡ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "...'%s' ਬੌਂਡ ਕੁਨੈਕਟ ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "...'%s' ਬੌਂਡ ਕੁਨੈਕਟ ਸੰਰਚਿਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "...ਬੌਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "...'%s' ਲਈ ਐਡਰੈੱਸ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "ਬੌਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ ਹੈ"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "ਹੁਣ ਤੁਸੀਂ ਬਰਿੱਜ਼ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "...ਬਰਿੱਜ਼ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "...ਬਰਿੱਜ਼ ਕੁਨੈਕਸ਼ਨ '%s' ਨਾਲ ਸੰਰਚਨਾ ਜਾਰੀ"
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "...ਬਰਿੱਜ਼ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "ਬਰਿੱਜ਼ ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ ਹੈ"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "...ਨਵਾਂ ਆਟੋ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ (CDMA) ਕੁਨੈਕਸ਼ਨ"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "ਹੁਣ ਤੁਸੀਂ CDMA ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA ਨੈੱਟਵਰਕ।"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "...ਨਵਾਂ ਆਟੋ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ (GSM) ਕੁਨੈਕਸ਼ਨ"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "ਹੁਣ ਤੁਸੀਂ GSM ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
+
+#~ msgid "GSM network."
+#~ msgstr "GSM ਨੈੱਟਵਰਕ।"
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "ਆਟੋ ਇੰਫੀਬੈਂਡ"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "ਇੰਫੀਬੈਂਡ ਨੈੱਟਵਰਕ (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "ਇੰਫੀਬੈਂਡ ਨੈੱਟਵਰਕ (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "ਇੰਫੀਬੈਂਡ ਨੈੱਟਵਰਕ"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "ਇੰਫੀਬੈਂਡ ਨੈੱਟਵਰਕ"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "ਹੁਣ ਤੁਸੀਂ ਇੰਫੀਬੈਂਡ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "....ਇੰਫੀਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "...ਇੰਫੀਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਨਾਲ ਸੰਰਚਨਾ ਜਾਰੀ"
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "...ਇੰਫੀਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "ਇਫੀਂਬੈਂਡ ਕੁਨੈਕਸ਼ਨ '%s' ਸਰਗਰਮ ਹੈ"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "ਹੁਣ ਤੁਸੀਂ ਟੀਮਡ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "...ਟੀਮ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "...ਟੀਮ ਕੁਨੈਕਸ਼ਨ '%s' ਨਾਲ ਸੰਰਚਨਾ ਜਾਰੀ"
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "ਟੀਮ ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "ਟੀਮ ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ ਹੈ"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "ਹੁਣ ਤੁਸੀਂ VLAN ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "...VLAN ਕੁਨੈਕਸ਼ਨ '%s' ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "...VLAN ਕੁਨੈਕਸ਼ਨ '%s' ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "...VLAN ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਯੂਜ਼ਰ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ"
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN ਕੁਨੈਕਸ਼ਨ '%s' ਐਕਟਿਵ ਹੈ"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX ਬੰਦ ਹੈ"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX ਨੂੰ ਹਾਰਡਵੇਅਰ ਸਵਿੱਚ ਰਾਹੀਂ ਬੰਦ ਕੀਤਾ ਹੋਇਆ ਹੈ"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "ਹੁਣ ਤੁਸੀਂ WiMAX ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਹੋ ਗਏ ਹੋ।"
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "ਅਣਜਾਣ"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "ਅਣਜਾਣ"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "ਮੋਡ(_M):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "ਜੰਤਰ MAC ਐਡਰੈੱਸ(_D):"
+
+#~ msgid "Any"
+#~ msgstr "ਕੋਈ ਵੀ"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA) ਨੂੰ ਪਹਿਲ"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE) ਨੂੰ ਪਹਿਲ"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "4G (LTE) ਪਹਿਲ"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "ਕੇਵਲ 4G (LTE) ਹੀ ਵਰਤੋਂ"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "...ਫਾਇਲ ਤੋਂ ਟੀਮ ਸੰਰਚਨਾ ਇੰਪੋਰਟ ਕਰੋ(_m)"
+
+#~ msgid "Infrastructure"
+#~ msgstr "ਇੰਫਰਾਸਟੱਕਚਰ"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਸੰਭਾਲਣ ਦੌਰਾਨ ਗਲਤੀ"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "ਵਿਸ਼ੇਸ਼ਤਾ '%s' / '%s' ਅਢੁੱਕਵੀਂ: %d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "ਆਟੋਮੈਟਿਕ (PPP)"
+
+#~ 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)."
+#~ msgstr "ਬਲਿਊਟੁੱਥ ਸੰਰਚਨਾ ਸੰਭਵ ਨਹੀਂ ਹੈ (D-Bus ਨਾਲ ਜੁੜਨ ਤੋਂ ਫੇਲ੍ਹ ਹੋਇਆ ਹੈ: (%s) %s)।"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "ਬਲਿਊਟੁੱਥ ਸੰਰਚਨਾ ਸੰਭਵ ਨਹੀਂ ਹੈ (ਨੈੱਟਵਰਕ-ਮੈਨੇਜਰ ਲੱਭਣ ਵਿੱਚ ਗਲਤੀ: (%s) %s)।"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "ਆਪਣੇ ਮੋਬਾਇਲ ਫੋਨ ਨੂੰ ਨੈੱਟਵਰਕ ਜੰਤਰ ਵਜੋਂ ਵਰਤੋਂ (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "ਆਪਣੇ ਮੋਬਾਇਲ ਫੋਨ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਵਰਤੋਂ (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "ਗਲਤੀ: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "DUN ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "ਤੁਹਾਡਾ ਫੋਨ ਵਰਤਣ ਲਈ ਤਿਆਰ ਹੈ!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "ਮੋਬਾਇਲ ਸਹਾਇਕ ਰੱਦ ਕੀਤਾ ਗਿਆ"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "ਅਣਜਾਣ ਫੋਨ ਜੰਤਰ ਕਿਸਮ (GSM ਜਾਂ CDMA ਨਹੀਂ)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "ਅਣਜਾਣ ਮਾਡਮ ਕਿਸਮ:"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "ਫੋਨ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+
+#~ msgid "error getting bus connection"
+#~ msgstr "ਬਸ ਕੁਨੈਕਸ਼ਨ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ਫੋਨ ਤੋਂ ਅਚਾਨਕ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ।"
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "ਫੋਨ ਵੇਰਵਾ ਲੈਣ ਲਈ ਸਮਾਂ ਸਮਾਪਤ।"
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "ਫੋਨ ਸੰਰਚਨਾ ਲਈ ਜਾ ਰਹੀ ਹੈ..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "ਡਿਫਾਲਟ ਬਲਿਊਟੁੱਥ ਐਡਪਟਰ ਨੂੰ ਡਾਇਲ-ਅੱਪ ਨੈੱਟਵਰਕਿੰਗ ਕੁਨੈਕਸ਼ਨ ਸੈਟਅੱਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਚਾਲੂ ਕਰਨਾ "
+#~ "ਲਾਜ਼ਮੀ ਹੈ।"
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "PAN ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ ਹੈ: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s ਨੈੱਟਵਰਕ"
+
 #~ msgid "Primary DNS:"
 #~ msgstr "ਪ੍ਰਾਇਮਰੀ DNS:"
 
@@ -3803,9 +4186,6 @@ msgstr "WEP ਇੰਡੈਕਸ(_x):"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "ਪਤਾ ਨਹੀਂ ਹੈ ਕਿ '%s' ਕੁਨੈਕਸ਼ਨ ਕਿਵੇਂ ਸੋਧਿਆ ਜਾਵੇ"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "ਬਲਿਊਟੁੱਥ ਜੰਤਰ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।"
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "ਬਲਿਊਟੁੱਥ ਸੰਰਚਨਾ ਸੰਭਵ ਨਹੀਂ ਹੈ (D-Bus ਪਰਾਕਸੀ ਨਾਲ ਜੁੜਨ ਤੋਂ ਫੇਲ ਹੋਇਆ ਹੈ: %s)।"
 
@@ -3824,9 +4204,6 @@ msgstr "WEP ਇੰਡੈਕਸ(_x):"
 #~ msgid "label"
 #~ msgstr "ਲੇਬਲ"
 
-#~ msgid "Network Manager"
-#~ msgstr "ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "nm-applet ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ।\n"
 
@@ -4017,9 +4394,6 @@ msgstr "WEP ਇੰਡੈਕਸ(_x):"
 #~ msgid "PolicyKit authorization request was malformed."
 #~ msgstr "ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਮੰਗ ਨਿਕਾਰਾ ਹੈ।"
 
-#~ msgid "PolicyKit authorization could not be created."
-#~ msgstr "ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਮੰਗ ਕੀਤੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।"
-
 #~ msgid "PolicyKit authorization could not be created; invalid action ID."
 #~ msgstr "ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕੀ; ਅਢੁੱਕਵਾਂ ਕਾਰਵਾਈ ID"
 
@@ -4032,9 +4406,6 @@ msgstr "WEP ਇੰਡੈਕਸ(_x):"
 #~ msgid "The connection could not be deleted due to an unknown error."
 #~ msgstr "ਅਣਜਾਣ ਗਲਤੀ ਕਰਕੇ ਕੁਨੈਕਸ਼ਨ ਹਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ।"
 
-#~ msgid "Could not move connection"
-#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਹਿਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
-
 #~ msgid "Could not add connection"
 #~ msgstr "ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
diff --git a/po/pl.po b/po/pl.po
index bcdef01b..360c0c72 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,14 +7,14 @@
 # Wadim Dziedzic <wdziedzic@aviary.pl>, 2006-2008.
 # Tomasz Dominikowski <dominikowski@gmail.com>, 2007-2009.
 # Piotr Zaryk <pzaryk@aviary.pl>, 2008.
-# Piotr Drąg <piotrdrag@gmail.com>, 2009-2015.
-# Aviary.pl <gnomepl@aviary.pl>, 2006-2015.
+# Piotr Drąg <piotrdrag@gmail.com>, 2009-2016.
+# Aviary.pl <gnomepl@aviary.pl>, 2006-2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-21 17:31+0100\n"
-"PO-Revision-Date: 2015-12-21 17:32+0100\n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
+"PO-Revision-Date: 2016-03-29 18:55+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -26,7 +26,7 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3258
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Sieć"
 
@@ -156,7 +156,7 @@ msgstr ""
 "Program nm-connection-editor umożliwia tworzenie i modyfikowanie "
 "istniejących profilów połączeń za pomocą usługi NetworkManager."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Uwierzytelnianie 802.1X"
 
@@ -178,45 +178,45 @@ msgstr "P_ołącz"
 msgid "_Network name:"
 msgstr "_Nazwa sieci:"
 
-#: ../src/ap-menu-item.c:87
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "zabezpieczona."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Dodanie/aktywowanie połączenia się nie powiodło"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Niepowodzenie połączenia"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Rozłączenie urządzenia się nie powiodło"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Niepowodzenie rozłączenia"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Aktywacja połączenia się nie powiodła"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Bez wyświetlania tego komunikatu ponownie"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -227,7 +227,7 @@ msgstr ""
 "Połączenie VPN „%s” się nie powiodło, ponieważ połączenie sieciowe zostało "
 "przerwane."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -237,7 +237,7 @@ msgstr ""
 "Połączenie VPN „%s” się nie powiodło, ponieważ usługa VPN została "
 "nieoczekiwanie zatrzymana."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -248,7 +248,7 @@ msgstr ""
 "Połączenie VPN „%s” się nie powiodło, ponieważ usługa VPN nie zwróciła "
 "odpowiedniej konfiguracji sieci."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "Połączenie VPN „%s” się nie powiodło z powodu przekroczenia limitu czasu."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -267,7 +267,7 @@ msgstr ""
 "Połączenie VPN „%s” się nie powiodło, ponieważ usługa VPN nie została "
 "uruchomiona na czas."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -277,7 +277,7 @@ msgstr ""
 "Połączenie VPN „%s” się nie powiodło, ponieważ usługa VPN nie mogła zostać "
 "uruchomiona."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -287,7 +287,7 @@ msgstr ""
 "Połączenie VPN „%s” się nie powiodło z powodu braku prawidłowych sekretów "
 "VPN."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -296,7 +296,7 @@ msgstr ""
 "\n"
 "Połączenie VPN „%s” się nie powiodło z powodu nieprawidłowych sekretów VPN."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -305,7 +305,7 @@ msgstr ""
 "\n"
 "Połączenie VPN „%s” się nie powiodło."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -316,7 +316,7 @@ msgstr ""
 "Połączenie VPN „%s” rozłączone, ponieważ połączenie sieciowe zostało "
 "przerwane."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -325,7 +325,7 @@ msgstr ""
 "\n"
 "Połączenie VPN „%s” rozłączone, ponieważ usługa VPN została zatrzymana."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -334,7 +334,7 @@ msgstr ""
 "\n"
 "Połączenie VPN „%s” zostało rozłączone."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -345,19 +345,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Połączenie VPN zostało pomyślnie ustanowione.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Wiadomość logowania VPN"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Połączenie VPN się nie powiodło"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -371,7 +371,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -384,549 +384,543 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "urządzenie nie jest gotowe (brak oprogramowania sprzętowego)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "urządzenie nie jest gotowe"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "rozłączone"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Rozłącz"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "urządzenie nieobsługiwane"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Brak dostępnych urządzeń sieciowych"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Połączenia _VPN"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "S_konfiguruj VPN…"
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Rozłącz VPN"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Usługa NetworkManager nie jest uruchomiona…"
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Sieć jest wyłączona"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "_Sieć"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Sieć _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Sieć _komórkowa"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "P_owiadomienia"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "I_nformacje o połączeniu"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Modyfikuj połączenia…"
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "Pomo_c"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_O programie"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Połączono z „%s”."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Rozłączony"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Połączenie sieciowe zostało rozłączone."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Przygotowywanie połączenia sieciowego „%s”…"
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Wymagane uwierzytelnienie dla połączenia sieciowego „%s”…"
 
-#: ../src/applet.c:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Żądanie adresu sieciowego dla „%s”…"
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Nawiązano połączenie sieciowe „%s”"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Nawiązywanie połączenia VPN „%s”…"
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Wymagane uwierzytelnienie dla połączenia VPN „%s”…"
 
-#: ../src/applet.c:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Żądanie adresu VPN dla „%s”…"
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Nawiązano połączenie VPN „%s”"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Brak połączenia sieciowego"
 
-#: ../src/applet.c:3384
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Aplet NetworkManager"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Błędny kod PUK. Proszę skontaktować się z dostawcą."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Błędny kod PIN. Proszę skontaktować się z dostawcą."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Wysyłanie kodu odblokowania…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Komórkowe (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Komórkowe"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Dostępne"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Nowe połączenie komórkowe…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Ustanowiono połączenie"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Połączono z siecią komórkową."
 
-#: ../src/applet-device-broadband.c:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Sieć komórkowa."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Zarejestrowano w sieci domowej."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Zarejestrowano w sieci roamingowej."
 
-#: ../src/applet-device-bt.c:93
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Połączono z siecią komórkową."
 
-#: ../src/applet-device-bt.c:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Przygotowywanie połączenia komórkowego „%s”…"
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Konfigurowanie połączenia komórkowego „%s”…"
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Wymagane uwierzytelnienie dla połączenia komórkowego „%s”…"
 
-#: ../src/applet-device-bt.c:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Nawiązano połączenie komórkowe „%s”"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatyczne połączenie ethernetowe"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Sieci ethernetowe (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Sieć ethernetowa (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Sieci ethernetowe"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Sieć ethernetowa"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Połączono z siecią ethernetową."
 
-#: ../src/applet-device-ethernet.c:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Przygotowywanie ethernetowego połączenia sieciowego „%s”…"
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Konfigurowanie ethernetowego połączenia sieciowego „%s”…"
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr ""
 "Wymagane uwierzytelnienie dla ethernetowego połączenia sieciowego „%s”…"
 
-#: ../src/applet-device-ethernet.c:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Żądanie ethernetowego adresu sieciowego dla „%s”…"
 
-#: ../src/applet-device-ethernet.c:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Nawiązano ethernetowe połączenie sieciowe „%s”"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Uwierzytelnianie DSL"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Połącz z ukrytą siecią Wi-Fi…"
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Utwórz _nową sieć Wi-Fi…"
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(brak)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Sieci Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Sieć Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Sieć Wi-Fi"
 msgstr[1] "Sieci Wi-Fi"
 msgstr[2] "Sieci Wi-Fi"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi jest wyłączone"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi jest wyłączone przez przełącznik sprzętowy"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Więcej sieci"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Dostępne sieci Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Należy użyć menu sieci, aby połączyć z siecią Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1237
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Połączono z siecią Wi-Fi „%s”."
 
-#: ../src/applet-device-wifi.c:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Przygotowywanie połączenia sieciowego Wi-Fi „%s”…"
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Konfigurowanie połączenia sieciowego Wi-Fi „%s”…"
 
-#: ../src/applet-device-wifi.c:1275
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Wymagane uwierzytelnienie dla sieci Wi-Fi „%s”…"
 
-#: ../src/applet-device-wifi.c:1278
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Żądanie adresu sieciowego Wi-Fi dla „%s”…"
 
-#: ../src/applet-device-wifi.c:1289
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Nawiązano bezprzewodowe połączenie sieciowe Wi-Fi „%s”: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Nawiązano połączenie sieciowe Wi-Fi „%s”"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Aktywowanie połączenia się nie powiodło"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Dodanie nowego połączenia się nie powiodło"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Błąd podczas wyświetlania informacji o połączeniu:"
 
-#: ../src/applet-dialogs.c:75 ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamiczny WEP"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Więcej adresów"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Brak"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (domyślnie)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nieznana"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "Adres IP:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Adres rozgłoszeniowy:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nieznana"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Maska podsieci:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "Wi-Fi 802.11 (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Ogólne"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interfejs:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Adres sprzętowy:"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Sterownik:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Prędkość:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Zabezpieczenia:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Domyślna trasa:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorowanie"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Typ VPN:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Brama VPN:"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Nazwa użytkownika VPN:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Baner VPN:"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Podstawowe połączenie:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nieznane"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Nie odnaleziono prawidłowych aktywnych połączeń."
 
-#: ../src/applet-dialogs.c:977
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -936,44 +930,44 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "oraz wielu innych współtwórców i tłumaczy społeczności"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Aplet obszaru powiadamiania do zarządzania urządzeniami i połączeniami "
 "sieciowymi."
 
-#: ../src/applet-dialogs.c:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Witryna programu NetworkManager"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Brakujące zasoby"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Hasło do sieci komórkowej"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Wymagane hasło do połączenia z „%s”."
 
-#: ../src/applet-dialogs.c:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Wymagany kod PIN odblokowania karty SIM"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "Wymagany kod PIN odblokowania karty SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -981,25 +975,25 @@ msgid ""
 msgstr "Urządzenie komórkowe „%s” wymaga kodu PIN karty SIM przed użyciem."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Kod PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Wyświetlanie kodu PIN"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Wymagany kod PUK odblokowania karty SIM"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "Wymagany kod PUK odblokowania karty SIM"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1007,22 +1001,22 @@ msgid ""
 msgstr "Urządzenie komórkowe „%s” wymaga kodu PUK karty SIM przed użyciem."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Kod PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Nowy kod PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Proszę ponownie wprowadzić nowy kod PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Wyświetlanie kodów PIN/PUK"
 
@@ -1063,7 +1057,7 @@ msgstr "_Dodaj"
 #: ../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:697
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Usuń"
 
@@ -1165,7 +1159,7 @@ msgstr "_Tryb:"
 #: ../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:681
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
@@ -1282,57 +1276,57 @@ msgstr "_Maksymalny wiek:"
 msgid "_Aging time:"
 msgstr "Czas _starzenia:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatycznie"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "domyślne"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "nieokreślony błąd"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "Adres MAC"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "Adres HW"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "nieprawidłowe %s dla %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:486
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "nieprawidłowe %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "nieprawidłowe „interface-name” dla %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "nieprawidłowe „interface-name” (%s)"
 
-#: ../src/connection-editor/ce-page.c:487
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "urządzenie"
 
-#: ../src/connection-editor/ce-page.c:593
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Zaktualizowanie ustawień połączenia się nie powiodło z powodu nieznanego "
@@ -1555,8 +1549,8 @@ msgstr "_Wyświetlanie hasł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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1568,8 +1562,8 @@ msgstr "_Hasło:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatycznie"
@@ -1653,34 +1647,38 @@ msgid "De_fault"
 msgstr "_Domyślne"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr "_Ignorowanie"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Rozgłaszanie"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_ARP"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "_Magiczne"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "_Hasło przebudzania przez LAN:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1724,8 +1722,8 @@ msgstr "Automatycznie z ręcznymi ustawieniami DNS"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Ręczne"
 
@@ -1736,8 +1734,8 @@ msgstr "Link-Local"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Współdzielone z innymi komputerami"
 
@@ -1776,15 +1774,15 @@ msgstr "Identyfikator klienta 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:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "Dom_eny wyszukiwania:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Serwery _DNS:"
 
@@ -1814,7 +1812,7 @@ msgid "_Routes…"
 msgstr "_Trasy…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Wyłączone"
 
@@ -2055,7 +2053,7 @@ msgstr "Pa_smo:"
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Brak upoważnienia polkit do wykonania działania"
 
@@ -2112,78 +2110,78 @@ msgstr ""
 "metody uwierzytelniania. Jeśli połączenie zawodzi, proszę spróbować wyłączyć "
 "obsługę niektórych metod."
 
-#: ../src/connection-editor/connection-helpers.c:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:126
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Łączenie"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Zespołowe"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Mostek"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:597 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Sprzętowe"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Wirtualne"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Zaimportuj zapisaną konfigurację VPN…"
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2191,77 +2189,77 @@ msgstr ""
 "Nie można zainicjować okna dialogowego edytora połączeń z powodu nieznanego "
 "błędu."
 
-#: ../src/connection-editor/connection-helpers.c:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Nie można utworzyć nowego połączenia"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Usunięcie połączenia się nie powiodło"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Na pewno usunąć połączenie %s?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Adres"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Maska sieci"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Brama"
 
 # http://en.wikipedia.org/wiki/Metrics_(networking)
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Parametry"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Przedrostek"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Modyfikowanie %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Modyfikowanie połączenia bez nazwy"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Brak nazwy połączenia"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Inicjowanie edytora…"
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "Nie można modyfikować połączenia"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Nieprawidłowe ustawienie %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2269,37 +2267,37 @@ msgstr ""
 "Edytor połączeń nie może odnaleźć niektórych wymaganych zasobów (plik .ui "
 "nie został odnaleziony)."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Zapis zmian dokonanych na tym połączeniu."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Należy się uwierzytelnić, aby zapisać to połączenie dla wszystkich "
 "użytkowników komputera."
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Nie można utworzyć połączenia"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Nie można zmodyfikować połączenia"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Nieznany błąd podczas tworzenia okna dialogowego edytora połączeń."
 
-#: ../src/connection-editor/nm-connection-editor.c:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Błąd podczas inicjowania edytora"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Dodanie połączenia się nie powiodło"
 
@@ -2315,17 +2313,17 @@ msgstr "_Nazwa połączenia:"
 msgid "_Export..."
 msgstr "Wye_ksportuj…"
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nigdy"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "teraz"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2333,7 +2331,7 @@ msgstr[0] "%d minutę temu"
 msgstr[1] "%d minuty temu"
 msgstr[2] "%d minut temu"
 
-#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2341,7 +2339,7 @@ msgstr[0] "%d godzinę temu"
 msgstr[1] "%d godziny temu"
 msgstr[2] "%d godzin temu"
 
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2349,7 +2347,7 @@ msgstr[0] "%d dzień temu"
 msgstr[1] "%d dni temu"
 msgstr[2] "%d dni temu"
 
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2357,7 +2355,7 @@ msgstr[0] "%d miesiąc temu"
 msgstr[1] "%d miesiące temu"
 msgstr[2] "%d miesięcy temu"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2365,116 +2363,116 @@ msgstr[0] "%d rok temu"
 msgstr[1] "%d lata temu"
 msgstr[2] "%d lat temu"
 
-#: ../src/connection-editor/nm-connection-list.c:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Ostatnie użycie"
 
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Modyfikowanie zaznaczonego połączenia"
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Należy się uwierzytelnić, aby modyfikować zaznaczone połączenie"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Usunięcie zaznaczonego połączenia"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Należy się uwierzytelnić, aby usunąć zaznaczone połączenie"
 
-#: ../src/connection-editor/nm-connection-list.c:924
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Żadna wtyczka VPN nie jest zainstalowana."
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Nie wiadomo, jak utworzyć połączenia „%s”"
 
-#: ../src/connection-editor/nm-connection-list.c:928
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Błąd podczas tworzenia połączenia"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Błąd podczas modyfikowania połączenia"
 
-#: ../src/connection-editor/nm-connection-list.c:951
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Nie odnaleziono połączenia z UUID „%s”"
 
-#: ../src/connection-editor/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Zabezpieczenia 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "Nie można wczytać interfejsu użytkownika zabezpieczeń 802.1x."
 
-#: ../src/connection-editor/page-8021x-security.c:128
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Użycie zabezpieczeń 802.1_X dla tego połączenia"
 
-#: ../src/connection-editor/page-bluetooth.c:61
+#: ../src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Adres MAC urządzenia Bluetooth. Przykład: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:128
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Nie można wczytać interfejsu użytkownika Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:178
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "nieprawidłowe urządzenie Bluetooth (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:261
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Połączenie Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:305
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Typ Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:323
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Wybór typu profilu połączenia Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:328
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "Sieć osobista _PAN"
 
-#: ../src/connection-editor/page-bluetooth.c:333
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "Sieć modemowa _DUN"
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Nie można wczytać interfejsu użytkownika łączenia."
 
-#: ../src/connection-editor/page-bond.c:568
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "główne"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Łączone połączenie %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Nie można wczytać interfejsu użytkownika mostkowania."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Mostkowane połączenie %d"
@@ -2482,32 +2480,32 @@ msgstr "Mostkowane połączenie %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Port mostkowania"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Nie można wczytać interfejsu użytkownika portu mostkowania."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Nie można wczytać interfejsu użytkownika DCB."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Nie można wczytać interfejsu użytkownika DSL."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Połączenie DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:77
+#: ../src/connection-editor/page-ethernet.c:74
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"em1\", "
@@ -2517,37 +2515,37 @@ msgstr ""
 "nazwę interfejsu i/lub trwały adres MAC. Przykłady: „em1”, "
 "„3C:97:0E:42:1A:19”, „em1 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-ethernet.c:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Nie można wczytać interfejsu użytkownika połączenia ethernetowego."
 
-#: ../src/connection-editor/page-ethernet.c:447
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "urządzenie ethernetowe"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:744
-#: ../src/connection-editor/page-wifi.c:583
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "sklonowany adres MAC"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Hasło przebudzania przez LAN"
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Połączenie ethernetowe %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:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Domyślne"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2557,15 +2555,15 @@ msgstr ""
 "wybranie jej powoduje użycie domyślnej strefy ustawionej w zaporze "
 "sieciowej. Można tego używać tylko, jeśli usługa firewalld jest aktywna."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "Usługa firewalld nie jest uruchomiona."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Nie można wczytać interfejsu użytkownika karty ogólnej."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2577,152 +2575,152 @@ 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:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Nie można wczytać interfejsu użytkownika InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 msgid "infiniband device"
 msgstr "urządzenie InfiniBand"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Połączenie InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatycznie (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Automatycznie (VPN), tylko adresy"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automatycznie, tylko adresy"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatycznie (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automatycznie (PPPoE), tylko adresy"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatycznie (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automatycznie (DHCP), tylko adresy"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Tylko Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "_Dodatkowe serwery DNS:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Dodatkowe dom_eny wyszukiwania:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Modyfikowanie tras IPv4 dla %s"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Ustawienia IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Nie można wczytać interfejsu użytkownika IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "Adres IPv4 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "Maska sieci adresu IPv4 „%s” jest nieprawidłowa"
 
-#: ../src/connection-editor/page-ip4.c:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "Brama IPv4 „%s” jest nieprawidłowa"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "Serwer DNS IPv4 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorowanie"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatycznie, tylko DHCP"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Modyfikowanie tras IPv6 dla %s"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Ustawienia IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Nie można wczytać interfejsu użytkownika IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "Adres IPv6 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "Przedrostek IPv6 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "Brama IPv6 „%s” jest nieprawidłowa"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "Serwer DNS IPv6 „%s” jest nieprawidłowy"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Podwójne podrzędne"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "Podrzędne „%s” i „%s” stosują się do urządzenia „%s”"
 
-#: ../src/connection-editor/page-master.c:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2731,25 +2729,25 @@ msgstr ""
 "Podrzędne „%s” i „%s” stosują się do różnych wirtualnych portów („%s” i "
 "„%s”) tego samego fizycznego urządzenia."
 
-#: ../src/connection-editor/page-master.c:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s podrzędny %d"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Nie można wczytać interfejsu użytkownika połączeń komórkowych."
 
-#: ../src/connection-editor/page-mobile.c:330
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Nieobsługiwany typ połączenia komórkowego."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Wybór typu dostawcy połączenia komórkowego"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2757,85 +2755,85 @@ msgstr ""
 "Proszę wybrać technologię używaną przez dostawcę połączenia komórkowego. W "
 "razie wątpliwości należy zapytać dostawcę."
 
-#: ../src/connection-editor/page-mobile.c:564
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Dostawca używa technologii opartej na _GSM (np. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Dostawca używa technologii opartej na C_DMA (np. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "brak"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Modyfikowanie metod uwierzytelniania PPP dla %s"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Ustawienia PPP"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Nie można wczytać interfejsu użytkownika PPP."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Wybór pliku do zaimportowania"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Błąd: plik nie zawiera prawidłowej konfiguracji JSON"
 
-#: ../src/connection-editor/page-team.c:272
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Nie można wczytać interfejsu użytkownika zespołu."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Połączenie zespołowe %d"
@@ -2843,56 +2841,56 @@ msgstr "Połączenie zespołowe %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:154
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Port zespołowy"
 
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:153
 msgid "Could not load team port user interface."
 msgstr "Nie można wczytać interfejsu użytkownika portu zespołowego."
 
 #. 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:417
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (przez „%s”)"
 
-#: ../src/connection-editor/page-vlan.c:429
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
 msgid "New connection..."
 msgstr "Nowe połączenie…"
 
-#: ../src/connection-editor/page-vlan.c:599
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Nie można wczytać interfejsu użytkownika VLAN."
 
-#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr "nadrzędny VLAN"
 
-#: ../src/connection-editor/page-vlan.c:800
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Połączenie VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Nie można wczytać interfejsu użytkownika VPN."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Nie można odnaleźć wtyczki usługi VPN dla „%s”."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Połączenie VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2902,11 +2900,11 @@ msgstr ""
 "\n"
 "Błąd: brak typu usługi VPN."
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Wybór typu połączenia VPN"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2916,7 +2914,7 @@ msgstr ""
 "połączenia VPN nie jest dostępny w liście, odpowiednia wtyczka VPN może nie "
 "być zainstalowana."
 
-#: ../src/connection-editor/page-wifi.c:80
+#: ../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"
@@ -2924,7 +2922,7 @@ msgstr ""
 "Ta opcja blokuje to połączenie do punktu dostępowego Wi-Fi (AP) określonego "
 "przez BSSID. Przykład: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:91
+#: ../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\", "
@@ -2934,81 +2932,81 @@ msgstr ""
 "nazwę interfejsu i/lub trwały adres MAC. Przykłady: „wlan0”, "
 "„3C:97:0E:42:1A:19”, „wlan0 (3C:97:0E:42:1A:19)”"
 
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Nie można wczytać interfejsu użytkownika Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "BSSID"
 
-#: ../src/connection-editor/page-wifi.c:579
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "urządzenie Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Połączenie Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "40/128-bitowy klucz WEP (szesnastkowy lub ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "128-bitowe hasło WEP"
 
-#: ../src/connection-editor/page-wifi-security.c:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "Dynamiczny WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA i WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA i WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Nie można wczytać interfejsu użytkownika Wi-Fi. Brak ustawienia Wi-Fi."
 
 # tłumaczenie całości jest okropnie długie, a to nazwa karty tylko i wyłącznie przy tworzeniu połączenia z nową siecią *bezprzewodową*, więc nie ma sensu przedłużać
-#: ../src/connection-editor/page-wifi-security.c:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Zabezpieczenia"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Nie można wczytać interfejsu użytkownika zabezpieczeń Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "brak SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Zabezpieczenie jest niezgodne z trybem ad-hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Nie można zaimportować połączenia VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3021,29 +3019,29 @@ msgstr ""
 "\n"
 "Błąd: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "nieznany błąd"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Plik o nazwie „%s” już istnieje."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "Za_mień"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Zastąpić połączenie %s zapisywanym połączeniem VPN?"
 
-#: ../src/connection-editor/vpn-helpers.c:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Nie można wyeksportować połączenia VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3054,11 +3052,11 @@ msgstr ""
 "\n"
 "Błąd: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Wyeksportuj połączenie VPN…"
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3082,33 +3080,33 @@ msgstr "Informacje o połączeniu"
 msgid "Active Network Connections"
 msgstr "Aktywne połączenia sieciowe"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
 "Połączenie komórkowe zostało skonfigurowane za pomocą poniższych ustawień:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.c:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Urządzenie:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.c:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Dostawca:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Plan:"
 
-#: ../src/libnma/nma-mobile-wizard.c:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3122,28 +3120,28 @@ msgstr ""
 "zmodyfikować, należy wybrać „Połączenia sieciowe” z menu System >> "
 "Preferencje."
 
-#: ../src/libnma/nma-mobile-wizard.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Potwierdzenie ustawień połączenia komórkowego"
 
-#: ../src/libnma/nma-mobile-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nie na liście"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "Pro_szę wybrać plan:"
 
-#: ../src/libnma/nma-mobile-wizard.c:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Wybr_ana nazwa punktu dostępowego (APN) planu:"
 
-#: ../src/libnma/nma-mobile-wizard.c:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3155,166 +3153,166 @@ msgstr ""
 "\n"
 "W razie wątpliwości dotyczących planu należy zapytać dostawcę o APN planu."
 
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Proszę wybrać plan taryfowy"
 
-#: ../src/libnma/nma-mobile-wizard.c:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Planu nie ma na liście…"
 
-#: ../src/libnma/nma-mobile-wizard.c:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "P_roszę wybrać dostawcę z listy:"
 
-#: ../src/libnma/nma-mobile-wizard.c:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Dostawca"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Dostawcy nie _ma na liście, należy wprowadzić go ręcznie:"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Dostawca:"
 
-#: ../src/libnma/nma-mobile-wizard.c:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 "Dostawca używa technologii GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Dostawca używa technologii CDMA (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.c:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Wybór dostawcy"
 
-#: ../src/libnma/nma-mobile-wizard.c:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "Lista krajów lub regionów:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Kraj lub region"
 
-#: ../src/libnma/nma-mobile-wizard.c:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Kraju nie ma na liście"
 
-#: ../src/libnma/nma-mobile-wizard.c:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Wybór kraju lub regionu dostawcy"
 
-#: ../src/libnma/nma-mobile-wizard.c:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Zainstalowane urządzenie GSM"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Zainstalowane urządzenie CDMA"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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 ""
 "Ten asystent pomaga w łatwym ustawieniu połączenia komórkowego z siecią 3G."
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Wymagane są następujące informacje:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Nazwa dostawcy połączenia komórkowego"
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Nazwa planu taryfowego"
 
-#: ../src/libnma/nma-mobile-wizard.c:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(w niektórych przypadkach) nazwa punktu dostępowego (APN) planu taryfowego"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Utworzenie połączenia dla _tego urządzenia komórkowego:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Dowolne urządzenie"
 
-#: ../src/libnma/nma-mobile-wizard.c:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Ustawienie połączenia komórkowego"
 
-#: ../src/libnma/nma-mobile-wizard.c:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nowe połączenie komórkowe"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Przechowywanie hasła tylko dla tego użytkownika"
 
-#: ../src/libnma/nma-ui-utils.c:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Przechowywanie hasła dla wszystkich użytkowników"
 
-#: ../src/libnma/nma-ui-utils.c:55 ../src/libnm-gtk/nm-ui-utils.c:620
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Pytanie o hasło za każdym razem"
 
-#: ../src/libnma/nma-ui-utils.c:56 ../src/libnm-gtk/nm-ui-utils.c:621
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Hasło nie jest wymagane"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Drugie hasło:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "_Trzecie hasło:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
 msgid "Sh_ow passwords"
 msgstr "_Wyświetlanie haseł"
 
-#: ../src/libnma/nma-wifi-dialog.c:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Kliknięcie połączy"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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"
@@ -3322,55 +3320,55 @@ msgstr ""
 "Brak hasła lub połączenie jest nieprawidłowe. W tym drugim przypadku należy "
 "najpierw zmodyfikować połączenie za pomocą programu nm-connection-editor"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nowe…"
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Brak"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Utwórz"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Do połączenia z siecią Wi-Fi „%s” wymagane są hasła lub klucze szyfrujące."
 
-#: ../src/libnma/nma-wifi-dialog.c:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wymagane uwierzytelnienie w sieci Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wymagane uwierzytelnienie w sieci Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Tworzenie nowej sieci Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nowa sieć Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Proszę wprowadzić nazwę sieci Wi-Fi, jaka ma zostać utworzona."
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Połączenie z ukrytą siecią Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Ukryta sieć Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3389,23 +3387,23 @@ msgstr "Połącze_nie:"
 msgid "Wi-Fi _adapter:"
 msgstr "_Adapter Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Przewodowe"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Kratowe OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3415,17 +3413,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Użycie:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3433,7 +3431,7 @@ msgstr ""
 "Ten program jest komponentem oprogramowania NetworkManager (https://wiki."
 "gnome.org/Projects/NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3441,152 +3439,152 @@ msgstr ""
 "Nie jest przeznaczony do uruchamiania w wierszu poleceń. Powinien być "
 "uruchamiany w środowisku GNOME."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nie włączono"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nie zarejestrowano"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Sieć domowa (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Sieć domowa"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "wyszukiwanie"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "odmowa rejestracji"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../src/mb-menu-item.c:159 ../src/mb-menu-item.c:165
 #, c-format
 msgid "%s (%s roaming)"
 msgstr "%s (roaming %s)"
 
-#: ../src/mb-menu-item.c:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Sieć roamingowa (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Sieć roamingowa"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "Kod PIN dla karty SIM „%s” w „%s”"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Wymagany kod PIN"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Wymagany kod PIN dla urządzenia dostępowego do sieci komórkowej"
 
-#: ../src/mobile-helpers.c:610
+#: ../src/mobile-helpers.c:619
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Połączenie komórkowe „%s” jest aktywne: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Połączenie %s"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr "nieokreślony błąd w zabezpieczeniach 802.1x (WPA-EAP)"
 
-#: ../src/wireless-security/eap-method.c:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "nieokreślony błąd podczas sprawdzania poprawności pliku eap-method"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:452
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr ""
 "Certyfikaty DER, PEM lub klucze prywatne PKCS#12 (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certyfikaty DER lub PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "brak pliku PAC EAP-FAST"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Wybierz plik PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Pliki PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Wszystkie pliki"
 
@@ -3622,32 +3620,32 @@ msgstr "Wewnętrzne uw_ierzytelnianie:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Automatyczne za_bezpieczanie PAC"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr "brak nazwy użytkownika EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "brak hasła EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "nieprawidłowy certyfikat CA EAP-PEAP: %s"
 
-#: ../src/wireless-security/eap-method-peap.c:69
+#: ../src/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "nieprawidłowy certyfikat CA EAP-PEAP: nie podano certyfikatu"
 
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Wybór certyfikatu CA…"
 
@@ -3675,46 +3673,46 @@ msgstr "Certyfikat CA nie jest _wymagany"
 msgid "PEAP _version:"
 msgstr "_Wersja PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "brak nazwy użytkownika EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "brak hasła EAP"
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "brak tożsamości EAP-TLS"
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "nieprawidłowy certyfikat CA EAP-TLS: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "nieprawidłowy certyfikat CA EAP-TLS: nie podano certyfikatu"
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "nieprawidłowe hasło EAP-TLS: brak"
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "nieprawidłowe „private-key” EAP-TLS: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "nieprawidłowe „user-certificate” EAP-TLS: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Niezaszyfrowane klucze prywatne są niezabezpieczone"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3728,11 +3726,11 @@ msgstr ""
 "\n"
 "(można ochronić klucz prywatny hasłem za pomocą oprogramowania OpenSSL)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Wybór prywatnego certyfikatu…"
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Wybór klucza prywatnego…"
 
@@ -3752,36 +3750,36 @@ msgstr "_Klucz prywatny:"
 msgid "_Private key password:"
 msgstr "_Hasło klucza prywatnego:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "nieprawidłowy certyfikat CA EAP-TTLS: %s"
 
-#: ../src/wireless-security/eap-method-ttls.c:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "nieprawidłowy certyfikat CA EAP-TTLS: nie podano certyfikatu"
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1x security"
 msgstr "Nieznany błąd podczas sprawdzania poprawności zabezpieczeń 802.1x"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunelowane TLS"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Chronione EAP (PEAP)"
 
@@ -3791,11 +3789,11 @@ msgstr "Chronione EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Uwierzy_telnianie:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "brak „leap-username”"
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "brak „leap-password”"
 
@@ -3859,7 +3857,7 @@ msgstr "_Wyświetlanie klucza"
 msgid "WEP inde_x:"
 msgstr "Inde_ks WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3868,7 +3866,7 @@ msgstr ""
 "nieprawidłowe „wpa-psk”: nieprawidłowe „key-length” %zu. Musi wynosić [8,63] "
 "bajty lub 64 cyfry szesnastkowe"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "nieprawidłowe „wpa-psk”: nie można zinterpretować klucza o 64 bajtach jako "
diff --git a/po/pt.po b/po/pt.po
index 57df560f..624c03d4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.8\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2015-12-19 01:54+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -21,7 +20,7 @@ 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:3256
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Rede"
 
@@ -155,7 +154,7 @@ msgstr ""
 "O programa nm-connection-editor trabalha com o Gestor de redes para criar e "
 "editar perfis de ligação existentes."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticação 802.1x"
 
@@ -177,45 +176,45 @@ msgstr "_Ligar"
 msgid "_Network name:"
 msgstr "_Nome da rede:"
 
-#: ../src/ap-menu-item.c:87
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "segura."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Falha ao adicionar/ativar ligação"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Ligação falhou"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Falha ao desligar dispositivo"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Falha ao desligar"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Falha ao ativar a ligação"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Não mostrar esta mensagem novamente"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -225,7 +224,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou porque a ligação de rede foi interrompida."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -234,7 +233,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou porque o serviço VPN parou inesperadamente."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -245,7 +244,7 @@ msgstr ""
 "A ligação VPN \"%s\" falhou porque o serviço VPN devolveu uma configuração "
 "inválida."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -254,7 +253,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou porque a tentativa de ligação expirou."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -263,7 +262,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\"  falhou porque o serviço VPN não se iniciou a tempo."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -272,7 +271,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou porque o serviço VPN falhou ao iniciar."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -281,7 +280,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou porque não haviam segredos VPN válidos."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -290,7 +289,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou por causa de segredos VPN inválidos."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -299,7 +298,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" falhou."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -309,7 +308,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" desligou-se porque a ligação de rede foi interrompida."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -318,7 +317,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" desligou-se porque o serviço VPN parou."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -327,7 +326,7 @@ msgstr ""
 "\n"
 "A ligação VPN \"%s\" desligou-se."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -338,19 +337,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "A ligação VPN foi estabelecida com sucesso.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Mensagem de início de sessão VPN"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Ligação VPN falhou"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -363,7 +362,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -376,550 +375,543 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "dispositivo não preparado (firmware em falta)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "dispositivo não preparado"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desligado"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Desligar"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "dispositivo não gerido"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Nenhum dispositivo de rede disponível"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Ligações _VPN"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Configurar VPN..."
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Desligar VPN"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "O Gestor de redes não está em execução..."
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Rede inativada"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Ativar a _Rede"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Ativar _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Ativar banda larga _Móvel"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Ativar n_Otificações"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Informação de ligação"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Editar ligações..."
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "A_Juda"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Encontra-se agora ligado a \"%s\"."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Desligado"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "A ligação de rede foi terminada."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "A preparar ligação de rede \"%s\"..."
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, 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:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "A pedir um endereço de rede para \"%s\"..."
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Ligação de rede \"%s\" ativa"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "A iniciar ligação VPN \"%s\"..."
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, 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:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "A pedir um endereço de rede VPN para \"%s\"..."
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Ligação VPN \"%s\" ativa"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Sem ligação à rede"
 
-#: ../src/applet.c:3382
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Aplicação Gestor de redes"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Código PUK errado; por favor, contacte o seu fornecedor."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 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:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "A enviar código de desbloqueio..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda larga móvel (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Banda larga móvel"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Disponível"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 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:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Ligação estabelecida"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 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:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Rede de banda larga móvel."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Encontra-se agora registado na rede de casa."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Encontra-se agora registado numa rede de roaming."
 
-#: ../src/applet-device-bt.c:93
+#: ../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:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "A preparar ligação de banda larga móvel \"%s\"..."
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "A configurar ligação de banda larga móvel \"%s\"..."
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Ligação de banda larga móvel \"%s\" ativa"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automática"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Redes Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Rede Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Redes Ethernet"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Rede Ethernet"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../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:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "A preparar a ligação de rede ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "A configurar a ligação de rede ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, 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:172
+#: ../src/applet-device-ethernet.c:170
 #, 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:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Ligação de rede ethernet \"%s\" ativa"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticação DSL"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Ligar-se a rede Wi-Fi oculta..."
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Criar uma _Nova rede Wi-Fi..."
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Redes Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rede Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rede Wi-Fi"
 msgstr[1] "Redes Wi-Fi"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi está desativada"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi está desativada por interruptor físico"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Mais redes"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Redes Wi-Fi disponíveis"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 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:1237
+#: ../src/applet-device-wifi.c:1364
 #, 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:1269
+#: ../src/applet-device-wifi.c:1399
 #, 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:1272
+#: ../src/applet-device-wifi.c:1402
 #, 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:1275
+#: ../src/applet-device-wifi.c:1405
 #, 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:1278
+#: ../src/applet-device-wifi.c:1408
 #, 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:1289
+#: ../src/applet-device-wifi.c:1419
 #, 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:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Ligação de rede Wi-Fi \"%s\" ativa"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Falha ao ativar a ligação"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Falha ao adicionar uma nova ligação"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Erro ao mostrar informação de ligação:"
 
-#: ../src/applet-dialogs.c:75
-#: ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP Dinâmico"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Mais endereços"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (predefinição)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "Endereço IP:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Endereço de Broadcast:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Máscara de subrede:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Geral"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Ambiente:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Endereço físico (MAC):"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Controlador:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Segurança:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Rota predefinida:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Tipo de VPN:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Gateway VPN:"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Utilizador VPN:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Anúncio VPN:"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Ligação base:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Nenhuma ligação ativa válida encontrada!"
 
-#: ../src/applet-dialogs.c:977
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -929,44 +921,44 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "e muitos outros contribuintes e tradutores da comunidade"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 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:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Página web do Gestor de redes"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Faltam recursos"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Senha da rede de banda larga móvel"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "É necessária uma senha para ligar a \"%s\"."
 
-#: ../src/applet-dialogs.c:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Necessário desbloqueio do PIN"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 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:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -976,25 +968,25 @@ msgstr ""
 "poder ser usado."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Código PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Mostrar código PIN"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Necessário desbloqueio do PUK"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 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:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1004,22 +996,22 @@ msgstr ""
 "poder ser usado."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Código PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Novo código PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Reinsira o novo código PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Mostrar códigos PIN/PUK"
 
@@ -1060,7 +1052,7 @@ msgstr "_Adicionar"
 #: ../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:697
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Eliminar"
 
@@ -1083,8 +1075,7 @@ msgstr ""
 "Se ativado, esta ligação nunca será usada com a ligação de rede predefinida."
 
 #: ../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/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
@@ -1161,7 +1152,7 @@ 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:5
-#: ../src/connection-editor/nm-connection-list.c:681
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -1278,57 +1269,57 @@ msgstr "Idade _Máxima:"
 msgid "_Aging time:"
 msgstr "Tempo de _Envelhecimento:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automático"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "predefinição"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "Erro não especificado"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "Endereço MAC"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "Endereço HW"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "inválido %s para %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:482
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "inválido %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "nome de ambiente inválido para %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "nome de ambiente inválido (%s)"
 
-#: ../src/connection-editor/ce-page.c:483
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "dispositivo"
 
-#: ../src/connection-editor/ce-page.c:589
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Impossível atualizar segredos da ligação devido a um desconhecido."
 
@@ -1545,8 +1536,8 @@ 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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1558,8 +1549,8 @@ msgstr "_Senha:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automático"
@@ -1643,34 +1634,39 @@ msgid "De_fault"
 msgstr "Prede_Finição"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorar"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_Ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "Ma_Gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "Senha de _Acordar na LAN:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1713,8 +1709,8 @@ msgstr "Automático com definições de DNS manuais"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manual"
 
@@ -1725,8 +1721,8 @@ msgstr "Link-Local"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Partilhada com outros computadores"
 
@@ -1765,15 +1761,15 @@ msgstr "ID do cliente 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:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "Domínios de _procura:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Servidores _DNS:"
 
@@ -1804,7 +1800,7 @@ msgid "_Routes…"
 msgstr "_Rotas..."
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Desativado"
 
@@ -1949,12 +1945,10 @@ msgid "_Parent interface:"
 msgstr "Ambiente _Pai:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-#| msgid "VLAN interface _name:"
 msgid "VLAN inter_face name:"
 msgstr "_Nome do ambiente VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#| msgid "_Cloned MAC address:"
 msgid "Cloned MAC _address:"
 msgstr "Endereço MAC _Clonado:"
 
@@ -2048,7 +2042,7 @@ msgstr "Ban_Da:"
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../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."
 
@@ -2105,78 +2099,78 @@ msgstr ""
 "autenticação. Se a ligação falhar, tente desativar o suporte de alguns "
 "métodos."
 
-#: ../src/connection-editor/connection-helpers.c:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:110
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Associar"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Equipa"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Ponte"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:597 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Equipamento"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtual"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Importar uma ligação VPN gravada..."
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2184,76 +2178,76 @@ msgstr ""
 "Impossível inicializar diálogo do editor de ligação devido a um erro "
 "desconhecido."
 
-#: ../src/connection-editor/connection-helpers.c:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Impossível criar nova ligação"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Falha ao eliminar ligação"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Endereço"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Máscara de rede"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Métrico"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefixo"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "A editar %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "A editar ligação anónima"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Nome da ligação em falta"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "A inicializar editor..."
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "Impossível modificar ligação"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Definição inválida %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2261,37 +2255,37 @@ 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:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Gravar"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 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:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Impossível criar a ligação"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Impossível editar ligação"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 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:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Erro ao inicializar editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Adição de ligação falhou"
 
@@ -2307,156 +2301,161 @@ msgstr "_Nome da ligação:"
 msgid "_Export..."
 msgstr "_Exportar..."
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nunca"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "agora"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Última utilização"
 
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Editar a ligação selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentique-se para editar a ligação selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Eliminar a ligação selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentique-se para eliminar a ligação selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:924
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Não tem extensões VPN instaladas"
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:928
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Erro ao criar ligação"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Erro ao editar ligação"
 
-#: ../src/connection-editor/nm-connection-list.c:951
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Segurança 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 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:128
+#: ../src/connection-editor/page-8021x-security.c:125
 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:112
+#: ../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
 msgid "Could not load Bluetooth user interface."
 msgstr "Impossível carregar o ambiente de utilizador de Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:150
-msgid "bdaddr"
-msgstr "bdaddr"
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "incapaz de encontrar o dispositivo Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:228
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Ligação Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:272
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Tipo de Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:290
+#: ../src/connection-editor/page-bluetooth.c:320
 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:295
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "Rede de área _Pessoal"
 
-#: ../src/connection-editor/page-bluetooth.c:300
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "Rede por _Modem"
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 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:566
 msgid "primary"
 msgstr "primário"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Ligação associada %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Impossível carregar o ambiente de utilizador de ponte."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Ligação de ponte %d"
@@ -2464,32 +2463,32 @@ 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:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Porta da ponte"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 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:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Impossível carregar o ambiente de utilizador de DCB."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Impossível carregar o ambiente de utilizador de DSL."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Ligação DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:77
+#: ../src/connection-editor/page-ethernet.c:74
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"em1\", "
@@ -2499,37 +2498,37 @@ 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:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Impossível carregar o ambiente de utilizador de ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:447
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:744
-#: ../src/connection-editor/page-wifi.c:583
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "MAC clonado"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Senha de Acordar na LAN"
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:55
-#: ../src/libnma/nma-mobile-providers.c:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Predefinição"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2539,15 +2538,15 @@ 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD não está em execução."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Impossível carregar o ambiente de utilizador geral."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2560,152 +2559,152 @@ 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:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Impossível carregar o ambiente de utilizador de InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 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-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automático (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Só endereços automáticos (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automático, apenas endereços"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automático (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Só endereços automáticos (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automático (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Só endereços automáticos (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Só Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Servidores _DNS adicionais:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Domínios de _Procura adicionais:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "A editar rotas IPv4 para %s"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Definições IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Impossível carregar ambiente de utilizador IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "Endereço \"%s\" IPv4 inválido"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, 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:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "Gateway IPv4 \"%s\" inválida"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "Servidor DNS IPv4 \"%s\" inválido"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automático, só DHCP"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "A editar rotas IPv6 para %s"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Definições IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Impossível carregar ambiente de utilizador IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "Endereço \"%s\" IPv6 inválido"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "Prefixo \"%s\" IPv6 inválido"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "Gateway IPv6 \"%s\" inválida"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "Servidor DNS IPv6 \"%s\" inválido"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Escravos duplicados"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, 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:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2714,25 +2713,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:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s escrava %d"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 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:330
+#: ../src/connection-editor/page-mobile.c:327
 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:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Selecione o tipo de fornecedor de banda larga móvel"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2740,86 +2739,86 @@ 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:564
+#: ../src/connection-editor/page-mobile.c:561
 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, "
 "HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 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:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "nenhum"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../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:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Definições PPP"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Impossível carregar ambiente de utilizador de PPP."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Selecione o ficheiro a importar"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Erro: o ficheiro não contém uma configuração JSON válida"
 
-#: ../src/connection-editor/page-team.c:272
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Impossível carregar o ambiente de utilizador de equipa."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Ligação de equipa %d"
@@ -2827,56 +2826,56 @@ 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:154
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Porta da equipa"
 
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:153
 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:417
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (via \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:429
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
 msgid "New connection..."
 msgstr "Nova ligação..."
 
-#: ../src/connection-editor/page-vlan.c:599
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Impossível carregar o ambiente de utilizador de vlan."
 
-#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr "Pai de vlan"
 
-#: ../src/connection-editor/page-vlan.c:800
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Ligação VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Impossível carregar ambiente de utilizador VPN."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Impossível encontrar um serviço de extensão VPN para \"%s\"."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Ligação VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2886,11 +2885,11 @@ msgstr ""
 "\n"
 "Erro: tipo de serviço VPN inexistente."
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Escolha um tipo de ligação VPN"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2900,7 +2899,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:80
+#: ../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"
@@ -2908,7 +2907,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:91
+#: ../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\", "
@@ -2918,82 +2917,82 @@ 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:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 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:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:579
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Dispositivo Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Ligação Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "WEP Dinâmico (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 pessoal"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 empresarial"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 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:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Segurança Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 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:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "SSID em falta"
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Segurança incompatível com o modo Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Impossível importar a ligação VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3006,29 +3005,29 @@ msgstr ""
 "\n"
 "Erro: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Um ficheiro de nome \"%s\" já existe."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Substituir"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Impossível exportar ligação VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3039,11 +3038,11 @@ msgstr ""
 "\n"
 "Erro: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exportar ligação VPN..."
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3067,8 +3066,8 @@ msgstr "Informação de ligação"
 msgid "Active Network Connections"
 msgstr "Ligações de rede ativas"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 ""
@@ -3076,25 +3075,25 @@ msgstr ""
 "definições:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.c:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../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:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../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:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3108,28 +3107,28 @@ msgstr ""
 "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:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Não listado"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../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:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3142,84 +3141,84 @@ msgstr ""
 "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:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "O meu plano não está listado..."
 
-#: ../src/libnma/nma-mobile-wizard.c:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Fornecedor"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 ""
 "Não consigo encontrar o meu fornecedor e quero introduzi-lo _Manualmente:"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../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:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../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:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../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:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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 fornecedor"
 
-#: ../src/libnma/nma-mobile-wizard.c:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3227,84 +3226,84 @@ 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:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "O nome do seu fornecedor de banda larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(em alguns casos) O APN (Nome do Ponto de Acesso) do seu tarifário de banda "
 "larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Criar uma ligação para es_Te dispositivo de banda larga móvel:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../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-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../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:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../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:55 ../src/libnm-gtk/nm-ui-utils.c:620
+#: ../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:56 ../src/libnm-gtk/nm-ui-utils.c:621
+#: ../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:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../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.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "_Senha terciária:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
+#: ../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-wifi-dialog.c:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Clique para ligar"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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"
@@ -3312,20 +3311,20 @@ 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:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nova..."
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_Riar"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3333,35 +3332,35 @@ msgstr ""
 "Senhas ou chaves de encriptação são necessárias para aceder à rede Wi-Fi \"%s"
 "\"."
 
-#: ../src/libnma/nma-wifi-dialog.c:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autenticação de rede Wi-Fi necessária"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autenticação pedida pela rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Criar uma nova rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nova rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Ligar a uma rede Wi-Fi oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Rede Wi-Fi oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3381,23 +3380,23 @@ msgstr "Ligaçã_O:"
 msgid "Wi-Fi _adapter:"
 msgstr "_Dispositivo de rede Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../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:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Malha OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3407,17 +3406,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3425,7 +3424,7 @@ msgstr ""
 "Este programa é um componente do Gestor de redes (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3433,151 +3432,151 @@ msgstr ""
 "Não está pensado para interação na linha de comandos mas sim para correr no "
 "ambiente GNOME."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "não ativo"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "não registado"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Rede doméstica (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Rede doméstica"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "a procurar"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registo negado"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Rede roaming (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Rede roaming"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, 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:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Necessário código PIN"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 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:610
+#: ../src/mobile-helpers.c:619
 #, 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:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Ligação %s"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 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:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "erro não especificado ao validar o ficheiro eap-method"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:452
 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:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificados DER ou PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "ficheiro EAP-FAST PAC em falta"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Escolha um ficheiro PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Ficheiros PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Todos os ficheiros"
 
@@ -3613,32 +3612,32 @@ msgstr "Autenticação _Interna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir apro_Visionamento PAC automático"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr "Utilizador EAP-LEAP em falta"
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "Senha EAP-LEAP em falta"
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../src/wireless-security/eap-method-peap.c:63
 #, 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
+#: ../src/wireless-security/eap-method-peap.c:68
 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:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Escolha um certificado de Autoridade Certificadora..."
 
@@ -3666,46 +3665,46 @@ msgstr "Não é necessá_Rio um certificado CA"
 msgid "PEAP _version:"
 msgstr "_Versão do PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "Utilizador EAP em falta"
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "Senha EAP em falta"
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "Identidade EAP-TLS em falta"
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "Certificado CA EAP-TLS inválido: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "certificado CA EAP-TLS inválido: sem certificado especificado"
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "Senha EAP-TLS inválida: em falta"
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "chave privada EAP-TLS inválida: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "certificado de utilizador EAP-TLS inválido: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Chaves privadas não encriptadas são inseguras"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3719,11 +3718,11 @@ msgstr ""
 "\n"
 "(pode proteger com senha a sua chave privada com openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Escolha o seu certificado pessoal..."
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Escolha a sua chave privada..."
 
@@ -3743,36 +3742,36 @@ msgstr "_Chave privada:"
 msgid "_Private key password:"
 msgstr "Senha da chave _Privada:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, 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
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "certificado CA EAP-TTLS inválido: sem certificado especificado"
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../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:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "TLS encapsulado"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP protegido (PEAP)"
 
@@ -3782,11 +3781,11 @@ msgstr "EAP protegido (PEAP)"
 msgid "Au_thentication:"
 msgstr "Au_Tenticação:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "leap-username em falta"
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "leap-password em falta"
 
@@ -3850,7 +3849,7 @@ msgstr "Mos_Trar chave"
 msgid "WEP inde_x:"
 msgstr "Índice _WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3859,7 +3858,7 @@ 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:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 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 "
@@ -3869,6 +3868,12 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Tipo:"
 
+#~ msgid "_Help"
+#~ msgstr "A_Juda"
+
+#~ msgid "bdaddr"
+#~ msgstr "bdaddr"
+
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Ativar banda larga móvel WiMA_X"
 
@@ -4246,9 +4251,6 @@ msgstr "_Tipo:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "Desconhece-se como editar ligações \"%s\""
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "incapaz de encontrar o dispositivo Bluetooth."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr ""
 #~ "Configuração Bluetooth impossível (falhou a criação de proxy D-Bus)."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7eeb222f..f51d0fbc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,24 +17,24 @@
 # Rafael Fontenelle <rffontenelle@gmail.com>, 2013, 2014, 2015.
 # Enrico Nicoletto <liverig@gmail.com>, 2013, 2014.
 # Felipe Braga <fbobraga@gmail.com>, 2015.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: network-nanager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-01-03 13:56+0000\n"
-"PO-Revision-Date: 2016-01-03 23:50-0200\n"
-"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
+"PO-Revision-Date: 2016-03-31 14:35-0200\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
-"X-Generator: Poedit 1.8.6\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3258
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Rede"
 
@@ -124,7 +124,7 @@ msgstr "Mostrar o miniaplicativo na área de notificação"
 msgid "Set to FALSE to disable displaying the applet in the notification area."
 msgstr ""
 "Defina como FALSO para desabilitar a exibição do miniaplicativo na área de "
-"notificação"
+"notificação."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
@@ -170,7 +170,7 @@ msgstr ""
 "O programa nm-connection-editor funciona com NetworkManager para criar e "
 "editar perfis de conexão existentes para NetworkManager."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Autenticação 802.1x"
 
@@ -192,45 +192,45 @@ msgstr "C_onectado"
 msgid "_Network name:"
 msgstr "_Nome da rede:"
 
-#: ../src/ap-menu-item.c:87
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "seguro."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Falha ao adicionar/ativar conexão"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Falha de conexão"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Desconexão de dispositivo falhou"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Falha ao desconectar"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Ativação da conexão falhou"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Não mostrar esta mensagem novamente"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -240,7 +240,7 @@ msgstr ""
 "\n"
 "A conexão VPN \"%s\" falhou porque a conexão de rede foi interrompida."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "A conexão VPN \"%s\" falhou porque o serviço de VPN parou inesperadamente."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -260,7 +260,7 @@ msgstr ""
 "A conexão VPN \"%s\" falhou porque o serviço VPN retornou uma configuração "
 "inválida."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -269,7 +269,7 @@ msgstr ""
 "\n"
 "A conexão VPN \"%s\" falhou porque esgotou o tempo de tentativas de conexão."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -278,7 +278,7 @@ msgstr ""
 "\n"
 "A conexão VPN \"%s\" falhou porque o serviço VPN não iniciou a tempo."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -287,7 +287,7 @@ msgstr ""
 "\n"
 "A conexão VPN \"%s\" falhou porque o serviço VPN falhou ao iniciar."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -296,7 +296,7 @@ msgstr ""
 "\n"
 "A conexão VPN \"%s\" falhou porque não haviam segredos VPN válidos."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -305,7 +305,7 @@ msgstr ""
 "\n"
 "A conexão VPN \"%s\" falhou por causa de chaves VPN inválidas."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -314,7 +314,7 @@ msgstr ""
 "\n"
 "A conexão VPN \"%s\" falhou."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -324,7 +324,7 @@ msgstr ""
 "\n"
 "A conexão VPN \"%s\" desconectou porque a conexão de rede foi interrompida."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -333,7 +333,7 @@ msgstr ""
 "\n"
 "A conexão VPN \"%s\" desconectou porque o serviço VPN parou."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -342,7 +342,7 @@ msgstr ""
 "\n"
 "A conexão VPN \"%s\" desconectou."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -353,19 +353,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "A conexão VPN foi estabelecida com sucesso.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Mensagem de login VPN"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "A conexão VPN falhou"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -378,7 +378,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -391,547 +391,541 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "dispositivo não está pronto (faltando firmware)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "dispositivo não está pronto"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "desconectado"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "dispositivo não gerenciado"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Nenhum dispositivo de rede disponível"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Conexões _VPN"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Configurar VPN..."
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Desconectar VPN"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "O gerenciador de redes não está em execução..."
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Rede desabilitada"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "_Habilitar rede"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Habilitar _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Habilitar banda larga _móvel"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Habilitar n_otificações"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Informações da conexão"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Editar conexões..."
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "Aj_uda"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Você agora está conectado a \"%s\"."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "A conexão de rede foi desconectada."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Preparando conexão de rede \"%s\"..."
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Autenticação necessária pela conexão de rede \"%s\"..."
 
-#: ../src/applet.c:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Requisitando um endereço de rede para \"%s\"..."
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Conexão de rede \"%s\" está ativa"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Iniciando conexão VPN \"%s\"..."
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Autenticação necessária pela conexão VPN \"%s\"..."
 
-#: ../src/applet.c:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Requisitando um endereço de rede VPN para \"%s\"..."
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Conexão VPN \"%s\" ativa"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Nenhuma conexão de rede"
 
-#: ../src/applet.c:3384
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Miniaplicativo gerenciador de redes"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Código PUK errado, por favor entre em contato com seu provedor."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Código PIN errado, por favor entre em contato com seu provedor."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Enviando código do desbloqueio..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Banda larga móvel (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Banda larga móvel"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Disponível"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Nova conexão de banda larga móvel..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Conexão estabelecida"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Você agora está conectado à rede de banda larga móvel."
 
-#: ../src/applet-device-broadband.c:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Rede de banda larga móvel."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Você agora está conectado à rede doméstica."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Você agora está conectado em uma rede em roaming."
 
-#: ../src/applet-device-bt.c:93
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Você agora está conectado à rede de banda larga móvel."
 
-#: ../src/applet-device-bt.c:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Preparando conexão de banda larga móvel \"%s\"..."
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Configurando conexão de banda larga móvel \"%s\"..."
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Autenticação necessária pela conexão de banda larga móvel \"%s\"..."
 
-#: ../src/applet-device-bt.c:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Conexão de banda larga móvel \"%s\" ativa"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automática"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Redes ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Rede ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Redes ethernet"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Rede ethernet"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Você agora está conectado à rede ethernet."
 
-#: ../src/applet-device-ethernet.c:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Preparando conexão de rede ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Configurando conexão de rede ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Autenticação necessária pela conexão de rede ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Requisitando um endereço na rede ethernet \"%s\"..."
 
-#: ../src/applet-device-ethernet.c:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Conexão de rede ethernet \"%s\" ativa"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autenticação DSL"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Conectar-se a rede Wi-Fi oculta..."
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Criar _nova rede Wi-Fi..."
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Redes Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Rede Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rede Wi-Fi"
 msgstr[1] "Rede Wi-Fi"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi está desabilitado"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi desabilitado por hardware"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Mais redes"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Redes Wi-Fi disponíveis"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Use o menu de rede para se conectar a uma rede Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1237
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Você agora está conectado à rede Wi-Fi \"%s\"."
 
-#: ../src/applet-device-wifi.c:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Preparando conexão de rede Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Configurando conexão de rede Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1275
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Autenticação necessária pela rede Wi-Fi \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1278
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Requisitando um endereço de rede Wi-Fi para \"%s\"..."
 
-#: ../src/applet-device-wifi.c:1289
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Conexão de rede Wi-Fi \"%s\" ativa: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Conexão de rede Wi-Fi \"%s\" ativa"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Falha ao ativar conexão"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Falha ao adicionar nova conexão"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Erro ao exibir informações de conexão:"
 
-#: ../src/applet-dialogs.c:75 ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP Dinâmico"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Mais endereços"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (padrão)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "Endereço IP:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Endereço de broadcast:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Máscara de subrede:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Geral"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Endereço de hardware:"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Segurança:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Rota padrão:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Tipo de VPN:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Gateway de VPN:"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Nome de usuário de VPN:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Mensagem VPN:"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Conexão base:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Nenhuma conexão ativa e válida localizada!"
 
-#: ../src/applet-dialogs.c:977
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -941,44 +935,44 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "e muitos outros contribuidores da comunidade e tradutores"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 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:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Site do Gerenciador de redes"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Recursos em falta"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Senha de rede de banda larga móvel"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, 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:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "É necessário informar o código SIM PIN do desbloqueio"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 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:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -988,25 +982,25 @@ msgstr ""
 "ele possa ser usado."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Código PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Exibir código PIN"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "É necessário informar o código SIM PUK de desbloqueio"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 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:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1016,22 +1010,22 @@ msgstr ""
 "possa ser usado."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Código PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Novo código PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 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:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Mostrar códigos PIN/PUK"
 
@@ -1072,7 +1066,7 @@ msgstr "_Adicionar"
 #: ../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:697
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "E_xcluir"
 
@@ -1173,7 +1167,7 @@ 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:5
-#: ../src/connection-editor/nm-connection-list.c:681
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -1291,57 +1285,57 @@ msgstr "Tempo _máximo de expiração:"
 msgid "_Aging time:"
 msgstr "Tempo de _vencimento:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automático"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "padrão"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "erro não especificado"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "Endereço MAC"
 
-#: ../src/connection-editor/ce-page.c:247
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "Endereço de HW"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%s inválido para %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:486
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "%s inválido (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "nome de interface inválido para %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "nome de interface inválido (%s)"
 
-#: ../src/connection-editor/ce-page.c:487
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "dispositivo"
 
-#: ../src/connection-editor/ce-page.c:593
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Falha ao atualizar as chaves de conexão devido a algum erro desconhecido."
@@ -1561,8 +1555,8 @@ 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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1574,8 +1568,8 @@ msgstr "Se_nha:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automático"
@@ -1658,38 +1652,42 @@ msgstr "Wake on LAN:"
 msgid "De_fault"
 msgstr "Pa_drão"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr "_Ignorar"
+
 # Phy refere-se à camada física do modelo OSI. Por ser uma abreviação comum,
 # mantivo o termo original -- Rafael Fontenelle
-#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Phy"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Broadcast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "Má_gico"
 
 # Wake on Lan = WoL, padrão normalmente usado assim mesmo em Português
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
-msgstr "_Senha de _Wake on LAN:"
+msgstr "Senha de _Wake on LAN:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1733,8 +1731,8 @@ msgstr "Automático com configurações de DNS manual"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manual"
 
@@ -1745,8 +1743,8 @@ msgstr "Conexão 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:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Compartilhado com outros computadores"
 
@@ -1785,15 +1783,15 @@ msgstr "ID do cliente 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:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "Pe_squisar domínios:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Servidores _DNS:"
 
@@ -1824,7 +1822,7 @@ msgid "_Routes…"
 msgstr "_Rotas…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Desativado"
 
@@ -1954,7 +1952,7 @@ msgstr "Configuração _JSON:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
 msgid "_Import team configuration from a file..."
-msgstr "Importar uma configuração de equipe de um arquivo..."
+msgstr "_Importar uma configuração de equipe de um arquivo..."
 
 # Ethernet Bonding = Port trunking = Link Aggregation = IEEE 802.3ad
 #: ../src/connection-editor/ce-page-team.ui.h:1
@@ -2067,7 +2065,7 @@ msgstr "Fai_xa:"
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Nenhuma autorização polkit para realizar a ação"
 
@@ -2123,79 +2121,79 @@ msgstr ""
 "Na maioria dos casos, os provedores PPP suportarão todos os métodos de "
 "autenticação. Se a conexão falhar, tente desabilitar alguns métodos."
 
-#: ../src/connection-editor/connection-helpers.c:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:126
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Agregação"
 
 # Link agreggation = Team Network
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Equipe"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Ponte"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:597 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtual"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Importar uma configuração de VPN salva..."
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2203,58 +2201,58 @@ msgstr ""
 "O diálogo de edição de conexões não pode ser inicializado devido a um erro "
 "desconhecido."
 
-#: ../src/connection-editor/connection-helpers.c:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Não foi possível criar a conexão"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "A exclusão da conexão falhou"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Você tem certeza que deseja excluir a conexão %s?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Endereço"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Máscara de rede"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Métrica"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefixo"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Editando %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Editando conexão sem nome"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Faltando nome da conexão"
 
@@ -2262,21 +2260,21 @@ msgstr "Faltando nome da conexão"
 # Resp.: assunto controverso... O dic. Houaiss recomenda "iniciar", mas registra
 # também "inicializar", que é adotado pelo Vocabulário Padrão. Já tivemos uma
 # discussão muito pouco produtiva sobre essa controvérsia.
-#: ../src/connection-editor/nm-connection-editor.c:190
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Erro de inicialização..."
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "A conexão não pôde ser modificada"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Configuração inválida %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2284,28 +2282,28 @@ msgstr ""
 "O editor de conexão não pôde localizar alguns recursos necessários (o "
 "arquivo .ui não foi localizado)."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Salvar"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Salvar qualquer alteração feita nesta conexão."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Autenticar para salvar esta conexão para todos os usuários desta máquina."
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Não foi possível criar uma conexão"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Não foi possível editar a conexão"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Erro desconhecido ao criar o diálogo de edição de conexão."
 
@@ -2313,11 +2311,11 @@ msgstr "Erro desconhecido ao criar o diálogo de edição de conexão."
 # Resp.: assunto controverso... O dic. Houaiss recomenda "iniciar", mas registra
 # também "inicializar", que é adotado pelo Vocabulário Padrão. Já tivemos uma
 # discussão muito pouco produtiva sobre essa controvérsia.
-#: ../src/connection-editor/nm-connection-editor.c:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Erro ao iniciar o editor"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "A criação da conexão falhou"
 
@@ -2333,161 +2331,161 @@ msgstr "_Nome da conexão:"
 msgid "_Export..."
 msgstr "_Exportar..."
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nunca"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "agora"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Usada em"
 
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Edita a conexão selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentique-se para editar a conexão selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Excluir a conexão selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentique-se para excluir a conexão selecionada"
 
-#: ../src/connection-editor/nm-connection-list.c:924
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Nenhum plug-in de VPN está instalado."
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Não foi possível criar as conexões \"%s\""
 
-#: ../src/connection-editor/nm-connection-list.c:928
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Erro ao criar conexão"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Erro editando conexão"
 
-#: ../src/connection-editor/nm-connection-list.c:951
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Não é possível encontrar a conexão com UUID \"%s\""
 
-#: ../src/connection-editor/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Segurança 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "Não foi possível carregar a interface gráfica de segurança 802.1x."
 
-#: ../src/connection-editor/page-8021x-security.c:128
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Usar protocolo de segurança 802.1_X para esta conexão"
 
-#: ../src/connection-editor/page-bluetooth.c:61
+#: ../src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Endereço MAC do dispositivo Bluetooth. Exemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:128
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Não foi possível carregar a interface gráfica de Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:178
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "dispositivo Bluetooth inválido (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:261
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Conexão Bluetooth %d"
 
-#: ../src/connection-editor/page-bluetooth.c:305
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Tipo de Bluetooth"
 
-#: ../src/connection-editor/page-bluetooth.c:323
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Selecione o tipo do perfil de conexão Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:328
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "Rede _Pessoal"
 
-#: ../src/connection-editor/page-bluetooth.c:333
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "Rede _discada"
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Não foi possível carregar a interface gráfica de agregação."
 
-#: ../src/connection-editor/page-bond.c:568
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "primário"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Conexão de agregação %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Não foi possível carregar a interface gráfica de ponte."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Conexão de ponte %d"
@@ -2496,32 +2494,32 @@ msgstr "Conexã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:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Porta da ponte"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Não foi possível carregar a interface gráfica de porta da ponte."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Não foi possível carregar a interface gráfica de DCB."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Não foi possível carregar a interface gráfica para DSL."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexão DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:77
+#: ../src/connection-editor/page-ethernet.c:74
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"em1\", "
@@ -2531,37 +2529,37 @@ msgstr ""
 "pelo nome da interface, 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:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Não foi possível carregar a interface gráfica de ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:447
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Dispositivo Ethernet"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:744
-#: ../src/connection-editor/page-wifi.c:583
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "MAC clonado"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Senha de Wake-on-LAN"
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
-msgstr "Conexão ethernet %d"
+msgstr "Conexão 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:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2571,15 +2569,15 @@ msgstr ""
 "comum. Selecionar isso resulta no uso da zona padrão definida no firewall. "
 "Usável apenas se firewalld estiver ativo."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD não está em execução."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Não foi possível carregar a interface gráfica geral."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2591,152 +2589,152 @@ 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:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Não foi possível carregar a interface gráfica do InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 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 "Conexão InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automático (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Somente endereços (VPN) automáticos"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automático, somente endereços"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automático (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Somente endereços (PPPoE) automáticos"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automático (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Somente endereços (DHCP) automáticos"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Apenas conexão local"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Servidores _DNS adicionais:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Pe_squisar domínios adicionais:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Editando rotas IPv4 para %s"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Configurações IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Não foi possível carregar a interface gráfica para IPv4."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "Endereço IPv4 \"%s\" inválido"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, 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:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "Gateway IPv4 \"%s\" inválido"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "Servidor DNS IPv4 \"%s\" inválido"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automático, somente DHCP"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editando rotas IPv6 para %s"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Configurações IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Não foi possível carregar a interface gráfica para IPv6."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "Endereço IPv6 \"%s\" inválido"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "Prefixo IPv6 \"%s\" inválido"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "Gateway IPv6 \"%s\" inválido"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "Servidor DNS IPv6 \"%s\" inválido"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Duplicar escravos"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, 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:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2745,25 +2743,25 @@ msgstr ""
 "Os escravos \"%s\" e \"%s\" se aplicam a portas virtuais diferentes (\"%s\" "
 "e \"%s\") do mesmo dispositivo físico."
 
-#: ../src/connection-editor/page-master.c:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s escravo %d"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Não foi possível carregar a interface gráfica para banda larga móvel."
 
-#: ../src/connection-editor/page-mobile.c:330
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Tipo de conexão de banda larga móvel não suportada."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Escolha o tipo de provedor da banda larga móvel"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2771,84 +2769,84 @@ msgstr ""
 "Escolha a tecnologia que seu provedor de banda larga móvel usa. Se você não "
 "tem certeza, pergunte a seu provedor."
 
-#: ../src/connection-editor/page-mobile.c:564
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
-msgstr "Meu provedor usa tecnologia _GSM ( ex.: 3G, GPRS, EDGE, UMTS, HSDPA)"
+msgstr "Meu provedor usa tecnologia _GSM (ex.: 3G, GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 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:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "nenhum"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Editando métodos de autenticação PPP para %s"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Configurações PPP"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Não foi possível carregar a interface gráfica para PPP."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Seleciona o arquivo a ser importado"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Erro: o arquivo não contém uma configuração válido de JSON"
 
-#: ../src/connection-editor/page-team.c:272
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Não foi possível carregar a interface gráfica de equipe."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Conexão de equipe %d"
@@ -2856,56 +2854,56 @@ msgstr "Conexão de equipe %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:154
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Porta de equipe"
 
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:153
 msgid "Could not load team port user interface."
 msgstr "Não foi possível carregar a interface gráfica de porta de equipe."
 
 #. 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:417
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (através de \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:429
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
 msgid "New connection..."
 msgstr "Nova conexão..."
 
-#: ../src/connection-editor/page-vlan.c:599
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Não foi possível carregar a interface gráfica para vlan."
 
-#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr "vlan pai"
 
-#: ../src/connection-editor/page-vlan.c:800
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Conexão VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Não foi possível carregar a interface gráfica para VPN."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Não foi possível encontrar o plug-in de serviço VPN para \"%s\"."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexão VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2915,11 +2913,11 @@ msgstr ""
 "\n"
 "Erro: nenhum tipo de serviço VPN."
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Escolha o tipo de conexão VPN"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2929,7 +2927,7 @@ msgstr ""
 "de conexão VPN não estiver disponível, talvez você não tenha instalado o "
 "plug-in correto de VPN."
 
-#: ../src/connection-editor/page-wifi.c:80
+#: ../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"
@@ -2937,7 +2935,7 @@ msgstr ""
 "Esta opção bloqueia esta conexão ao ponto de acesso Wi-Fi (AP) especificado "
 "pelo BSSID digitado aqui. Exemplo: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:91
+#: ../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\", "
@@ -2947,82 +2945,82 @@ msgstr ""
 "pelo nome da interface, 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:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Não foi possível carregar a interface gráfica de Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:579
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Dispositivo Wi-Fi"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Conexão Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Chave WEP de 40/128 bits ASCII (Hexadecimal ou ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Frase secreta do WEP de 128 bits"
 
-#: ../src/connection-editor/page-wifi-security.c:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "WEP dinâmico (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 pessoal"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 empresas"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Não foi possível carregar a interface gráfica para segurança Wi-Fi; faltando "
 "a configuração Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Segurança Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Não foi possível carregar a interface gráfica de segurança Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "faltando SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Segurança incompatível com o modo Ad-Hoc"
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Não é possível importar conexão VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3035,29 +3033,29 @@ msgstr ""
 "\n"
 "Erro: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Já existe um arquivo chamado \"%s\"."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "Substitui_r"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Você deseja substituir %s com a conexão de VPN que você está salvando?"
 
-#: ../src/connection-editor/vpn-helpers.c:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Não foi possível importar conexão VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3068,11 +3066,11 @@ msgstr ""
 "\n"
 "Erro: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exportar conexão VPN..."
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3096,32 +3094,32 @@ msgstr "Informações da conexão"
 msgid "Active Network Connections"
 msgstr "Conexões de rede ativas"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 "Sua conexão de banda larga móvel está configurada da seguinte maneira:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.c:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Seu dispositivo:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.c:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Seu provedor:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Seu plano:"
 
-#: ../src/libnma/nma-mobile-wizard.c:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3135,28 +3133,28 @@ msgstr ""
 "configurações da rede de banda larga móvel, vá ao menu "
 "Sistema>>Preferências>>Conexões de rede."
 
-#: ../src/libnma/nma-mobile-wizard.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Confirmação das configurações de banda larga móvel"
 
-#: ../src/libnma/nma-mobile-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Não listado"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Escolha seu plano:"
 
-#: ../src/libnma/nma-mobile-wizard.c:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "_APN (Nome do ponto de acesso) do plano escolhido:"
 
-#: ../src/libnma/nma-mobile-wizard.c:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3169,83 +3167,83 @@ msgstr ""
 "Se você não sabe ao certo qual o seu plano, pergunte ao seu provedor pelo "
 "APN do seu plano."
 
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Escolha seu plano"
 
-#: ../src/libnma/nma-mobile-wizard.c:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../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:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Escolha seu provedor a partir de uma _lista:"
 
-#: ../src/libnma/nma-mobile-wizard.c:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Provedor"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Não achei _meu provedor e quero digitá-lo manualmente:"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../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:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 "Meu provedor usa tecnologia GSM (3G, GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Meu provedor usa tecnologia CDMA (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.c:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Escolha seu provedor"
 
-#: ../src/libnma/nma-mobile-wizard.c:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Países ou regiões"
 
-#: ../src/libnma/nma-mobile-wizard.c:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Meu país não está listado"
 
-#: ../src/libnma/nma-mobile-wizard.c:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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.c:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispositivo GSM instalado"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispositivo CDMA instalado"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3253,83 +3251,83 @@ msgstr ""
 "Este assistente lhe ajudará a configurar uma conexão de banda larga móvel à "
 "uma rede de celular 3G."
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Você precisará das seguintes informações:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "O nome do seu provedor de banda larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "O nome do seu plano de banda larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "Em alguns casos, o nome do plano APN (Access Point Name) de banda larga"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "_Criar uma conexão para este dispositivo móvel:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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.c:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nova conexão de banda larga móvel"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../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 apenas para este usuário"
 
-#: ../src/libnma/nma-ui-utils.c:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../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 usuários"
 
-#: ../src/libnma/nma-ui-utils.c:55 ../src/libnm-gtk/nm-ui-utils.c:620
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Pedir esta senha todas as vezes"
 
-#: ../src/libnma/nma-ui-utils.c:56 ../src/libnm-gtk/nm-ui-utils.c:621
+#: ../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:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../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.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "Senha _terciária:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
+#: ../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-wifi-dialog.c:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Clique para conectar"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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"
@@ -3337,20 +3335,20 @@ msgstr ""
 "Ou está faltando uma senha ou a conexão é inválida. No último caso, você tem "
 "que primeiro editar a conexão com nm-connection-editor"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Novo..."
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "C_riar"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3358,35 +3356,35 @@ msgstr ""
 "Senhas ou chaves de criptografia são necessárias para acessar a rede Wi-Fi "
 "\"%s\"."
 
-#: ../src/libnma/nma-wifi-dialog.c:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autenticação necessária na rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Autenticação necessária na rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Criar nova rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nova rede Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Digite um nome para a rede Wi-Fi que você deseja criar."
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Conectar a rede Wi-Fi oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Rede Wi-Fi oculta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3406,24 +3404,24 @@ msgstr "Co_nexão:"
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptador Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Com fio"
 
 # Traduzido como Malha para deixar em conformidade com a tradução do aplicativo principal NetworkManager --Enrico
-#: ../src/libnm-gtk/nm-ui-utils.c:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Malha OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3433,17 +3431,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Uso:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3451,7 +3449,7 @@ msgstr ""
 "Este programa é um componente do NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3459,151 +3457,151 @@ msgstr ""
 "Não é designado a interação de linha de comando mas executa no ambiente de "
 "desktop do GNOME."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "não habilitado"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "não registrado"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Rede doméstica (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Rede doméstica"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "buscando"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registro negado"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Rede em roaming (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Rede em roaming"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "Código PIN para o cartão SIM \"%s\" em \"%s\""
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "É necessário informar o código PIN"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "É necessário o código PIN para o dispositivo de banda larga móvel"
 
-#: ../src/mobile-helpers.c:610
+#: ../src/mobile-helpers.c:619
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Conexão de banda larga móvel \"%s\" ativa: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Conexão %s"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 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:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "erro não especificado ao validar arquivo de método eap"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:452
 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:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certificados DER ou PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "faltando arquivo PAC EAP-FAST"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Escolha um arquivo PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Arquivos PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Todos os arquivos"
 
@@ -3639,32 +3637,32 @@ msgstr "Autenticação _interna:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Permitir pro_visionamento PAC automático"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr "faltando nome de usuário EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "faltando senha EAP-LEAP"
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "certificado de CA EAP-PEAP inválido: %s"
 
-#: ../src/wireless-security/eap-method-peap.c:69
+#: ../src/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "certificado de CA EAP-PEAP inválido: nenhum certificado especificado"
 
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Escolha um certificado de Autoridade Certificadora..."
 
@@ -3692,46 +3690,46 @@ msgstr "Nenhum certificado CA é necessá_rio"
 msgid "PEAP _version:"
 msgstr "_Versão do PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "faltando nome de usuário EAP"
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "faltando senha EAP"
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "faltando identidade EAP-TLS"
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "certificado de CA EAP-TLS inválido: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "certificado de CA EAP-TLS inválido: nenhum certificado especificado"
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "senha EAP-TLS inválida: faltando"
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "chave privada EAP-TLS inválida: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "certificado de usuário EAP-TLS inválido: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Chaves privadas não criptografadas são inseguras"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3745,11 +3743,11 @@ msgstr ""
 "\n"
 "(Você pode proteger por senha sua chave privada com openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Escolha seu certificado pessoal..."
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Escolha sua chave privada..."
 
@@ -3769,36 +3767,36 @@ msgstr "Chave _privada:"
 msgid "_Private key password:"
 msgstr "_Senha da chave privada:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "certificado de CA EAP-TTLS inválido: %s"
 
-#: ../src/wireless-security/eap-method-ttls.c:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "certificado de CA EAP-TTLS inválido: nenhum certificado especificado"
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1x security"
 msgstr "Erro desconhecido ao validar a segurança 802.1x"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "RÁPIDO"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "TLS encapsulado"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Protegido (PEAP)"
 
@@ -3808,11 +3806,11 @@ msgstr "EAP Protegido (PEAP)"
 msgid "Au_thentication:"
 msgstr "Au_tenticação:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "faltando nome de usuário leap"
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "faltando senha leap"
 
@@ -3842,7 +3840,7 @@ msgid ""
 "(ascii) or 10/26 (hex)"
 msgstr ""
 "chave wep inválida: tamanho de chave %zu inválido. Um chave deve estar entre "
-"o temanho 5/13 (ascii) ou 10/26 (hexadecimal)"
+"o tamanho 5/13 (ascii) ou 10/26 (hexadecimal)"
 
 #: ../src/wireless-security/ws-wep-key.c:131
 msgid "invalid wep-key: passphrase must be non-empty"
@@ -3876,7 +3874,7 @@ msgstr "Mostrar c_have"
 msgid "WEP inde_x:"
 msgstr "Índice _WEP:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3885,7 +3883,7 @@ msgstr ""
 "wpa-psk inválido: tamanho de chave %zu inválido. Deve ser de [8,63] bytes ou "
 "64 dígitos hexadecimais"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "wpa-psk inválido: não é possível interpretar chave com 64 bytes como "
@@ -3895,6 +3893,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Tipo:"
 
+#~ msgid "_Help"
+#~ msgstr "Aj_uda"
+
 #~ msgid "Infrastructure"
 #~ msgstr "Infraestrutura"
 
diff --git a/po/ro.po b/po/ro.po
index 2c68da65..a0b65ed9 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=Networ"
-"kManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2011-03-15 05:00+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2011-03-16 23:09+0200\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
 "Language-Team: Romanian Gnome Team <gnomero-list@lists.sourceforge.net>\n"
@@ -21,627 +20,938 @@ msgstr ""
 "X-Generator: Virtaal 0.6.1\n"
 "X-Launchpad-Export-Date: 2010-08-15 10:41+0000\n"
 
-#: ../nm-applet.desktop.in.h:1
-msgid "Control your network connections"
-msgstr "Controlați conexiunile la rețea"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+msgid "Network"
+msgstr "Rețea"
 
 #: ../nm-applet.desktop.in.h:2
-msgid "Network Manager"
-msgstr "Administrator rețea"
+#, fuzzy
+msgid "Manage your network connections"
+msgstr "Controlați conexiunile la rețea"
 
-#: ../nm-applet.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr "Dezactivare creare WiFi"
+#: ../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-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "Administrați și modificați opțiunile conexiunilor de rețea"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "Dezactivează notificările de conectare"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, fuzzy
+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
 msgid "Disable disconnected notifications"
 msgstr "Dezactivează notificările de deconectare"
 
-#: ../nm-applet.schemas.in.h:4
-msgid "Set this to TRUE to disable notifications when connecting to a network."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, fuzzy
+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 conectarea la "
-"o rețea."
+"Definiți ca „TRUE” pentru a dezactiva notificările ce apar la deconectarea "
+"de la o rețea."
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Dezactivează notificările de conectare"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
 msgstr ""
 "Definiți ca „TRUE” pentru a dezactiva notificările ce apar la deconectarea "
 "de la o rețea."
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "Suprimă notificările pentru rețele disponibile"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
+"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."
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr "Ștampilă"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+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 WiFi Create"
+msgstr "Dezactivare creare WiFi"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"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."
 
-#: ../nm-applet.schemas.in.h:8
-msgid "Stamp"
-msgstr "Ștampilă"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
-msgstr "Suprimă notificările pentru rețele disponibile"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:10
-msgid "Used to determine whether settings should be migrated to a new version."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Alegere certificat CA"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
 msgstr ""
-"Folosit pentru a determina dacă configurările ar trebui migrate la o nouă "
-"versiune."
 
-#: ../nm-connection-editor.desktop.in.h:1
-msgid "Manage and change your network connection settings"
-msgstr "Administrați și modificați opțiunile conexiunilor de rețea"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "Network Connections"
-msgstr "Conexiuni de rețea"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Administrator rețea"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:334
-#: ../src/applet-device-gsm.c:377 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:867 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Disponibile"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Administrator rețea"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
+#, fuzzy
+msgid "802.1X authentication"
+msgstr "Autentificare 802.1X cu fir"
+
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+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:"
+msgstr "_Nume rețea:"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "Nu s-a putut crea conexiunea PAN: %s"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "Necunoscută"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "Adăugarea conexiunii a eșuat"
+
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "deconectat"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "Deconectat"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "Adăugarea conexiunii a eșuat"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "Nu arăta din nou acest mesaj"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:376
-#: ../src/applet-device-gsm.c:419 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:420
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "V-ați conectat la „%s”."
+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-device-bt.c:204 ../src/applet-device-cdma.c:380
-#: ../src/applet-device-gsm.c:423 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1272 ../src/applet-device-wimax.c:424
-msgid "Connection Established"
-msgstr "Conexiune stabilită"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"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-device-bt.c:205
-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.c:850
+#, c-format
+msgid ""
+"\n"
+"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-device-bt.c:231 ../src/applet-device-cdma.c:416
-#: ../src/applet-device-gsm.c:459 ../src/applet-device-wimax.c:461
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "Se pregătește conexiunea la Internet mobil de bandă largă „%s”..."
+msgid ""
+"\n"
+"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-device-bt.c:234 ../src/applet-device-cdma.c:419
-#: ../src/applet-device-gsm.c:462 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "Se configurează conexiunea la Internet mobil de bandă largă „%s”..."
+msgid ""
+"\n"
+"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-device-bt.c:237 ../src/applet-device-cdma.c:422
-#: ../src/applet-device-gsm.c:465 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
 msgstr ""
-"Este necesară autentificarea utilizatorului pentru conexiunea la Internet "
-"mobil de bandă largă „%s”..."
+"\n"
+"Conexiunea VPN „%s” a eșuat deoarece serviciul VPN a eșuat la pornire."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:425
-#: ../src/applet-device-gsm.c:468 ../src/applet-device-wimax.c:470
-#: ../src/applet.c:2384
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "Se cere o adresă de rețea pentru „%s”..."
+msgid ""
+"\n"
+"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-device-bt.c:244 ../src/applet-device-cdma.c:443
-#: ../src/applet-device-gsm.c:486
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "Conexiunea „%s” la Internet mobil de bandă largă activă"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"Conexiunea VPN „%s” a eșuat datorită unui secret VPN nevalid."
 
-#: ../src/applet-device-cdma.c:186 ../src/connection-editor/page-mobile.c:681
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"Conexiunea VPN „%s” a eșuat."
 
-#: ../src/applet-device-cdma.c:283 ../src/applet-device-gsm.c:327
-#: ../src/applet-dialogs.c:405
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Internet mobil de bandă largă (%s)"
+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-device-cdma.c:285 ../src/applet-device-gsm.c:329
-#: ../src/connection-editor/page-mobile.c:372
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1436
-msgid "Mobile Broadband"
-msgstr "Internet mobil de bandă largă"
+#: ../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."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:347
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Conexiune nouă către Internet mobil de bandă largă (CDMA)..."
+#: ../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
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
 
-#: ../src/applet-device-cdma.c:381
-msgid "You are now connected to the CDMA network."
-msgstr "V-ați conectat la rețeaua CDMA."
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "Mesaj de autentificare VPN"
 
-#: ../src/applet-device-cdma.c:438 ../src/applet-device-gsm.c:481
-#: ../src/applet-device-wimax.c:479
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "Conexiunea VPN a eșuat"
+
+#: ../src/applet.c:990
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Conexiunea „%s” la Internet mobil de bandă largă activă: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Conexiunea VPN „%s” a eșuat deoarece serviciul VPN a eșuat să pornească.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:441 ../src/applet-device-gsm.c:484
-#: ../src/applet-device-wimax.c:482
-msgid "roaming"
-msgstr "roaming"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Conexiunea VPN „%s” a eșuat la inițializare.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-gsm.c:212 ../src/connection-editor/page-mobile.c:684
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "dispozitivul nu este pregătit (lipsește firmware-ul)"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:390
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Conexiune nouă către Internet mobil de bandă largă (GSM)..."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "dispozitiv nepregătit"
 
-#: ../src/applet-device-gsm.c:424
-msgid "You are now connected to the GSM network."
-msgstr "V-ați conectat la rețeaua GSM."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "deconectat"
 
-#: ../src/applet-device-gsm.c:585
-msgid "PIN code required"
-msgstr "Cod PIN necesar"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "Deconectează"
 
-#: ../src/applet-device-gsm.c:593
-msgid "PIN code is needed for the mobile broadband device"
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "dispozitiv neadministrat"
+
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "Nu există dispozitive de rețea disponibile"
+
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "Conexiuni _VPN"
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "_Configurare VPN..."
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "_Deconectează VPN"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager nu este pornit..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "Rețea dezactivată"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "Activează _rețeaua"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "Activează rețeaua fără _fir"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "Activează Internetul _mobil de bandă largă"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "Activează n_otificările"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "Detal_ii conexiune"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "Editare conexiuni..."
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_Despre"
+
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "V-ați conectat la „%s”."
+
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "Deconectat"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "Conexiunea la rețea a fost deconectată."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Se pregătește conexiunea la rețeaua „%s”..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
 msgstr ""
-"Este necesar codul PIN pentru dispozitivul de acces la Internet mobil de "
-"bandă largă"
+"Se cere autentificarea utilizatorului pentru conexiunea la rețeaua „%s”..."
 
-#: ../src/applet-device-gsm.c:714
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Cod PIN greșit, contactați furnizorul dumneavoastră."
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Se cere o adresă de rețea pentru „%s”..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "Conexiune activă la rețeaua „%s”"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Se pornește conexiunea VPN „%s”..."
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "Se cere autentificarea utilizatorului pentru conexiunea VPN „%s”..."
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Se cere o adresă VPN pentru „%s”..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "Conexiune activă la VPN-ul „%s”"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "Nu există conexiuni la rețea"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "Miniaplicație NetworkManager"
 
-#: ../src/applet-device-gsm.c:737
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Cod PUK greșit, contactați furnizorul dumneavoastră."
 
+#: ../src/applet-device-broadband.c:201
+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-gsm.c:764
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Se trimite codul de deblocare..."
 
-#: ../src/applet-device-gsm.c:827
-msgid "SIM PIN unlock required"
-msgstr "Deblocare SIM PIN necesară"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Internet mobil de bandă largă (%s)"
 
-#: ../src/applet-device-gsm.c:828
-msgid "SIM PIN Unlock Required"
-msgstr "Deblocare SIM PIN necesară"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "Internet mobil de bandă largă"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:830
-#, c-format
-msgid ""
-"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 "
-"SIM PIN înainte de a putea fi utilizat."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Disponibile"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:832
-msgid "PIN code:"
-msgstr "Cod PIN:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "Conexiune nouă de Internet mobil de bandă largă"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:836
-msgid "Show PIN code"
-msgstr "Arată codul PIN"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Conexiune stabilită"
 
-#: ../src/applet-device-gsm.c:839
-msgid "SIM PUK unlock required"
-msgstr "Deblocare SIM PUK necesară"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+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-gsm.c:840
-msgid "SIM PUK Unlock Required"
-msgstr "Deblocare SIM PUK necesară"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "Parola pentru Internetul mobil de bandă largă"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:842
-#, c-format
-msgid ""
-"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 "
-"SIM PUK înainte de a putea fi utilizat."
+#: ../src/applet-device-broadband.c:957
+#, fuzzy
+msgid "You are now registered on the home network."
+msgstr "V-ați conectat la rețeaua cu fir."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:844
-msgid "PUK code:"
-msgstr "Cod PUK:"
+#: ../src/applet-device-broadband.c:963
+#, fuzzy
+msgid "You are now registered on a roaming network."
+msgstr "V-ați conectat la rețeaua cu fir."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:847
-msgid "New PIN code:"
-msgstr "Cod PIN nou:"
+#: ../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ă."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:849
-msgid "Re-enter new PIN code:"
-msgstr "Reintroduceți noul cod PIN:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "Se pregătește conexiunea la Internet mobil de bandă largă „%s”..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:854
-msgid "Show PIN/PUK codes"
-msgstr "Arată codurile PIN/PUK"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, 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'..."
+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"
+msgstr "Conexiunea „%s” la Internet mobil de bandă largă activă"
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet automat"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "Rețele cu fir (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "Rețea cu fir (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "Rețele cu fir"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "Rețea cu fir"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1390
-msgid "disconnected"
-msgstr "deconectat"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "V-ați conectat la rețeaua cu fir."
 
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired 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-wired.c:303
-#, c-format
-msgid "Configuring wired 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-wired.c:306
-#, c-format
-msgid "User authentication required for wired 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-wired.c:309
-#, c-format
-msgid "Requesting a wired 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-wired.c:313
-#, c-format
-msgid "Wired 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-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Autentificare DSL"
 
-#: ../src/applet-device-wifi.c:89
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Conectare la o rețea fără fir ascunsă..."
 
-#: ../src/applet-device-wifi.c:142
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "Creează rețea fără fir _nouă..."
 
-#: ../src/applet-device-wifi.c:226
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(nici una)"
 
-#: ../src/applet-device-wifi.c:795
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "Rețele fără fir (%s)"
-
-#: ../src/applet-device-wifi.c:797
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "Rețea fără fir (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Rețele cu fir (%s)"
 
-#: ../src/applet-device-wifi.c:799
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Rețea fără fir"
-msgstr[1] "Rețele fără fir"
-msgstr[2] "Rețele fără fir"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Rețea cu fir (%s)"
 
-#: ../src/applet-device-wifi.c:832
-msgid "wireless is disabled"
-msgstr "conexiune fără fir dezactivată"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Rețea cu fir"
+msgstr[1] "Rețea cu fir"
+msgstr[2] "Rețea cu fir"
+
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "WiMAX este dezactivat"
 
-#: ../src/applet-device-wifi.c:833
-msgid "wireless is disabled by hardware switch"
-msgstr "rețeaua fără fir este dezactivată dintr-un comutator hardware"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WiMAX este dezactivat dintr-un comutator hardware"
 
-#: ../src/applet-device-wifi.c:894
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Mai multe rețele"
 
-#: ../src/applet-device-wifi.c:1073
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "Rețele fără fir disponibile"
 
-#: ../src/applet-device-wifi.c:1075
-msgid "Click on this icon to connect to a wireless network"
-msgstr "Clic pe această iconiță pentru a vă conecta la o rețea fără fir"
-
-#: ../src/applet-device-wifi.c:1076
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+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:1079 ../src/applet.c:806
-msgid "Don't show this message again"
-msgstr "Nu arăta din nou acest mesaj"
-
-#: ../src/applet-device-wifi.c:1271
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, 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:1302
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Se pregătește conexiunea la rețeaua fără fir „%s”..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Se pregătește conexiunea la rețeaua „%s”..."
 
-#: ../src/applet-device-wifi.c:1305
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "Se configurează conexiunea la rețeaua fără fir „%s”..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Se configurează conexiunea la rețeaua cu fir „%s”..."
 
-#: ../src/applet-device-wifi.c:1308
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, 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:1311
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Se cere o adresă de rețea fără fir pentru „%s”..."
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "Se cere o adresă de rețea pentru „%s”..."
 
-#: ../src/applet-device-wifi.c:1332
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, 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:1337
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "Conexiune activă la rețeaua fără fir „%s”"
-
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Internet mobil de bandă largă WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "Internet mobil de bandă largă WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX este dezactivat"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Conexiunea „%s” la rețeaua cu fir activă"
 
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX este dezactivat dintr-un comutator hardware"
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "Nu s-a putut crea conexiunea PAN: %s"
 
-#: ../src/applet-device-wimax.c:425
-msgid "You are now connected to the WiMAX network."
-msgstr "V-ați conectat la rețeaua WiMAX."
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "Nu s-a putut edita conexiunea nouă"
 
-#: ../src/applet-dialogs.c:56
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Eroare la afișarea informațiilor despre conexiune:"
 
-#: ../src/applet-dialogs.c:108
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/wireless-dialog.c:946
-#: ../src/wireless-security/wireless-security.c:392
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:110
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP Dinamic"
 
-#: ../src/applet-dialogs.c:112 ../src/applet-dialogs.c:221
-#: ../src/applet-dialogs.c:223
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:219
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adrese"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:227 ../src/applet-dialogs.c:236
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/wireless-dialog.c:903
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Niciuna"
 
-#: ../src/applet-dialogs.c:327 ../src/applet-dialogs.c:465
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "1 (Implicit)"
+
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:467
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Necunoscută"
 
-#: ../src/applet-dialogs.c:342
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Necunoscută"
 
-#: ../src/applet-dialogs.c:344
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "necunoscut"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Adresă IP:"
 
-#: ../src/applet-dialogs.c:356
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "necunoscut"
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Adresă broadcast:"
 
-#: ../src/applet-dialogs.c:391
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Necunoscută"
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Mască subrețea:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:394
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:401
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:403
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:407
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "General"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Interfață:"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Adresă fizică:"
 
 #. Driver
-#: ../src/applet-dialogs.c:441
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../src/applet-dialogs.c:470
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Viteză:"
 
-#: ../src/applet-dialogs.c:480
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Securitate:"
 
-#: ../src/applet-dialogs.c:493
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:506
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:523
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:534 ../src/applet-dialogs.c:641
-msgid "IP Address:"
-msgstr "Adresă IP:"
-
-#: ../src/applet-dialogs.c:536 ../src/applet-dialogs.c:552
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Necunoscută"
-
-#: ../src/applet-dialogs.c:550
-msgid "Broadcast Address:"
-msgstr "Adresă broadcast:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:559
-msgid "Subnet Mask:"
-msgstr "Mască subrețea:"
-
-#: ../src/applet-dialogs.c:561
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Necunoscută"
-
-#: ../src/applet-dialogs.c:569 ../src/applet-dialogs.c:656
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Rută implicită:"
 
-#: ../src/applet-dialogs.c:581
-msgid "Primary DNS:"
-msgstr "DNS primar:"
-
-#: ../src/applet-dialogs.c:590
-msgid "Secondary DNS:"
-msgstr "DNS secundar:"
-
-#: ../src/applet-dialogs.c:600
-msgid "Ternary DNS:"
-msgstr "DNS terțiar:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:615
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:624
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorat"
 
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "_Tip:"
+
+#: ../src/applet-dialogs.c:822
+#, fuzzy
+msgid "VPN Gateway:"
+msgstr "Gateway"
+
+#: ../src/applet-dialogs.c:828
+#, fuzzy
+msgid "VPN Username:"
+msgstr "Nume _utilizator:"
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "Co_nexiune:"
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr "Nu se știe"
+
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:732
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Nu s-au găsit conexiuni active valide!"
 
-#: ../src/applet-dialogs.c:785
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -649,501 +959,836 @@ msgstr ""
 "Drepturi de autor © 2005-2008 Novell, Inc.\n"
 "și mulți alți contribuitori și traducători din comunitate"
 
-#: ../src/applet-dialogs.c:788
+#: ../src/applet-dialogs.c:988
 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:790
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Situl web NetworkManager"
 
-#: ../src/applet-dialogs.c:805
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Resurse lipsă"
 
-#: ../src/applet-dialogs.c:830
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Parola pentru Internetul mobil de bandă largă"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Este necesară o parolă pentru conectarea la „%s”."
 
-#: ../src/applet-dialogs.c:854
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Parolă:"
 
-#: ../src/applet.c:895
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "Deblocare SIM PIN necesară"
+
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "Deblocare SIM PIN necesară"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a eșuat deoarece conexiunea la rețea a fost întreruptă."
+"Dispozitivul de acces la Internet mobil de bandă largă „%s” necesită un cod "
+"SIM PIN înainte de a putea fi utilizat."
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "Cod PIN:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "Arată codul PIN"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "Deblocare SIM PUK necesară"
 
-#: ../src/applet.c:898
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "Deblocare SIM PUK necesară"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a eșuat deoarece serviciul VPN s-a oprit brusc."
+"Dispozitivul de acces la Internet mobil de bandă largă „%s” necesită un cod "
+"SIM PUK înainte de a putea fi utilizat."
 
-#: ../src/applet.c:901
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "Cod PUK:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "Cod PIN nou:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "Reintroduceți noul cod PIN:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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 ""
-"\n"
-"Conexiunea VPN „%s” a eșuat deoarece serviciul VPN a returnat o configurare "
-"nevalidă."
 
-#: ../src/applet.c:904
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a eșuat deoarece încercarea de conectare a expirat."
+"Adresele IP identifică calculatorul pe Internet. Apăsați pe butonul „Adaugă” "
+"pentru a adăuga o nouă adresă IP."
 
-#: ../src/applet.c:907
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+#: ../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
+msgid "_Add"
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a eșuat deoarece serviciul VPN nu a pornit în timp util."
 
-#: ../src/applet.c:910
-#, c-format
+#. 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
+msgid "_Delete"
+msgstr "Șter_ge"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+#, fuzzy
+msgid "_Use this connection only for resources on its network"
+msgstr "Folosește c_onexiunea 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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a eșuat deoarece serviciul VPN a eșuat la pornire."
+"La activare, această conexiune nu va fi folosită niciodată ca una implicită."
 
-#: ../src/applet.c:913
-#, c-format
+#: ../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…"
+msgstr "Creează…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "Alegeți un tip de conexiune VPN"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"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."
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a eșuat deoarece nu există secrete VPN valide."
+"Alegeți tipul conexiunii VPN pe care doriți să o folosiți pentru noua "
+"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/applet.c:916
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a eșuat datorită unui secret VPN nevalid."
 
-#: ../src/applet.c:923
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a eșuat."
 
-#: ../src/applet.c:941
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a fost deconectată deoarece conexiunea la rețea a fost "
-"întreruptă."
 
-#: ../src/applet.c:944
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "Adresă broadcast:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a fost deconectată deoarece serviciul VPN a fost oprit."
 
-#: ../src/applet.c:950
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a fost deconectată."
 
-#: ../src/applet.c:984
-msgid "VPN Login Message"
-msgstr "Mesaj de autentificare VPN"
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
 
-#: ../src/applet.c:990 ../src/applet.c:998 ../src/applet.c:1048
-msgid "VPN Connection Failed"
-msgstr "Conexiunea VPN a eșuat"
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
 
-#: ../src/applet.c:1055
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Co_nexiune:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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
+msgid "_Edit"
+msgstr "_Editează"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a eșuat deoarece serviciul VPN a eșuat să pornească.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1058
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+msgid "ms"
 msgstr ""
-"\n"
-"Conexiunea VPN „%s” a eșuat la inițializare.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1378
-msgid "device not ready (firmware missing)"
-msgstr "dispozitivul nu este pregătit (lipsește firmware-ul)"
+#: ../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
+#, fuzzy
+msgid "_Interface name:"
+msgstr "Interfață:"
 
-#: ../src/applet.c:1380
-msgid "device not ready"
-msgstr "dispozitiv nepregătit"
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
 
-#: ../src/applet.c:1406
-msgid "Disconnect"
-msgstr "Deconectează"
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
 
-#: ../src/applet.c:1420
-msgid "device not managed"
-msgstr "dispozitiv neadministrat"
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid ""
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
+msgstr ""
 
-#: ../src/applet.c:1464
-msgid "No network devices available"
-msgstr "Nu există dispozitive de rețea disponibile"
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
 
-#: ../src/applet.c:1552
-msgid "_VPN Connections"
-msgstr "Conexiuni _VPN"
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
 
-#: ../src/applet.c:1609
-msgid "_Configure VPN..."
-msgstr "_Configurare VPN..."
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "DNS primar:"
 
-#: ../src/applet.c:1613
-msgid "_Disconnect VPN"
-msgstr "_Deconectează VPN"
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+msgstr ""
 
-#: ../src/applet.c:1711
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager nu este pornit..."
+#: ../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:"
+msgstr ""
 
-#: ../src/applet.c:1716 ../src/applet.c:2509
-msgid "Networking disabled"
-msgstr "Rețea dezactivată"
+#: ../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
+msgid "bytes"
+msgstr "octeți"
 
-#. 'Enable Networking' item
-#: ../src/applet.c:1937
-msgid "Enable _Networking"
-msgstr "Activează _rețeaua"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:1946
-msgid "Enable _Wireless"
-msgstr "Activează rețeaua fără _fir"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "_Securitate:"
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1955
-msgid "Enable _Mobile Broadband"
-msgstr "Activează Internetul _mobil de bandă largă"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:1964
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Activează Internetul mobil de bandă largă WiMA_X"
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Conexiune cu fir %d"
 
-#. Toggle notifications item
-#: ../src/applet.c:1975
-msgid "Enable N_otifications"
-msgstr "Activează n_otificările"
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
 
-#. 'Connection Information' item
-#: ../src/applet.c:1986
-msgid "Connection _Information"
-msgstr "Detal_ii conexiune"
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:1996
-msgid "Edit Connections..."
-msgstr "Editare conexiuni..."
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2010
-msgid "_Help"
-msgstr "_Ajutor"
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Activează _rețeaua"
 
-#. About item
-#: ../src/applet.c:2019
-msgid "_About"
-msgstr "_Despre"
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
 
-#: ../src/applet.c:2196
-msgid "Disconnected"
-msgstr "Deconectat"
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
 
-#: ../src/applet.c:2197
-msgid "The network connection has been disconnected."
-msgstr "Conexiunea la rețea a fost deconectată."
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
 
-#: ../src/applet.c:2378
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "Se pregătește conexiunea la rețeaua „%s”..."
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "automat"
 
-#: ../src/applet.c:2381
+#: ../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
-msgid "User authentication required for network connection '%s'..."
+msgid "default"
+msgstr "implicit"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"Se cere autentificarea utilizatorului pentru conexiunea la rețeaua „%s”..."
 
-#: ../src/applet.c:2387
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "Conexiune activă la rețeaua „%s”"
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adresă _MAC:"
 
-#: ../src/applet.c:2465
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adresă"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "Se pornește conexiunea VPN „%s”..."
+msgid "invalid %s for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2468
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "Se cere autentificarea utilizatorului pentru conexiunea VPN „%s”..."
+msgid "invalid %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2471
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Se cere o adresă VPN pentru „%s”..."
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2474
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid "VPN connection '%s' active"
-msgstr "Conexiune activă la VPN-ul „%s”"
+msgid "invalid interface-name (%s)"
+msgstr ""
 
-#: ../src/applet.c:2513
-msgid "No network connection"
-msgstr "Nu există conexiuni la rețea"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Orice dispozitiv"
 
-#: ../src/applet.c:3164
-msgid "NetworkManager Applet"
-msgstr "Miniaplicație NetworkManager"
+#: ../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/applet.c:3170 ../src/wired-dialog.c:127
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, 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
+msgid "FCoE"
 msgstr ""
-"Miniaplicația NetworkManager nu a putut găsi unele resurse (nu s-a putut "
-"găsi fișierul .ui)."
 
-#: ../src/applet.ui.h:1 ../src/connection-editor/ce-vpn-wizard.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-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/applet.ui.h:2
-msgid "Active Network Connections"
-msgstr "Conexiuni de rețea active"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.ui.h:3
-msgid "C_onnect"
-msgstr "C_onectare"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.ui.h:4
-msgid "C_onnection:"
-msgstr "Co_nexiune:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.ui.h:5
-msgid "Connection Information"
-msgstr "Detalii conexiune"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.ui.h:6
-msgid "Other Wireless Network..."
-msgstr "Alte rețele fără fir..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.ui.h:7
-msgid "Wireless _adapter:"
-msgstr "_Adaptor rețea fără fir:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.ui.h:8
-msgid "_Network name:"
-msgstr "_Nume rețea:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.ui.h:9
-msgid "_Unlock"
-msgstr "_Deblochează"
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.ui.h:10
-msgid "Wireless _security:"
-msgstr "Secur_itatea rețelei fără fir:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#: ../src/applet.ui.h:11
-msgid "label"
-msgstr "etichetă"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:67
-msgid "automatic"
-msgstr "automat"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:294
-msgid "Failed to update connection secrets due to an unknown error."
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+msgid "Enter the traffic class for each user priority."
 msgstr ""
-"Eșec în actualizarea secretelor conexiunii din cauza unei erori necunoscute."
 
 #: ../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:2
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "Sho_w password"
-msgstr "Afișea_ză parola"
+msgid "_Username:"
+msgstr "Nume _utilizator:"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Password:"
-msgstr "_Parolă:"
-
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "_Serviciu:"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../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:4
+#: ../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
-msgid "_Username:"
-msgstr "Nume _utilizator:"
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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
-msgid "Addresses"
-msgstr "Adrese"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
-#: ../src/connection-editor/page-ip6.c:137
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
+#: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automat"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-msgid "Automatic with manual DNS settings"
-msgstr "Automate cu configurări DNS manuale"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Twisted Pair (TP)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-msgid "D_HCP client ID:"
-msgstr "ID client D_HCP:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+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.h:11
+msgid "_Speed:"
+msgstr "_Viteză:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "Full duple_x"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "Aut_onegociere"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "_Serviciu:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#, fuzzy
+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 ""
-"Domains used when resolving host names. Use commas to separate multiple "
-"domains."
+"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 ""
-"Domenii folosite la rezolvarea numelor calculatoarelor. Folosiți virgule "
-"pentru a separa mai multe domenii."
+"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-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
-msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
 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-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
-msgid ""
-"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-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Implicit"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignoră"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
 msgstr ""
-"Adrese IP pentru serverele de domenii folosite la rezolvarea numelor "
-"calculatoarelor. Folosiți virgule pentru a separa mai multe servere de "
-"domenii."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Adresă broadcast:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Parola pentru cheia _privată:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
-"La activare, această conexiune nu va fi folosită niciodată ca una implicită."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-msgid "Ig_nore automatically obtained routes"
-msgstr "Ig_noră rutele obținute automat"
+#: ../src/connection-editor/ce-page-general.ui.h:1
+msgid "Automatically connect to _VPN when using this connection"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
-msgid "Link-Local"
-msgstr "Doar legătură locală"
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, fuzzy
+msgid "All _users may connect to this network"
+msgstr "V-ați conectat la rețeaua cu fir."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-#: ../src/connection-editor/page-ip4.c:164
-#: ../src/connection-editor/page-ip6.c:186
+#: ../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.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "C_onectare"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr "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:12
-msgid "Require IPv4 addressing for this connection to complete"
-msgstr "Necesită adresare IPv4 pentru a completa această conexiune"
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
+msgstr "Doar legătură locală"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
-#: ../src/connection-editor/page-ip4.c:182
-#: ../src/connection-editor/page-ip6.c:206
+#: ../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
 msgid "Shared to other computers"
 msgstr "Partajată cu alte calculatoare"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+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
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1153,13 +1798,50 @@ msgstr ""
 "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
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+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:"
+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
+#, fuzzy
+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:13
-msgid "Use this c_onnection only for resources on its network"
-msgstr "Folosește c_onexiunea doar pentru resursele din rețeaua acesteia"
+#: ../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:"
+msgstr "Servere _DNS:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses."
+msgstr ""
+"Adrese IP pentru serverele de domenii folosite la rezolvarea numelor "
+"calculatoarelor. Folosiți virgule pentru a separa mai multe servere de "
+"domenii."
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+#, 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
+msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
@@ -1167,31 +1849,45 @@ 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:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "DNS ser_vers:"
-msgstr "Servere _DNS:"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:18
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
-msgid "_Method:"
-msgstr "_Metodă:"
-
 #: ../src/connection-editor/ce-page-ip4.ui.h:19
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Rute…"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:20
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Dezactivat"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 ""
+"Adrese IP pentru serverele de domenii folosite la rezolvarea numelor "
+"calculatoarelor. Folosiți virgule pentru a separa mai multe servere de "
+"domenii."
+
 #: ../src/connection-editor/ce-page-ip6.ui.h:18
-msgid "_Search domains:"
-msgstr "Domenii de cău_tare:"
+msgid "IPv6 _privacy extensions:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "Require IPv6 addressing for this connection to complete"
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+#, 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:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1201,484 +1897,933 @@ msgstr ""
 "IPv4 reușește."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
+msgid "Basic"
+msgstr "De bază"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
+msgid "Nu_mber:"
+msgstr "Nu_măr:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Avansat"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-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:5
-msgid "Any"
-msgstr "Orice"
-
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Basic"
-msgstr "De bază"
+msgid "_APN:"
+msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "Modifică..."
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "N_etwork ID:"
 msgstr "ID r_ețea:"
 
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr "Modifică..."
+
 #: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "Nu_mber:"
-msgstr "Nu_măr:"
+msgid "P_IN:"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:10
-msgid "PI_N:"
-msgstr "PI_N:"
+#, 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
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Preferă 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Preferă 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
 msgid "Sho_w passwords"
 msgstr "Afișea_ză parolele"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
-msgstr "_APN:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "_Type:"
-msgstr "_Tip:"
-
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
-msgstr "Permite compresia _BSD a datelor"
+msgid "Authentication"
+msgstr "Autentificare"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
-msgstr "Permite compresia _Deflate a datelor"
+msgid "Allowed methods:"
+msgstr "Metode permise:"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:3
-msgid "Allowed Authentication Methods"
-msgstr "Metode de autentificare permise"
+msgid "Configure _Methods…"
+msgstr "Configurare _metode…"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "Allowed methods:"
-msgstr "Metode permise:"
+msgid "Compression"
+msgstr "Compresie"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:5
-msgid "Authentication"
-msgstr "Autentificare"
+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
-msgid "C_HAP"
-msgstr "C_HAP"
+msgid "_Require 128-bit encryption"
+msgstr "Necesită cripta_re pe 128 de biți"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:7
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "Challenge Handshake Authentication Protocol"
+msgid "Use _stateful MPPE"
+msgstr "Folosește MPPE cu _stare"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:8
-msgid "Compression"
-msgstr "Compresie"
+msgid "Allow _BSD data compression"
+msgstr "Permite compresia _BSD a datelor"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Configure _Methods…"
-msgstr "Configurare _metode…"
+msgid "Allow _Deflate data compression"
+msgstr "Permite compresia _Deflate a datelor"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Echo"
-msgstr "Echo"
+msgid "Use TCP _header compression"
+msgstr "Folosește compresia antete_lor TCP"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "Extensible Authentication Protocol"
-msgstr "Extensible Authentication Protocol"
+msgid "Echo"
+msgstr "Echo"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
-msgid ""
-"In most cases, the provider's PPP servers will support all authentication "
-"methods.  If connections fail, try disabling support for some methods."
+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:"
 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/ce-page-ppp.ui.h:13
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:14
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Microsoft Challenge Handshake Authentication Protocol"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Co_nexiune:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:15
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft Challenge Handshake Authentication Protocol versiunea 2"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:16
-msgid "Password Authentication Protocol"
-msgstr "Password Authentication Protocol"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "Interfață:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:17
-msgid "Send PPP _echo packets"
-msgstr "Trimite pachete _echo PPP"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:18
-msgid "Use TCP _header compression"
-msgstr "Folosește compresia antete_lor TCP"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "Adresa MAC _clonată:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:19
-msgid "Use _stateful MPPE"
-msgstr "Folosește MPPE cu _stare"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:20
-msgid "_EAP"
-msgstr "_EAP"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:21
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:22
-msgid "_PAP"
-msgstr "_PAP"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:23
-msgid "_Require 128-bit encryption"
-msgstr "Necesită cripta_re pe 128 de biți"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:24
-msgid "_Use point-to-point encryption (MPPE)"
-msgstr "Folosește criptare p_unct-la-punct (MPPE)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "Securitate:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
+msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
+msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
-msgstr "Aut_onegociere"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
-msgstr "BNC"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "Full duple_x"
-msgstr "Full duple_x"
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr "P_utere de transmisie:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-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"
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr "Mb/s"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr "_Rată:"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr "_BSSID:"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr "C_anal:"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr "Ban_dă:"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
 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-wired.ui.h:13
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-msgid ""
-"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/ce-polkit-button.c:74
+msgid "No polkit authorization to perform the action"
 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/ce-page-wired.ui.h:14
-msgid "Twisted Pair (TP)"
-msgstr "Twisted Pair (TP)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+msgid "Allowed Authentication Methods"
+msgstr "Metode de autentificare permise"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-msgid "_Cloned MAC address:"
-msgstr "Adresa MAC _clonată:"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr "_EAP"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
-msgid "_Device MAC address:"
-msgstr "Adresa MAC a _dispozitivului:"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Port:"
-msgstr "_Port:"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr "_PAP"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-msgid "_Speed:"
-msgstr "_Viteză:"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:19
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "bytes"
-msgstr "octeți"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-msgid "A (5 GHz)"
-msgstr "A (5 GHz)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "B/G (2.4 GHz)"
-msgstr "B/G (2.4 GHz)"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
-msgid "Ban_d:"
-msgstr "Ban_dă:"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "C_hannel:"
-msgstr "C_anal:"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft Challenge Handshake Authentication Protocol versiunea 2"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "Infrastructure"
-msgstr "Infrastructură"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+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/ce-page-wireless.ui.h:9
-msgid "M_ode:"
-msgstr "M_od:"
+#: ../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/ce-page-wireless.ui.h:10
-msgid "Mb/s"
-msgstr "Mb/s"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
 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/ce-page-wireless.ui.h:14
-msgid "Transmission po_wer:"
-msgstr "P_utere de transmisie:"
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "DSL"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid "_BSSID:"
-msgstr "_BSSID:"
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
+msgid "InfiniBand"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_Rate:"
-msgstr "_Rată:"
+#: ../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
+msgid "Bond"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "_SSID:"
-msgstr "_SSID:"
+#: ../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
+msgid "Team"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:21
-msgid "mW"
-msgstr "mW"
+#: ../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
+msgid "Bridge"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "_Security:"
-msgstr "_Securitate:"
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "Alegeți un tip de conexiune VPN"
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Create…"
-msgstr "Creează…"
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "Adresă fizică:"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "Exportare conexiune VPN..."
+
+#: ../src/connection-editor/connection-helpers.c:323
 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."
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
 msgstr ""
-"Alegeți tipul conexiunii VPN pe care doriți să o folosiți pentru noua "
-"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."
+"Fereastra de dialog a editorului de conexiuni nu a putut fi inițializată din "
+"cauza unei erori necunoscute."
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "Nu s-a putut crea noua conexiune"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "Ștergerea conexiunii a eșuat"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:506
-#: ../src/connection-editor/ip6-routes-dialog.c:464
-#: ../src/connection-editor/page-ip4.c:734
-#: ../src/connection-editor/page-ip6.c:719
+#: ../src/connection-editor/connection-helpers.c:517
+#, 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
 msgid "Address"
 msgstr "Adresă"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:522
-#: ../src/connection-editor/page-ip4.c:751
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Mască rețea"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:538
-#: ../src/connection-editor/ip6-routes-dialog.c:496
-#: ../src/connection-editor/page-ip4.c:768
-#: ../src/connection-editor/page-ip6.c:753
+#: ../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
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:554
-#: ../src/connection-editor/ip6-routes-dialog.c:512
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrică"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:480
-#: ../src/connection-editor/page-ip6.c:736
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "Editare %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "Editare conexiune fără nume"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Nume conexiune:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+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
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Adăugarea conexiunii a eșuat"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+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
+msgid "_Save"
+msgstr "_Salvează"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+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
+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
+#, fuzzy
+msgid "Could not create connection"
+msgstr "Nu s-a putut crea noua conexiune"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "Nu s-a putut edita conexiunea"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+msgid "Unknown error creating connection editor dialog."
+msgstr "Eroare la crearea dialogului editorului de conexiuni."
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "Eroare la inițializarea editorului"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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"
+msgstr ""
+
 #: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1444
-msgid "DSL"
-msgstr "DSL"
+msgid "Connection _name:"
+msgstr "_Nume conexiune:"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "E_xportă"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "niciodată"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "acum"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "acum un minut"
+msgstr[1] "acum %d minute"
+msgstr[2] "acum %d de minute"
+
+#: ../src/connection-editor/nm-connection-list.c:160
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "acum o oră"
+msgstr[1] "acum %d ore"
+msgstr[2] "acum %d de ore"
+
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "acum o zi"
+msgstr[1] "acum %d zile"
+msgstr[2] "acum %d de zile"
+
+#: ../src/connection-editor/nm-connection-list.c:178
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "acum o lună"
+msgstr[1] "acum %d luni"
+msgstr[2] "acum %d de luni"
+
+#: ../src/connection-editor/nm-connection-list.c:182
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "acum un an"
+msgstr[1] "acum %d ani"
+msgstr[2] "acum %d de ani"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "Nume"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "Ultima folosire"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "Modifică conexiunea selectată"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "Autentificare pentru a modifica conexiunea selectată"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "Șterge conexiunea selectată"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "Autentificare pentru a șterge conexiunea selectată"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, 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:933
+msgid "Error creating connection"
+msgstr "Eroare la crearea conexiunii"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr "Eroare la editarea conexiunii"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, 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"
+msgstr "Securitate 802.1x"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "Nu s-a putut încărca interfața de utilizator pentru securitate WiFi."
+
+#: ../src/connection-editor/page-8021x-security.c:125
+#, 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
+msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:125
+#, 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
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "nu s-a putut găsi dispozitivul Bluetooth."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Conexiune cu fir %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Activează _rețeaua"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Rețea fără fir"
+
+#: ../src/connection-editor/page-bond.c:447
+#, 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
+#, fuzzy
+msgid "primary"
+msgstr "DNS primar:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "Conexiune cu fir %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, 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
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+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
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, 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
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, 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
 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:229
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Conexiune DSL %d"
 
-#: ../src/connection-editor/page-ip4.c:128
-#: ../src/connection-editor/page-ip6.c:127
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+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
+#, 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
+#, 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
+#, fuzzy
+msgid "cloned MAC"
+msgstr "Adresa MAC _clonată:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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
+msgid "Default"
+msgstr "Implicit"
+
+#: ../src/connection-editor/page-general.c:52
+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
+#, 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
+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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+#, fuzzy
+msgid "Could not load InfiniBand user interface."
+msgstr "Nu s-a putut încărca interfața de utilizator pentru conexiunile WiFi."
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../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
 msgid "Automatic (VPN)"
 msgstr "Automată (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:128
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Doar adrese automate (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:131
-msgid "Automatic (PPP)"
-msgstr "Automată (PPP)"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "Automat, doar adresele"
 
-#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip4.c:132
 #: ../src/connection-editor/page-ip6.c:132
-msgid "Automatic (PPP) addresses only"
-msgstr "Doar adrese automate (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:134
 msgid "Automatic (PPPoE)"
 msgstr "Automat (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:135
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Doar adrese automate (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:138
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automată (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Doar adrese primite automat (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:176
-#: ../src/connection-editor/page-ip6.c:199
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Doar legătură locală"
 
-#: ../src/connection-editor/page-ip4.c:192
-msgid "Disabled"
-msgstr "Dezactivat"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "Servere _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:700
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "Domenii de cău_tare:"
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Modificare rute IPV4 pentru %s"
 
-#: ../src/connection-editor/page-ip4.c:811
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Opțiuni IPv4"
 
-#: ../src/connection-editor/page-ip4.c:813
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator IPv4."
 
-#: ../src/connection-editor/page-ip6.c:138
-msgid "Automatic, addresses only"
-msgstr "Automat, doar adresele"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:150
-#: ../src/wireless-security/eap-method.c:285
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignoră"
 
-#: ../src/connection-editor/page-ip6.c:174
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automat, doar DHCP"
 
-#: ../src/connection-editor/page-ip6.c:685
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Editarea rutelor IPv6 pentru %s"
 
-#: ../src/connection-editor/page-ip6.c:794
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Configurări IPv6"
 
-#: ../src/connection-editor/page-ip6.c:796
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Nu s-a putut încărca interfața utilizator IPv6"
 
-#: ../src/connection-editor/page-mobile.c:374
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
 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:391
+#: ../src/connection-editor/page-mobile.c:327
 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:632
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Selectați tipul furnizorului de Internet mobil de bandă largă"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1686,432 +2831,271 @@ 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:664
+#: ../src/connection-editor/page-mobile.c:561
 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:671
+#: ../src/connection-editor/page-mobile.c:568
 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-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:232
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-peap.c:248
-#: ../src/wireless-security/eap-method-ttls.c:264
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:248
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "nimic"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:281
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Configurări PPP"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator PPP."
 
-#: ../src/connection-editor/page-vpn.c:107
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1440
-msgid "VPN"
-msgstr "VPN"
+#: ../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-team.c:118
+#: ../src/connection-editor/page-team-port.c:91
+msgid "Error: file doesn't contain a valid JSON configuration"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, 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
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "Conexiune cu fir %d"
 
-#: ../src/connection-editor/page-vpn.c:109
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+msgid "Could not load team port user interface."
+msgstr ""
+"Nu s-a putut încărca interfața de utilizator pentru conexiunile cu fir."
+
+#. 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
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Nu există conexiuni la rețea"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, 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
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "Conexiune VPN %d"
+
+#: ../src/connection-editor/page-vpn.c:103
 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:124
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Nu s-a găsit un modul VPN pentru serviciul „%s”."
 
-#: ../src/connection-editor/page-vpn.c:218
-#: ../src/connection-editor/nm-connection-list.c:881
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Conexiune VPN %d"
 
-#: ../src/connection-editor/page-wired.c:211
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1428
-msgid "Wired"
-msgstr "Cu fir"
-
-#: ../src/connection-editor/page-wired.c:213
-msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-vpn.c:229
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 msgstr ""
-"Nu s-a putut încărca interfața de utilizator pentru conexiunile cu fir."
-
-#: ../src/connection-editor/page-wired.c:348
-#, c-format
-msgid "Wired connection %d"
-msgstr "Conexiune cu fir %d"
+"Modulul VPN nu a reușit să importe corect conexiunea VPN\n"
+"\n"
+"Eroare: no există tip serviciul VPN."
 
-#: ../src/connection-editor/page-wired-security.c:114
-msgid "802.1x Security"
-msgstr "Securitate 802.1x"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "Alegeți un tip de conexiune VPN"
 
-#: ../src/connection-editor/page-wired-security.c:116
-msgid "Could not load Wired Security security user interface."
+#: ../src/connection-editor/page-vpn.c:255
+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 ""
-"Nu s-a putut încărca interfața de utilizator pentru securitate pentru rețele "
-"cu fir."
+"Alegeți tipul conexiunii VPN pe care doriți să o folosiți pentru noua "
+"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-wired-security.c:130
-msgid "Use 802.1X security for this connection"
-msgstr "Folosește securitatea 802.1X pentru această conexiune"
+#: ../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 ""
+"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-wireless.c:147
-#: ../src/connection-editor/page-wireless.c:151
-#: ../src/connection-editor/page-wireless.c:172
-#, c-format
-msgid "default"
-msgstr "implicit"
+#: ../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)\""
+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-wireless.c:176
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:396
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1432
-msgid "Wireless"
-msgstr "Fără fir"
-
-#: ../src/connection-editor/page-wireless.c:398
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator pentru conexiunile WiFi."
 
-#: ../src/connection-editor/page-wireless.c:562
-#, c-format
-msgid "Wireless connection %d"
-msgstr "Conexiune fără fir %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Orice dispozitiv"
 
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/wireless-dialog.c:920
+#: ../src/connection-editor/page-wifi.c:619
+#, 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
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "Cheie WEP 40/128-biți (Hex sau ASCII)"
 
-#: ../src/connection-editor/page-wireless-security.c:272
-#: ../src/wireless-dialog.c:929
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Parolă WEP 128-bit"
 
-#: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/wireless-dialog.c:959
+#: ../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)"
 msgstr "WEP dinamic (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/wireless-dialog.c:973
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA și WPA2 personal"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/wireless-dialog.c:987
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA și WPA2"
 
-#: ../src/connection-editor/page-wireless-security.c:359
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, 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 WiFi; lipsesc "
 "configurări WiFi."
 
-#: ../src/connection-editor/page-wireless-security.c:368
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "Securitate fără  fir"
 
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
 msgstr "Nu s-a putut încărca interfața de utilizator pentru securitate WiFi."
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Editing %s"
-msgstr "Editare %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:105
-msgid "Editing un-named connection"
-msgstr "Editare conexiune fără nume"
-
-#: ../src/connection-editor/nm-connection-editor.c:292
-msgid ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
-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:395
-msgid "Error creating connection editor dialog."
-msgstr "Eroare la crearea dialogului editorului de conexiuni."
-
-#: ../src/connection-editor/nm-connection-editor.c:407
-msgid "_Save"
-msgstr "_Salvează"
-
-#: ../src/connection-editor/nm-connection-editor.c:408
-msgid "Save any changes made to this connection."
-msgstr "Salvează toate modificările făcute acestei conexiuni."
-
-#: ../src/connection-editor/nm-connection-editor.c:409
-msgid "_Save..."
-msgstr "_Salvează..."
-
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "Authenticate to save this connection for all users of this machine."
+msgid "missing SSID"
 msgstr ""
-"Autentificați-vă pentru a salva această conexiune pentru toți utilizatorii "
-"acestui calculator."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "A_vailable to all users"
-msgstr "Disponibil tuturor utilizatorilor"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "Conectează _automat"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
-msgstr "_Nume conexiune:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "E_xport"
-msgstr "E_xportă"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "_Import"
-msgstr "_Importă"
 
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "niciodată"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "acum"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "acum un minut"
-msgstr[1] "acum %d minute"
-msgstr[2] "acum %d de minute"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "acum o oră"
-msgstr[1] "acum %d ore"
-msgstr[2] "acum %d de ore"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "acum o zi"
-msgstr[1] "acum %d zile"
-msgstr[2] "acum %d de zile"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "acum o lună"
-msgstr[1] "acum %d luni"
-msgstr[2] "acum %d de luni"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "acum un an"
-msgstr[1] "acum %d ani"
-msgstr[2] "acum %d de ani"
-
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "Adăugarea conexiunii a eșuat"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "Eroare la salvarea conexiunii"
-
-#: ../src/connection-editor/nm-connection-list.c:516
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Proprietatea „%s” / „%s” este nevalidă: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:642
-msgid "An unknown error occurred."
-msgstr "A apărut o eroare necunoscută."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:683
-msgid "Error initializing editor"
-msgstr "Eroare la inițializarea editorului"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:700
-#: ../src/connection-editor/nm-connection-list.c:867
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
+msgid "Security not compatible with Ad-Hoc mode"
 msgstr ""
-"Fereastra de dialog a editorului de conexiuni nu a putut fi inițializată din "
-"cauza unei erori necunoscute."
 
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "Nu s-a putut crea noua conexiune"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "Nu s-a putut edita conexiunea nouă"
-
-#: ../src/connection-editor/nm-connection-list.c:714
-msgid "Could not edit connection"
-msgstr "Nu s-a putut edita conexiunea"
-
-#: ../src/connection-editor/nm-connection-list.c:744
-msgid "Connection delete failed"
-msgstr "Ștergerea conexiunii a eșuat"
-
-#: ../src/connection-editor/nm-connection-list.c:776
-#, 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/nm-connection-list.c:911
-#: ../src/connection-editor/vpn-helpers.c:227
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Nu s-a putut importa conexiunea VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:913
-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/nm-connection-list.c:926
-msgid "Could not edit imported connection"
-msgstr "Nu s-a putut edita conexiunea importată"
-
-#: ../src/connection-editor/nm-connection-list.c:1069
-msgid "Name"
-msgstr "Nume"
-
-#: ../src/connection-editor/nm-connection-list.c:1081
-msgid "Last Used"
-msgstr "Ultima folosire"
-
-#: ../src/connection-editor/nm-connection-list.c:1197
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr ""
-"Niciun modul VPN disponibil. Instalați unul pentru a activa acest buton."
-
-#: ../src/connection-editor/nm-connection-list.c:1208
-msgid "_Edit"
-msgstr "_Editează"
-
-#: ../src/connection-editor/nm-connection-list.c:1209
-msgid "Edit the selected connection"
-msgstr "Modifică conexiunea selectată"
-
-#: ../src/connection-editor/nm-connection-list.c:1210
-msgid "_Edit..."
-msgstr "_Editează..."
-
-#: ../src/connection-editor/nm-connection-list.c:1211
-msgid "Authenticate to edit the selected connection"
-msgstr "Autentificare pentru a modifica conexiunea selectată"
-
-#: ../src/connection-editor/nm-connection-list.c:1226
-msgid "_Delete"
-msgstr "Șter_ge"
-
-#: ../src/connection-editor/nm-connection-list.c:1227
-msgid "Delete the selected connection"
-msgstr "Șterge conexiunea selectată"
-
-#: ../src/connection-editor/nm-connection-list.c:1228
-msgid "_Delete..."
-msgstr "Șter_ge..."
-
-#: ../src/connection-editor/nm-connection-list.c:1229
-msgid "Authenticate to delete the selected connection"
-msgstr "Autentificare pentru a șterge conexiunea selectată"
-
-#: ../src/connection-editor/nm-connection-list.c:1500
-#| msgid "Error saving connection"
-msgid "Error creating connection"
-msgstr "Eroare la crearea conexiunii"
-
-#: ../src/connection-editor/nm-connection-list.c:1501
-#, c-format
-#| msgid "Could not create new connection"
-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:1555
-#: ../src/connection-editor/nm-connection-list.c:1567
-#| msgid "Error saving connection"
-msgid "Error editing connection"
-msgstr "Eroare la editarea conexiunii"
-
-#: ../src/connection-editor/nm-connection-list.c:1556
-#, c-format
-#| msgid "Could not edit connection"
-msgid "Don't know how to edit '%s' connections"
-msgstr "Nu se știe cum să se editeze conexiunile „%s”"
-
-#: ../src/connection-editor/nm-connection-list.c:1568
-#, 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/vpn-helpers.c:229
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2123,29 +3107,30 @@ msgstr ""
 "\n"
 "Eroare: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:261
-msgid "Select file to import"
-msgstr "Selectare fișier pentru import"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "necunoscut"
 
-#: ../src/connection-editor/vpn-helpers.c:309
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Deja există un fișier cu numele „%s”."
 
-#: ../src/connection-editor/vpn-helpers.c:311
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "Î_nlocuiește"
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:349
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Nu s-a putut exporta conexiunea VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:351
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2156,198 +3141,36 @@ msgstr ""
 "\n"
 "Eroare: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:385
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exportare conexiune VPN..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:218
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Nu s-a putut crea conexiunea PAN: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:223
-#: ../src/gnome-bluetooth/bt-widget.c:491
-msgid "Your phone is now ready to use!"
-msgstr "Telefonul este acum gata de utilizare!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:247
-#, c-format
-msgid "%s Network"
-msgstr "Rețea %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:373
-#, c-format
-msgid "Error: %s"
-msgstr "Eroare: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:486
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Nu s-a putut crea conexiunea DUN: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:509
-msgid "Mobile wizard was canceled"
-msgstr "Asistentul mobil a fost anulat"
-
-#: ../src/gnome-bluetooth/bt-widget.c:518
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Tip de telefon necunoscut (nu este GSM sau CDMA)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:712
-#: ../src/gnome-bluetooth/bt-widget.c:718
-msgid "failed to connect to the phone."
-msgstr "nu s-a putut conecta la telefon."
-
-#: ../src/gnome-bluetooth/bt-widget.c:751
-msgid "unexpectedly disconnected from the phone."
-msgstr "deconectare de la telefon neașteptată."
-
-#: ../src/gnome-bluetooth/bt-widget.c:760
-msgid "timed out detecting phone details."
-msgstr "limita de timp pentru detectarea detaliilor telefonului a expirat."
-
-#: ../src/gnome-bluetooth/bt-widget.c:772
-msgid "Detecting phone configuration..."
-msgstr "Se detectează configurația telefonului..."
-
-#: ../src/gnome-bluetooth/bt-widget.c:838
-msgid "could not find the Bluetooth device."
-msgstr "nu s-a putut găsi dispozitivul Bluetooth."
-
-#: ../src/gnome-bluetooth/bt-widget.c:971
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Adaptorul Bluetooth implicit trebuie să fie activat înainte de a configura o "
-"conexiune Dial-Up-Networking."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1003
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr ""
-"Configurarea Bluetooth nu este posibilă (nu s-a putut conecta la D-Bus: %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1013
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr ""
-"Configurarea Bluetooth nu este posibilă (nu s-a putut crea proxy D-Bus)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"Configurarea Bluetooth nu este posibilă (eroare la găsirea NetworkManager: %"
-"s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1085
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Utilizați telefonul mobil ca un dispozitiv de rețea (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:1094
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Acces la Internet folosind telefonul mobil (DUN)"
+"Miniaplicația NetworkManager nu a putut găsi unele resurse (nu s-a putut "
+"găsi fișierul .ui)."
 
-#: ../src/main.c:70
-msgid "Usage:"
-msgstr "Utilizare:"
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "_Deblochează"
 
-#: ../src/main.c:72
-msgid ""
-"This program is a component of NetworkManager (https://wiki.gnome.org/"
-"Projects/NetworkManager/)."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
 msgstr ""
-"Acest program este o componentă a aplicației NetworkManager (https://wiki."
-"gnome.org/Projects/NetworkManager/)."
-
-#: ../src/main.c:73
-msgid ""
-"It is not intended for command-line interaction but instead runs in the "
-"GNOME desktop environment."
-msgstr ""
-"Nu este conceput pentru utilizare în linia de comandă, ci pentru a rula în "
-"mediul desktop GNOME."
-
-#: ../src/mb-menu-item.c:57
-msgid "EVDO"
-msgstr "EVDO"
-
-#: ../src/mb-menu-item.c:61
-msgid "GPRS"
-msgstr "GPRS"
-
-#: ../src/mb-menu-item.c:63
-msgid "EDGE"
-msgstr "EDGE"
-
-#: ../src/mb-menu-item.c:65
-msgid "UMTS"
-msgstr "UMTS"
-
-#: ../src/mb-menu-item.c:67
-msgid "HSDPA"
-msgstr "HSDPA"
-
-#: ../src/mb-menu-item.c:69
-msgid "HSUPA"
-msgstr "HSUPA"
-
-#: ../src/mb-menu-item.c:71
-msgid "HSPA"
-msgstr "HSPA"
-
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
-
-#: ../src/mb-menu-item.c:108
-msgid "not enabled"
-msgstr "neactivat"
-
-#: ../src/mb-menu-item.c:114
-msgid "not registered"
-msgstr "neînregistrat"
-
-#: ../src/mb-menu-item.c:132
-#, c-format
-msgid "Home network (%s)"
-msgstr "Rețea de domiciliu (%s)"
-
-#: ../src/mb-menu-item.c:134
-#, c-format
-msgid "Home network"
-msgstr "Rețea de domiciliu"
 
-#: ../src/mb-menu-item.c:142
-msgid "searching"
-msgstr "se caută"
-
-#: ../src/mb-menu-item.c:145
-msgid "registration denied"
-msgstr "înregistrare refuzată"
-
-#: ../src/mb-menu-item.c:150 ../src/mb-menu-item.c:156
-#, c-format
-msgid "%s (%s roaming)"
-msgstr "%s (%s roaming)"
-
-#: ../src/mb-menu-item.c:152 ../src/mb-menu-item.c:158
-#, c-format
-msgid "%s (roaming)"
-msgstr "%s (roaming)"
-
-#: ../src/mb-menu-item.c:161
-#, c-format
-msgid "Roaming network (%s)"
-msgstr "Rețea roaming (%s)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Detalii conexiune"
 
-#: ../src/mb-menu-item.c:163
-#, c-format
-msgid "Roaming network"
-msgstr "Rețea roaming"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "Conexiuni de rețea active"
 
-#: ../src/utils/mobile-wizard.c:196
+#: ../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 ""
@@ -2355,21 +3178,25 @@ msgstr ""
 "valori:"
 
 #. Device
-#: ../src/utils/mobile-wizard.c:203
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Dispozitiv:"
 
 #. Provider
-#: ../src/utils/mobile-wizard.c:214
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Furnizor:"
 
 #. Plan and APN
-#: ../src/utils/mobile-wizard.c:225
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Plan:"
 
-#: ../src/utils/mobile-wizard.c:246
+#: ../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 "
@@ -2383,23 +3210,28 @@ msgstr ""
 "configurații. Pentru a modifica configurațiile conexiunii alegeți „Conexiuni "
 "de rețea” din meniul Sistem >> Preferințe."
 
-#: ../src/utils/mobile-wizard.c:258
+#: ../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/utils/mobile-wizard.c:319
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nelistat"
 
-#: ../src/utils/mobile-wizard.c:437
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Selectați planul:"
 
-#: ../src/utils/mobile-wizard.c:461
+#: ../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 (Nume punct de acces) selectat:"
 
-#: ../src/utils/mobile-wizard.c:480
+#: ../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"
@@ -2412,67 +3244,83 @@ msgstr ""
 "Dacă sunteți nesigur de plan, întrebați furnizorul care este APN-ul planului "
 "dumneavoastră."
 
-#: ../src/utils/mobile-wizard.c:487
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Alegeți planul de facturare"
 
-#: ../src/utils/mobile-wizard.c:535
+#: ../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/utils/mobile-wizard.c:688
+#: ../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ă:"
 
-#: ../src/utils/mobile-wizard.c:701
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Furnizor"
 
-#: ../src/utils/mobile-wizard.c:726
+#: ../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:"
 
-#: ../src/utils/mobile-wizard.c:737
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Furnizor:"
 
-#: ../src/utils/mobile-wizard.c:761
+#: ../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/utils/mobile-wizard.c:767
+#: ../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/utils/mobile-wizard.c:778
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Alegeți furnizorul"
 
-#: ../src/utils/mobile-wizard.c:1024
+#: ../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/utils/mobile-wizard.c:1036
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Țară sau regiune"
 
-#: ../src/utils/mobile-wizard.c:1043
+#: ../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/utils/mobile-wizard.c:1089
+#: ../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/utils/mobile-wizard.c:1143
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Dispozitive GSM instalate"
 
-#: ../src/utils/mobile-wizard.c:1146
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Dispozitive CDMA instalate"
 
-#: ../src/utils/mobile-wizard.c:1314
+#: ../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."
@@ -2480,185 +3328,510 @@ msgstr ""
 "Acest asistent vă ajută să configurați o conexiune la Internet mobil de "
 "bandă largă către o rețea celulară (3G)."
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../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/utils/mobile-wizard.c:1330
+#: ../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/utils/mobile-wizard.c:1336
+#: ../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/utils/mobile-wizard.c:1342
+#: ../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 ""
 "(în unele cazuri) APN-ul (Numele punctului de acces) al planului de facturare"
 
-#: ../src/utils/mobile-wizard.c:1369
+#: ../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 ""
 "Creează o conexiune pentru aces_t dispozitiv de acces la Internet mobil de "
 "bandă largă:"
 
-#: ../src/utils/mobile-wizard.c:1384
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Orice dispozitiv"
 
-#: ../src/utils/mobile-wizard.c:1397
+#: ../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/utils/mobile-wizard.c:1561
+#: ../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/utils/nmn-mobile-providers.c:78
-msgid "United Kingdom"
-msgstr "Marea Britanie"
+#: ../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/utils/nmn-mobile-providers.c:510
-msgid "Default"
-msgstr "Implicit"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/wired-dialog.c:97
-msgid "Wired 802.1X authentication"
-msgstr "Autentificare 802.1X cu fir"
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Parolă:"
 
-#: ../src/wireless-dialog.c:454
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Parolă:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "Afișea_ză parolele"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nouă..."
 
-#: ../src/wireless-dialog.c:1074
+#: ../src/libnma/nma-wifi-dialog.c:889 ../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
 msgid "C_reate"
 msgstr "C_reează"
 
-#: ../src/wireless-dialog.c:1152
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless 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/wireless-dialog.c:1154
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "Se cere autentificarea în rețeaua fără fir"
 
-#: ../src/wireless-dialog.c:1156
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "Autentificarea este necesară pentru rețeaua fără fir"
 
-#: ../src/wireless-dialog.c:1161
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "Creează rețea fără fir nouă"
 
-#: ../src/wireless-dialog.c:1163
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "Rețea fără fir nouă"
 
-#: ../src/wireless-dialog.c:1164
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, 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/wireless-dialog.c:1166
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Conectare la rețea fără fir ascunsă"
 
-#: ../src/wireless-dialog.c:1168
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "Rețea fără fir ascunsă"
 
-#: ../src/wireless-dialog.c:1169
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "Introduceți numele și detaliile de securitate pentru rețeaua fără fir "
 "ascunsă la care doriți să vă conectați."
 
-#: ../src/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
-msgstr "Nu s-a ales un certificat al Autorității de Certificare"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "Secur_itatea rețelei fără fir:"
 
-#: ../src/wireless-security/eap-method.c:280
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+msgid "C_onnection:"
+msgstr "Co_nexiune:"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+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
+msgid "Wired"
+msgstr "Cu fir"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr "Utilizare:"
+
+#: ../src/main.c:44
 msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
 msgstr ""
-"Nefolosirea unui certificat al Autorității de certificare (CA) duce la "
-"conexiuni către rețele nesigure și rețele controlate de răufăcători. Doriți "
-"să alegeți un certificat pentru Autoritatea de Certificare?"
+"Acest program este o componentă a aplicației NetworkManager (https://wiki."
+"gnome.org/Projects/NetworkManager/)."
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
-msgstr "Alegere certificat CA"
+#: ../src/main.c:45
+msgid ""
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
+msgstr ""
+"Nu este conceput pentru utilizare în linia de comandă, ci pentru a rula în "
+"mediul desktop GNOME."
+
+#: ../src/mb-menu-item.c:52
+msgid "EVDO"
+msgstr "EVDO"
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr "GPRS"
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr "EDGE"
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr "UMTS"
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr "HSDPA"
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr "HSUPA"
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr "neactivat"
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr "neînregistrat"
+
+#: ../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
+msgid "Home network"
+msgstr "Rețea de domiciliu"
+
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr "se caută"
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr "înregistrare refuzată"
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr "%s (roaming)"
 
-#: ../src/wireless-security/eap-method.c:627
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../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
+msgid "Roaming network"
+msgstr "Rețea roaming"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "Cod PIN necesar"
+
+#: ../src/mobile-helpers.c:472
+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)"
+msgstr "Conexiunea „%s” la Internet mobil de bandă largă activă: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "roaming"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, 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/wireless-security/eap-method.c:452
+#, 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:630
+#: ../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-peap.c:264
-#: ../src/wireless-security/wireless-security.c:368
-msgid "MD5"
-msgstr "MD5"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:349
-#: ../src/wireless-security/eap-method-tls.c:419
-#: ../src/wireless-security/eap-method-ttls.c:349
-msgid "Choose a Certificate Authority certificate..."
-msgstr "Alegeți certificatul autorității de certificare..."
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "Identitate anoni_mă:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "Autentificare"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
 msgstr "Identitate anoni_mă:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
-#: ../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-fast.ui.h:6
+msgid "PAC _file:"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
-msgid "I_nner authentication:"
+#: ../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
+#, fuzzy
+msgid "_Inner authentication:"
 msgstr "Aute_ntificare internă:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+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
 msgid "Version 0"
 msgstr "Versiunea 0"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:4
 msgid "Version 1"
 msgstr "Versiunea 1"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
-msgid "_PEAP version:"
+#: ../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
+#, 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
+#, fuzzy
+msgid "PEAP _version:"
 msgstr "Versiune _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-msgid "As_k for this password every time"
-msgstr "Cere această parolă de _fiecare dată"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:250
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+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"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+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:253
+#: ../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 "
@@ -2672,63 +3845,111 @@ msgstr ""
 "\n"
 "(Puteți proteja prin parolă cheia privată folosind openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:413
+#: ../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:425
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Selectați cheia privată..."
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "I_dentitate:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../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:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "Parola pentru cheia _privată:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_User certificate:"
-msgstr "Certificat _utilizator:"
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:380
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:404
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "TLS tunelat"
 
-#: ../src/wireless-security/wireless-security.c:415
+#: ../src/wireless-security/wireless-security.c:493
 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
-msgid "_Authentication:"
+#, fuzzy
+msgid "Au_thentication:"
 msgstr "_Autentificare:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Implicit)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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
 msgid "Open System"
@@ -2739,16 +3960,275 @@ msgid "Shared Key"
 msgstr "Cheie partajată"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "C_heie:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
 msgid "Sho_w key"
 msgstr "Afișea_ză cheia"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:8
+#: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "Inde_x WEP"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
-msgid "_Key:"
-msgstr "C_heie:"
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Tip:"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Conexiune nouă către Internet mobil de bandă largă (CDMA)..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "V-ați conectat la rețeaua CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Conexiune nouă către Internet mobil de bandă largă (GSM)..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "V-ați conectat la rețeaua GSM."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Rețele fără fir (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Rețea fără fir (%s)"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "conexiune fără fir dezactivată"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "rețeaua fără fir este dezactivată dintr-un comutator hardware"
+
+#~ msgid "Click on this icon to connect to a wireless network"
+#~ msgstr "Clic pe această iconiță pentru a vă conecta la o rețea fără fir"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Se pregătește conexiunea la rețeaua fără fir „%s”..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "Se configurează conexiunea la rețeaua fără fir „%s”..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Se cere o adresă de rețea fără fir pentru „%s”..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "Conexiune activă la rețeaua fără fir „%s”"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Internet mobil de bandă largă WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Internet mobil de bandă largă WiMAX"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "V-ați conectat la rețeaua WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "necunoscut"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ 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"
+
+#~ msgid "_Help"
+#~ msgstr "_Ajutor"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "Alte rețele fără fir..."
+
+#~ msgid "label"
+#~ msgstr "etichetă"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "Any"
+#~ msgstr "Orice"
+
+#~ msgid "PI_N:"
+#~ msgstr "PI_N:"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Preferă 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Preferă 3G (UMTS/HSPA)"
+
+#~ msgid "MT_U:"
+#~ msgstr "MT_U:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Adresa MAC a _dispozitivului:"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastructură"
+
+#~ msgid "_SSID:"
+#~ msgstr "_SSID:"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Automată (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Doar adrese automate (PPP)"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr ""
+#~ "Nu s-a putut încărca interfața de utilizator pentru securitate pentru "
+#~ "rețele cu fir."
+
+#~ msgid "Wireless"
+#~ msgstr "Fără fir"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "Conexiune fără fir %d"
+
+#~ msgid "_Save..."
+#~ msgstr "_Salvează..."
+
+#~ 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"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Proprietatea „%s” / „%s” este nevalidă: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "A apărut o eroare necunoscută."
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "Nu s-a putut edita conexiunea importată"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr ""
+#~ "Niciun modul VPN disponibil. Instalați unul pentru a activa acest buton."
+
+#~ msgid "_Edit..."
+#~ msgstr "_Editează..."
+
+#~ 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!"
+
+#~ msgid "%s Network"
+#~ msgstr "Rețea %s"
+
+#~ 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"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Tip de telefon necunoscut (nu este GSM sau CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "nu s-a putut conecta la telefon."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "deconectare de la telefon neașteptată."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "limita de timp pentru detectarea detaliilor telefonului a expirat."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Se detectează configurația telefonului..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Adaptorul Bluetooth implicit trebuie să fie activat înainte de a "
+#~ "configura o conexiune Dial-Up-Networking."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr ""
+#~ "Configurarea Bluetooth nu este posibilă (nu s-a putut conecta la D-Bus: "
+#~ "%s)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr ""
+#~ "Configurarea Bluetooth nu este posibilă (nu s-a putut crea proxy D-Bus)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr ""
+#~ "Configurarea Bluetooth nu este posibilă (eroare la găsirea "
+#~ "NetworkManager: %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Utilizați telefonul mobil ca un dispozitiv de rețea (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Acces la Internet folosind telefonul mobil (DUN)"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "United Kingdom"
+#~ msgstr "Marea Britanie"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Nu s-a ales un certificat al Autorității de Certificare"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Nefolosirea unui certificat al Autorității de certificare (CA) duce la "
+#~ "conexiuni către rețele nesigure și rețele controlate de răufăcători. "
+#~ "Doriți să alegeți un certificat pentru Autoritatea de Certificare?"
 
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "Există deja o instanță nm-applet activă.\n"
@@ -2919,9 +4399,6 @@ msgstr "C_heie:"
 #~ msgid "Wired network"
 #~ msgstr "Rețea cu fir"
 
-#~ msgid "Network"
-#~ msgstr "Rețea"
-
 #~ msgid "Disconnected - you are now offline"
 #~ msgstr "De acum sunteți deconectat"
 
@@ -2937,9 +4414,6 @@ msgstr "C_heie:"
 #~ msgid "WEP 40/128-bit Key"
 #~ msgstr "WEP cheie de 40/128-bit"
 
-#~ msgid "_MAC address:"
-#~ msgstr "Adresă _MAC:"
-
 #~ msgid "Select A File"
 #~ msgstr "Alegeți un fișier"
 
diff --git a/po/ru.po b/po/ru.po
index eee9ca12..a0c16072 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,9 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-09-17 16:48+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-09-23 01:32+0300\n"
 "Last-Translator: Stas Solovey <whats_up@tut.by>\n"
 "Language-Team: Русский <gnome-cyr@gnome.org>\n"
@@ -26,7 +25,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Сеть"
 
@@ -133,46 +132,90 @@ msgstr ""
 "Установите в TRUE, чтобы отключить предупреждения о сертификатах CA для "
 "второго этапа аутентификации EAP."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Апплет NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Апплет NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Аутентификация 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "П_одключиться"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Имя сети:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Не удалось создать/включить соединение"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Сбой подключения"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Сбой устройства при отключении"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Сбой при отключении"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Сбой при включении соединения"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Больше не показывать это сообщение"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -183,7 +226,7 @@ msgstr ""
 "Произошёл сбой VPN-соединения «%s», поскольку подключение к сети было "
 "прервано."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -193,7 +236,7 @@ msgstr ""
 "Произошёл сбой VPN-соединения «%s», поскольку служба VPN неожиданно "
 "завершилась."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -204,7 +247,7 @@ msgstr ""
 "Произошёл сбой VPN-соединения «%s», поскольку служба VPN вернула неверную "
 "конфигурацию."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -213,7 +256,7 @@ msgstr ""
 "\n"
 "Произошёл сбой VPN-соединения «%s», поскольку превышено время ожидания."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -223,7 +266,7 @@ msgstr ""
 "Произошёл сбой VPN-соединения «%s», поскольку служба VPN не запустилась "
 "вовремя."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -233,7 +276,7 @@ msgstr ""
 "Произошёл сбой VPN-соединения «%s», поскольку не удалось запустить службу "
 "VPN."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -243,7 +286,7 @@ msgstr ""
 "Произошёл сбой соединения VPN «%s», поскольку не удалось найти подходящий "
 "ключ для VPN."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -253,7 +296,7 @@ msgstr ""
 "Не удалось установить VPN-соединение «%s», поскольку неверный ключ доступа к "
 "VPN."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -262,7 +305,7 @@ msgstr ""
 "\n"
 "Произошёл сбой VPN-соединения «%s»."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -272,7 +315,7 @@ msgstr ""
 "\n"
 "VPN-соединение «%s» разорвано, поскольку подключение к сети было прервано."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -281,7 +324,7 @@ msgstr ""
 "\n"
 "VPN-соединение «%s» разорвано, поскольку служба VPN была остановлена."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -290,7 +333,7 @@ msgstr ""
 "\n"
 "VPN-соединение «%s» разорвано."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -301,19 +344,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Соединение VPN успешно установлено.\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Сообщение авторизации VPN"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Сбой соединения VPN"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -327,7 +370,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -340,824 +383,547 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "устройство не готово (нет прошивки)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "устройство не готово"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "соединение разорвано"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Отключиться"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "устройство не управляется"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Нет доступных сетевых устройств"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Соединения _VPN"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Настроить VPN…"
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Отключить VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Служба NetworkManager не запущена…"
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Поддержка сети отключена"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Управление _сетью"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Включить _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "_Мобильная связь"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Мобильная связь WiMA_X"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "_Уведомлять о подключении"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "C_ведения о соединении"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Изменить соединения…"
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "_Справка"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_О программе"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Вы подключены к сети «%s»."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Соединение разорвано"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Сетевое соединение было разорвано."
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Подготовка сетевого соединения «%s»…"
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Для сетевого соединения «%s» требуется аутентификация…"
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Получение сетевого адреса для «%s»…"
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Сетевое соединение «%s» установлено"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Устанавливается соединение VPN «%s»…"
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Для VPN-соединения «%s» требуется аутентификация…"
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Получение адреса VPN для «%s»…"
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-соединение «%s» установлено"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Нет подключения к сети"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Апплет NetworkManager"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Доступные"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Соединение установлено"
-
-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Вы подключены к агрегированной сети (bond)."
-
-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Подготовка агрегированного (bond) соединения «%s»…"
-
-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Настройка агрегированного (bond) соединения «%s»…"
-
-# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Для агрегированного (bond) соединения «%s» требуется аутентификация…"
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Получение адреса для «%s»…"
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Агрегированное (bond) соединение «%s» установлено"
-
-#: ../src/applet-device-bridge.c:90
-#, fuzzy
-#| msgid "You are now connected to the wired network."
-msgid "You are now connected to the bridged network."
-msgstr "Вы подключены к проводной сети."
-
-#: ../src/applet-device-bridge.c:114
-#, fuzzy, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing bridge connection '%s'..."
-msgstr "Подготовка сетевого соединения «%s»…"
-
-#: ../src/applet-device-bridge.c:117
-#, fuzzy, c-format
-#| msgid "Configuring wired network connection '%s'..."
-msgid "Configuring bridge connection '%s'..."
-msgstr "Настройка проводного сетевого соединения «%s»…"
-
-#: ../src/applet-device-bridge.c:120
-#, fuzzy, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Для VPN-соединения «%s» требуется аутентификация…"
-
-#: ../src/applet-device-bridge.c:127
-#, fuzzy, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Bridge connection '%s' active"
-msgstr "VPN-соединение «%s» установлено"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Неправильный PUK-код, обратитесь к оператору сети."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Отправка кода разблокировки…"
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Мобильное (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Мобильные"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Доступные"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Новое мобильное соединение…"
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Соединение установлено"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Вы подключены к мобильной сети."
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Мобильная сеть"
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Вы зарегистрированы в домашней сети."
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Вы зарегистрированы в роуминговой сети."
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Вы подключены к мобильной сети."
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Подготовка мобильного соединения «%s»…"
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Настройка мобильного соединения «%s»…"
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Для мобильного соединения «%s» требуется аутентификация…"
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Мобильное соединение «%s» установлено"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Новое подключение к мобильной сети CDMA…"
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Вы подключены к сети CDMA."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "Сеть CDMA."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Проводное (автоматически)"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Проводные сети (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Проводная сеть (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Проводные сети"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Проводная сеть"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Вы подключены к проводной сети."
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Подготовка проводного сетевого соединения «%s»…"
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Настройка проводного сетевого соединения «%s»…"
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Для проводного сетевого соединения «%s» требуется аутентификация…"
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Получение адреса в проводной сети для «%s»…"
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Проводное сетевое соединение «%s» установлено"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Аутентификация DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Новое подключение к мобильной сети GSM…"
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Вы подключены к сети GSM."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "Сеть GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "InfiniBand (автоматически)"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "Сети InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Сеть InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "Сети InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "Сеть InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Вы подключены к сети InfiniBand."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Подготовка соединения InfiniBand «%s»…"
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-#| msgid "Configuring mobile broadband connection '%s'..."
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Настройка соединения InfiniBand «%s»…"
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Для InfiniBand-соединения «%s» требуется аутентификация…"
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand-соединение «%s» установлено"
-
-#: ../src/applet-device-team.c:86
-#| msgid "You are now connected to the ethernet network."
-msgid "You are now connected to the teamed network."
-msgstr "Вы подключены к агрегированной сети (team)."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-#| msgid "Preparing network connection '%s'..."
-msgid "Preparing team connection '%s'..."
-msgstr "Подготовка агрегированного (team) соединения «%s»…"
-
-#: ../src/applet-device-team.c:113
-#, c-format
-#| msgid "Configuring wired network connection '%s'..."
-msgid "Configuring team connection '%s'..."
-msgstr "Настройка агрегированного (team) соединения «%s»…"
-
-#: ../src/applet-device-team.c:116
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for team connection '%s'..."
-msgstr "Для агрегированного (team) соединения «%s» требуется аутентификация…"
-
-#: ../src/applet-device-team.c:123
-#, c-format
-#| msgid "VPN connection '%s' active"
-msgid "Team connection '%s' active"
-msgstr "Агрегированное (team) соединение «%s» установлено"
-
-#: ../src/applet-device-vlan.c:204
-#| msgid "You are now connected to the CDMA network."
-msgid "You are now connected to the VLAN."
-msgstr "Вы подключены к сети VLAN."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-#| msgid "Starting VPN connection '%s'..."
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Подготовка соединения VLAN «%s»…"
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-#| msgid "Starting VPN connection '%s'..."
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Настройка соединения VLAN «%s»…"
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-#| msgid "User authentication required for VPN connection '%s'..."
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Для VLAN-соединения «%s» требуется аутентификация…"
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VLAN-соединение «%s» установлено"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Подключиться к скрытой сети Wi-Fi…"
 
 # перевод wifi как "беспроводная сеть" не подходит, так как bluetooth тоже беспроводная сеть
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Создать _новую сеть Wi-Fi…"
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(нет)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Сети Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Сеть Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 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:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi выключен"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi выключен аппаратно"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Ещё сети"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Доступны сети Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Используйте меню сети для подключения к сети Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Подключено к сети Wi-Fi «%s»."
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Подготовка сетевого соединения Wi-Fi «%s»…"
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Настройка сетевого соединения Wi-Fi «%s»…"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Для соединения по Wi-Fi «%s» требуется аутентификация…"
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Получение адреса в сети Wi-Fi для «%s»…"
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Установлено сетевое соединение Wi-Fi «%s»: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Установлено сетевое соединение Wi-Fi «%s»"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Не удалось включить соединение"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Не удалось добавить новое соединение"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Мобильное WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "Мобильное WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX отключён"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX отключён аппаратно"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Вы подключены к сети WiMAX."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Мобильное соединение «%s» установлено: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "роуминг"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Ошибка показа сведений о соединении:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Динамический WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Адреса"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Без проверки подлинности"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (по умолчанию)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мбит/c"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d дБ"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "неизвестно"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "неизвестно"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP-адрес:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP-адрес:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Широковещательный адрес:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Маска подсети:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Шлюз по умолчанию:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Маска подсети:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Общий"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "MAC-адрес:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Драйвер:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Скорость:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Защита:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Шлюз по умолчанию:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Игнорировать"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Тип VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Шлюз VPN:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Имя пользователя VPN:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Баннер VPN:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Основное соединение:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Неизвестно"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Активные соединения отсутствуют!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1165,44 +931,44 @@ msgstr ""
 "© 2005-2008 Novell, Inc.\n"
 "и многие другие участники сообщества и переводчики"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Апплет области уведомления для управления сетевыми устройствами и "
 "соединениями."
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Веб-сайт NetworkManager"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Компоненты приложения отсутствуют"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Пароль мобильной сети"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Для подключения к сети «%s» требуется пароль."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Для разблокировки SIM требуется PIN-код"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "Для разблокировки SIM требуется PIN-код"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1210,25 +976,25 @@ msgid ""
 msgstr "Для работы мобильного устройства «%s» требуется PIN-код SIM."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN-код:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Показывать PIN-код"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Для разблокировки SIM требуется PUK-код"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "Для разблокировки SIM требуется PUK-код"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1236,27 +1002,34 @@ msgid ""
 msgstr "Для работы мобильного устройства «%s» требуется PUK-код SIM."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK-код:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Новый PIN-код:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Введите новый PIN-код ещё раз:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Показывать PIN/PUK-коды:"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1266,18 +1039,41 @@ msgstr ""
 "IP-адреса вашего компьютера в сети. Нажмите кнопку «Добавить» для добавления "
 "IP-адреса."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Удалить"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "И_гнорировать автоматически полученные маршруты"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "Использовать это соединение только для _ресурсов в этой сети"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1285,9 +1081,8 @@ msgstr ""
 "Если включено, то это соединение никогда не будет использоваться как сетевое "
 "соединение по умолчанию."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1295,15 +1090,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Создать…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "Выберите тип соединения"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1357,48 +1152,41 @@ msgid "Bonded _connections:"
 msgstr "Агрегированные (bond) _соединения:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
 msgstr "_Режим:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "_Изменить"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "_Удалить"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Изменить"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "_Частота мониторинга:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "мс"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "_Интерфейс:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "_Мониторинг соединения:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "_Получатели ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1406,30 +1194,48 @@ msgstr ""
 "IP-адрес или список IP-адресов, разделённых запятыми, используемые для "
 "проверки состояния связи."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Задержка _установления соединения:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Задержка _разрыва соединения:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Первичный:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "байтов"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "Стоимость _пути:"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Приоритет:"
 
@@ -1441,50 +1247,94 @@ msgstr "Режим _петли:"
 msgid "Bridged _connections:"
 msgstr "Мостовые _соединения:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "Задержка _перенаправления:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "Интервал _hello:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "с"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Управление _сетью"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Включить _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Максимальное время жизни сообщения:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_Время жизни сообщения:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "автоматически"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "по умолчанию"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Адрес"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Адрес"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Любое устройство"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Внутренняя ошибка обновления ключей."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:1
 #, fuzzy
-#| msgid "Use 802.1_X security for this connection"
 msgid "Use Data Center Bridging (DCB) for this connection"
 msgstr "Использовать защиту 802.1_X для этого соединения"
 
@@ -1579,98 +1429,97 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Приоритет:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 #, fuzzy
-#| msgid "_Priority:"
 msgid "Priority Bandwidth:"
 msgstr "_Приоритет:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "ID группы:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr ""
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1683,7 +1532,7 @@ 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:4
+#: ../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
@@ -1691,8 +1540,9 @@ msgid "Sho_w password"
 msgstr "Пока_зывать пароль"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1704,7 +1554,8 @@ msgstr "_Пароль:"
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Автоматически"
@@ -1759,18 +1610,18 @@ msgstr "_Автосогласование"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "MAC-адрес _устройства:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "С_лужба:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "_Клонированный MAC-адрес:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1780,19 +1631,54 @@ msgstr ""
 "устройства, на котором включено это соединение. Эта возможность известна как "
 "клонирование MAC-адреса или подмена (spoofing). Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "байтов"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "По умолчанию"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Игнорировать"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Broadcast"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Пароль к секретному ключу:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1831,8 +1717,8 @@ msgstr "Автоматически, с ручными параметрами DNS
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Вручную"
 
@@ -1843,8 +1729,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Общий с другими компьютерами"
 
@@ -1858,7 +1744,7 @@ msgstr "_Способ настройки:"
 msgid "Addresses"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1868,8 +1754,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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1877,25 +1763,25 @@ msgstr ""
 "Домены, используемые для разрешения имён узлов. Можно указать несколько "
 "доменов через запятую."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "Серверы _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1903,11 +1789,11 @@ msgstr ""
 "IP-адреса DNS-серверов используются для разрешения имён узлов. Можно указать "
 "несколько DNS-серверов через запятую."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1915,13 +1801,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Маршруты…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Выключено"
 
@@ -1933,11 +1819,8 @@ msgstr ""
 msgid "Enabled (prefer temporary address)"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 #, fuzzy
-#| msgid ""
-#| "IP addresses of domain name servers used to resolve host names. Use "
-#| "commas to separate multiple domain name server addresses."
 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 "
@@ -1946,15 +1829,15 @@ msgstr ""
 "IP-адреса DNS-серверов используются для разрешения имён узлов. Можно указать "
 "несколько DNS-серверов через запятую."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1963,71 +1846,38 @@ msgstr ""
 "соединение в случае сбоя конфигурации IPv6, но успеха конфигурации IPv4."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Любой"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Предпочитать 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Предпочитать 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Предпочитать 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Только 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Основные параметры"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "_Номер:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Дополнительные параметры"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "Идентификатор с_ети:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Тип:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Изменить…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "Включать _роуминг, если домашняя сеть недоступна"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "По_казывать пароли"
 
@@ -2085,43 +1935,63 @@ msgid "_JSON config:"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
-#| msgid "Import a saved VPN configuration..."
 msgid "_Import team configuration from a file..."
 msgstr "_Импортировать параметры агрегированного подключения (Team) из файла…"
 
 #: ../src/connection-editor/ce-page-team.ui.h:1
-#| msgid "Bonded _connections:"
 msgid "_Teamed connections:"
 msgstr "_Агрегированные подключения (Team):"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-#| msgid "Import a saved VPN configuration..."
-msgid "I_mport team configuration from a file..."
-msgstr "И_мпортировать параметры агрегированного подключения (Team) из файла…"
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Импортировать параметры агрегированного подключения (Team) из файла…"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Родительский интерфейс:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Имя интерфейса VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Клонированный MAC-адрес:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "_Идентификатор VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Имя устройства + номер"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + номер"
 
@@ -2138,94 +2008,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 ГГц)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Инфраструктура"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "мВт"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Мо_щность передачи:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Мбит/c"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "Скорость:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Канал:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_Диапазон:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "_Режим:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Разрешённые методы аутентификации"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "_CHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol версии 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2234,136 +2108,157 @@ msgstr ""
 "аутентификации. Если же соединение не устанавливается, попробуйте выключить "
 "поддержку некоторых методов."
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "Адрес"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "Маска сети"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "Шлюз"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "Метрика"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "Префикс"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Агрегированное (Bond)"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Агрегированное (Team)"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Мост"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Физическое"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Логическое"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Импортировать сохранённые параметры VPN…"
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Не удалось создать диалог редактора соединений из-за внутренней ошибки."
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Не удалось создать новое соединение"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Не удалось удалить соединение"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Удалить соединение «%s»?"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "Адрес"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Маска сети"
+
+#: ../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
+msgid "Gateway"
+msgstr "Шлюз"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Метрика"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Префикс"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Изменение %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Изменение безымянного соединения"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Название соединения:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Ошибка инициализации редактора"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Сбой добавления соединения"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2371,68 +2266,63 @@ msgstr ""
 "Редактор соединений не может найти некоторые необходимые ресурсы (не найден "
 "файл glade)."
 
-#: ../src/connection-editor/nm-connection-editor.c:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Сохранить параметры соединения."
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Введите пароль администратора для того, чтобы сделать это соединение общим "
 "для всех пользователей компьютера."
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Не удалось создать соединение"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Не удалось изменить соединение"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Ошибка создания диалога для изменения соединений."
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Ошибка инициализации редактора"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Сбой добавления соединения"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "Ошибка сохранения соединения"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Неверное свойство «%s» / «%s»: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "_Название соединения:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Экспортировать…"
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "не было подключения"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "сейчас"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2440,7 +2330,7 @@ msgstr[0] "%d минута назад"
 msgstr[1] "%d минуты назад"
 msgstr[2] "%d минут назад"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2448,7 +2338,7 @@ msgstr[0] "%d час назад"
 msgstr[1] "%d часа назад"
 msgstr[2] "%d часов назад"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2456,7 +2346,7 @@ msgstr[0] "%d день назад"
 msgstr[1] "%d дня назад"
 msgstr[2] "%d дней назад"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2464,7 +2354,7 @@ msgstr[0] "%d месяц назад"
 msgstr[1] "%d месяца назад"
 msgstr[2] "%d месяцев назад"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2472,78 +2362,121 @@ msgstr[0] "%d год назад"
 msgstr[1] "%d года назад"
 msgstr[2] "%d лет назад"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Название"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Последнее подключение"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Изменить выбранное соединение."
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Для изменения выбранного соединения необходима аутентификация"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Удалить выбранное соединение"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Для удаления выбранного соединения необходима аутентификация"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Модули VPN не установлены."
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Неизвестно, как создавать соединения «%s»"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Ошибка создания соединения"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Ошибка изменения соединения"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Соединение с UUID «%s» не найдено"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Защита 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "Не удалось загрузить диалоговое окно настройки безопасности 802.1x."
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Использовать защиту 802.1_X для этого соединения"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Не удалось загрузить диалог настройки DSL."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "не удалось найти устройство Bluetooth."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Объединение %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Проводная сеть"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Сеть Wi-Fi"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Не удалось загрузить диалог настройки объединения интерфейсов."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Первичный:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Объединение %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Не удалось загрузить диалог настройки мостового соединения."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Мост %d"
@@ -2551,61 +2484,76 @@ msgstr "Мост %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Порт моста"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Не удалось загрузить диалог настройки порта мостового соединения."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr ""
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 #, fuzzy
-#| msgid "Could not load DSL user interface."
 msgid "Could not load DCB user interface."
 msgstr "Не удалось загрузить диалог настройки DSL."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Не удалось загрузить диалог настройки DSL."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-соединение %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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-адресом. Пример: "
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr ""
 "Не удалось загрузить пользовательский интерфейс для проводного соединения."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Клонированный MAC-адрес:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 msgid ""
 "The zone defines the trust level of the connection. Default is not a regular "
 "zone, selecting it results in the use of the default zone set in the "
@@ -2615,288 +2563,336 @@ msgstr ""
 "является зоной общего пользования, выбрав эту зону, вы установите её в "
 "межсетевом экране. Работает только при включённом firewalld."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD не запущен."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс общих параметров."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Не удалось загрузить пользовательский интерфейс управления InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Соединение InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Автоматически (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Автоматически (VPN, только адрес)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "Автоматически (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "Автоматически (PPP, только адрес)"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "Автоматически, только адреса"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Автоматически (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Автоматически (PPPoE, только адрес)"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Автоматически (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Автоматически (DHCP, только адрес)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Только для локальной связи"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "_Дополнительные серверы DNS:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "До_полнительные поисковые домены:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Маршруты IPv4 для %s"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Параметры IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Не удалось загрузить диалог настройки IPv4."
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "Автоматически, только адреса"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Автоматически, только DHCP"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Маршруты IPv4 для %s"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Параметры IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Не удалось загрузить диалог настройки IPv4."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr ""
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, 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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "Подчинённое %s %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Не удалось загрузить диалог настройки мобильного соединения."
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Указанный тип мобильного соединения не поддерживается."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Выберите оператора мобильной связи"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr "Выберите предоставляемый оператором тип мобильной связи."
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Провайдер использует технологию _GSM (GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Провайдер использует технологию _CDMA (1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "Нет"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Параметры PPP"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Не удалось загрузить диалог настройки PPP."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Выбор файла для импортирования"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr ""
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 #, fuzzy
-#| msgid "Could not load vlan user interface."
 msgid "Could not load team user interface."
 msgstr "Не удалось загрузить диалог настройки vlan."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, fuzzy, c-format
-#| msgid "DSL connection %d"
 msgid "Team connection %d"
 msgstr "DSL-соединение %d"
 
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 #, fuzzy
-#| msgid "Bridge Port"
 msgid "Team Port"
 msgstr "Порт моста"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 #, fuzzy
-#| msgid "Could not load bridge port user interface."
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (посредством «%s»)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Нет подключения к сети"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Не удалось загрузить диалог настройки vlan."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-соединение %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Не удалось загрузить интерфейс для VPN."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Не удалось найти VPN-модуль «%s»."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-соединение %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2906,11 +2902,11 @@ msgstr ""
 "\n"
 "Ошибка: тип службы VPN не поддерживается."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Выберите тип VPN-соединения"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2919,7 +2915,7 @@ msgstr ""
 "Выберите тип создаваемого VPN-соединения. Если необходимый тип отсутствует в "
 "списке, то возможно, не установлен необходимый VPN-модуль."
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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"
@@ -2927,71 +2923,91 @@ msgstr ""
 "Этот параметр привязывает это соединение к беспроводной точке доступа, "
 "указанной по идентификатору BSSID.  Пример: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"Привязать соединение к сетевому устройству с этим MAC-адресом. Пример: "
+"00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u МГц)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Не удалось загрузить интерфейс пользователя для Wi-Fi."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Любое устройство"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Соединение Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP (128-битный ключ)"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Динамический WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA/WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Не удалось загрузить диалог настройки защиты Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Защита Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Не удалось загрузить диалог настройки защиты Wi-Fi."
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "Не удалось загрузить диалог настройки WiMAX."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Соединение WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Не удалось импортировать VPN-соединение"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3004,25 +3020,30 @@ msgstr ""
 "\n"
 "Ошибка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Неизвестная ошибка"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Файл с именем «%s» уже существует."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Заменить"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Не удалось экспортировать VPN-соединение"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3033,11 +3054,11 @@ msgstr ""
 "\n"
 "Ошибка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Экспортировать VPN-соединение…"
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -3045,97 +3066,11 @@ msgstr ""
 "Апплет NetworkManager не смог найти некоторые необходимые ресурсы (не "
 "найден .ui-файл интерфейса)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "Невозможно настроить Bluetooth (ошибка подключения к D-Bus: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "Невозможно настроить Bluetooth (не найден NetworkManager: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Использовать мобильный телефон как сетевое устройство (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Доступ к Интернету с использованием вашего мобильного телефона (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Ошибка: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Не удалось создать DUN-соединение: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "Телефон готов к работе!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Мастер настройки мобильного соединения отменён"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Неизвестный тип телефона (не GSM и не CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "неизвестный тип модема."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "не удалось подключиться к телефону."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "ошибка получения подключения к шине"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "неожиданный разрыв связи с телефоном."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "превышено время ожидания для поиска телефона."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "Поиск настроек телефона…"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Адаптер Bluetooth по умолчанию должен быть включён до настройки "
-"коммутируемого соединения."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Не удалось создать PAN-соединение: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "Сеть %s"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Разблокировать"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Разблокировать это устройство автоматически"
 
@@ -3143,31 +3078,36 @@ msgstr "Разблокировать это устройство автомат�
 msgid "Connection Information"
 msgstr "Сведения о текущем соединении"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Активные сетевые соединения"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Устройство:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Оператор:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Тарифный план:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3179,23 +3119,28 @@ msgstr ""
 "соединение с этой сетью. Чтобы изменить параметры соединения, дважды "
 "щёлкните на соединении."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Подтверждение параметров мобильной сети"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Нет в списке"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Выберите тарифный план:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3208,67 +3153,83 @@ msgstr ""
 "Если вы не уверены, какой тарифный план выбрать, уточните APN у оператора "
 "мобильной связи."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Выберите тарифный план"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Другой…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Выбор оператора из _списка:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Оператор"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Оператор:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Выберите оператора"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "Список стран и регионов:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Страна и регион"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Другая страна"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Установленное GSM-устройство"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Установленное CDMA-устройство"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3276,123 +3237,142 @@ msgstr ""
 "Мастер подключения к мобильной сети поможет вам настроить соединение с сетью "
 "3G через сотовый телефон."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Необходимо знать следующие сведения:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Название оператора мобильной связи"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Название тарифного плана (необязательно)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Создать соединение через мобильное _устройство:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Любое устройство"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Настройка мобильного соединения"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Новое мобильное соединение"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Проводные"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Дополнительный пароль:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Дополнительный пароль:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../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
+#, 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/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Новая…"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Без проверки подлинности"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "С_оздать"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "Для подключения к сети Wi-Fi «%s» требуется указать ключ или пароль."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Для сети Wi-Fi требуется аутентификация"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Для сети Wi-Fi требуется аутентификация"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Создать новую сеть Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Создать сеть Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Введите имя для создаваемой сети Wi-Fi."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Подключение к скрытой сети Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Скрытая сеть Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3400,31 +3380,55 @@ msgstr ""
 "Введите имя и параметры безопасности скрытой сети Wi-Fi, к которой "
 "необходимо подключиться."
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Дополнительный пароль:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "По_казывать пароли"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_Безопасность Wi-Fi:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "Сое_динение:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "_Адаптер Wi-Fi:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Использование:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3432,7 +3436,7 @@ msgstr ""
 "Эта программа является частью NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3440,138 +3444,151 @@ msgstr ""
 "Она не предназначена для использования из командной строки, её следует "
 "запускать из рабочей среды GNOME."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "недоступен"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "не зарегистрирован"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Домашняя сеть (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Домашняя сеть"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "идёт поиск"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "регистрация запрещена"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роуминг)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Роуминговая сеть (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Роуминговая сеть"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN-код для SIM-карты «%s» (%s)"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Требуется PIN-код"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Для использования мобильного устройства требуется PIN-код"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Мобильное соединение «%s» установлено: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "роуминг"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Подключение %s"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Запомнить пароль только для этого _пользователя"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "Запомнить пароль для _всех пользователей"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Сертификаты DER или PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Выберите файл PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Файлы PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Все файлы"
 
@@ -3607,15 +3624,32 @@ msgstr "Вн_утренняя аутентификация:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Разрешить автоматическую инициализацию PAC"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Выбрать сертификат удостоверяющего центра…"
 
@@ -3643,15 +3677,46 @@ msgstr "Сертификат УЦ не _требуется"
 msgid "PEAP _version:"
 msgstr "_Версия PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "_Запрашивать этот пароль каждый раз"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "С_ертификат УЦ:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Использовать секретные ключи без шифрования небезопасно"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3664,11 +3729,11 @@ msgstr ""
 "\n"
 "Примечание: секретный ключ можно защитить с помощью openssl."
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Выбрать персональный сертификат…"
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Выбрать секретный ключ…"
 
@@ -3688,24 +3753,37 @@ msgstr "Секретный _ключ:"
 msgid "_Private key password:"
 msgstr "_Пароль к секретному ключу:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr ""
 
 # Метод аутентификации
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Туннелированный TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Защищённый EAP (PEAP)"
 
@@ -3715,6 +3793,44 @@ msgstr "Защищённый EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Аутентификация:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (по умолчанию)"
@@ -3739,6 +3855,322 @@ msgstr "Пока_зывать ключ"
 msgid "WEP inde_x:"
 msgstr "_Индекс WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Тип:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Мобильная связь WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "_Справка"
+
+# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Вы подключены к агрегированной сети (bond)."
+
+# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Подготовка агрегированного (bond) соединения «%s»…"
+
+# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Настройка агрегированного (bond) соединения «%s»…"
+
+# есть bond и есть team, принцип работы один, и то и другое переводится как "агрегированное", но нужно уточнять что имелось ввиду
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr ""
+#~ "Для агрегированного (bond) соединения «%s» требуется аутентификация…"
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Получение адреса для «%s»…"
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Агрегированное (bond) соединение «%s» установлено"
+
+#, fuzzy
+#~| msgid "You are now connected to the wired network."
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Вы подключены к проводной сети."
+
+#, fuzzy
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Подготовка сетевого соединения «%s»…"
+
+#, fuzzy
+#~| msgid "Configuring wired network connection '%s'..."
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Настройка проводного сетевого соединения «%s»…"
+
+#, fuzzy
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Для VPN-соединения «%s» требуется аутентификация…"
+
+#, fuzzy
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "VPN-соединение «%s» установлено"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Новое подключение к мобильной сети CDMA…"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Вы подключены к сети CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "Сеть CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Новое подключение к мобильной сети GSM…"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Вы подключены к сети GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "Сеть GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "InfiniBand (автоматически)"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Сети InfiniBand (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Сеть InfiniBand (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Сети InfiniBand"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "Сеть InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Вы подключены к сети InfiniBand."
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Подготовка соединения InfiniBand «%s»…"
+
+#~| msgid "Configuring mobile broadband connection '%s'..."
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Настройка соединения InfiniBand «%s»…"
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "Для InfiniBand-соединения «%s» требуется аутентификация…"
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand-соединение «%s» установлено"
+
+#~| msgid "You are now connected to the ethernet network."
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Вы подключены к агрегированной сети (team)."
+
+#~| msgid "Preparing network connection '%s'..."
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Подготовка агрегированного (team) соединения «%s»…"
+
+#~| msgid "Configuring wired network connection '%s'..."
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Настройка агрегированного (team) соединения «%s»…"
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr ""
+#~ "Для агрегированного (team) соединения «%s» требуется аутентификация…"
+
+#~| msgid "VPN connection '%s' active"
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Агрегированное (team) соединение «%s» установлено"
+
+#~| msgid "You are now connected to the CDMA network."
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Вы подключены к сети VLAN."
+
+#~| msgid "Starting VPN connection '%s'..."
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Подготовка соединения VLAN «%s»…"
+
+#~| msgid "Starting VPN connection '%s'..."
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Настройка соединения VLAN «%s»…"
+
+#~| msgid "User authentication required for VPN connection '%s'..."
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Для VLAN-соединения «%s» требуется аутентификация…"
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN-соединение «%s» установлено"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Мобильное WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Мобильное WiMAX"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX отключён"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX отключён аппаратно"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Вы подключены к сети WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d дБ"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "неизвестно"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "неизвестно"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Режим:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "MAC-адрес _устройства:"
+
+#~ msgid "Any"
+#~ msgstr "Любой"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Предпочитать 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Предпочитать 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Предпочитать 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Только 4G (LTE)"
+
+#~| msgid "Import a saved VPN configuration..."
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr ""
+#~ "И_мпортировать параметры агрегированного подключения (Team) из файла…"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Инфраструктура"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Ошибка сохранения соединения"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Неверное свойство «%s» / «%s»: %d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Автоматически (PPP)"
+
+#~ 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)."
+#~ msgstr ""
+#~ "Невозможно настроить Bluetooth (ошибка подключения к D-Bus: (%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "Невозможно настроить Bluetooth (не найден NetworkManager: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Использовать мобильный телефон как сетевое устройство (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr ""
+#~ "Доступ к Интернету с использованием вашего мобильного телефона (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Ошибка: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Не удалось создать DUN-соединение: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Телефон готов к работе!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Мастер настройки мобильного соединения отменён"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Неизвестный тип телефона (не GSM и не CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "неизвестный тип модема."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "не удалось подключиться к телефону."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "ошибка получения подключения к шине"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "неожиданный разрыв связи с телефоном."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "превышено время ожидания для поиска телефона."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Поиск настроек телефона…"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Адаптер Bluetooth по умолчанию должен быть включён до настройки "
+#~ "коммутируемого соединения."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Не удалось создать PAN-соединение: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Сеть %s"
+
 #~ msgid "Secondary DNS:"
 #~ msgstr "Вторичный DNS:"
 
@@ -3843,9 +4275,6 @@ msgstr "_Индекс WEP:"
 #~ msgid "Yes"
 #~ msgstr "Да"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "не удалось найти устройство Bluetooth."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "Невозможно настроить Bluetooth (ошибка создания прокси D-Bus)."
 
diff --git a/po/rw.po b/po/rw.po
index 05d92b38..33808a88 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,384 +15,3860 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-01 16:22-0700\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: rw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "ULL NAME <EMAIL@ADDRESS>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: info-daemon/networks.glade.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+msgid "Network"
+msgstr ""
+
+#: ../nm-applet.desktop.in.h:2
 #, fuzzy
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<Uburemere UTSINDAGIYE"
+msgid "Manage your network connections"
+msgstr "urusobe Ukwihuza"
+
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+#, fuzzy
+msgid "Network Connections"
+msgstr "urusobe Ukwihuza"
+
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+msgid "Disable connected notifications"
+msgstr ""
 
-#: info-daemon/networks.glade.h:2
-msgid "Modify Wireless Networks"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 
-#: info-daemon/passphrase.glade.h:1 panel-applet/applet.glade.h:2
-msgid "*"
-msgstr "*"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+msgid "Disable disconnected notifications"
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:2
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
 msgid ""
-"128-bit Passphrase (WEP)\n"
-"Ascii Key (WEP)\n"
-"Hex Key (WEP)"
+"Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 
-#: info-daemon/passphrase.glade.h:6
-#, fuzzy, no-c-format
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
-"\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
 msgstr ""
-"<Uburemere UTSINDAGIYE Ingano Kinini ku A Cyangwa Bishunzwe: Urufunguzo ni "
-"Bya ngombwa Kuri i urusobe"
 
-# #-#-#-#-#  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
-#: info-daemon/passphrase.glade.h:9
-#, fuzzy
-msgid "Key Type:"
-msgstr "Ubwoko bw'agakandisho"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr ""
 
-#: info-daemon/passphrase.glade.h:10
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:140
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:150
-#: panel-applet/essid.glade.h:7 panel-applet/applet.glade.h:19
-msgid "Passphrase:"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 
-#: info-daemon/passphrase.glade.h:11
-msgid "Wireless Network Key Required"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
 msgstr ""
 
-#: info-daemon/passphrase.glade.h:12 panel-applet/applet.glade.h:22
-#, fuzzy
-msgid "_Login to Network"
-msgstr "Kuri"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+msgid "Used to determine whether settings should be migrated to a new version."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:143
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:153
-msgid "Ascii Key:"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
+msgid "Disable WiFi Create"
 msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:146
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:156
-msgid "Hex Key:"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 
-#: info-daemon/NetworkManagerInfoVPN.c:158
-#, fuzzy, c-format
-msgid "You must log in to access the private network %s"
-msgstr "LOG in Kuri i By'umwihariko urusobe"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:149 panel-applet/NMWirelessApplet.c:167
-msgid "NetworkManager Applet"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+msgid "Ignore CA certificate"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:151 panel-applet/NMWirelessApplet.c:169
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
 #, fuzzy
-msgid "Copyright (C) 2004-2005 Red Hat, Inc."
-msgstr "C"
+msgid "NetworkManager"
+msgstr "ni OYA"
 
-#: panel-applet/NMWirelessApplet.c:152 panel-applet/NMWirelessApplet.c:170
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
 #, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "ni OYA"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
 msgid ""
-"Notification area applet for managing your network devices and connections."
-msgstr "Ubuso Apuleti... kugirango urusobe Na Ukwihuza"
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+#, fuzzy
+msgid "C_onnect"
+msgstr "Kwihuza"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:384 panel-applet/NMWirelessApplet.c:1523
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:319
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr ""
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+msgid "Failed to add/activate connection"
+msgstr ""
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr ""
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+msgid "Connection failure"
+msgstr ""
+
+#: ../src/applet.c:399
+msgid "Device disconnect failed"
+msgstr ""
+
+#: ../src/applet.c:404
+msgid "Disconnect failure"
+msgstr ""
+
+#: ../src/applet.c:434
 #, fuzzy
+msgid "Connection activation failed"
+msgstr "Na: Bishunzwe: Bikora"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr ""
+
+#: ../src/applet.c:844
+#, c-format
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
-msgstr "OYA Gushaka Bya ngombwa i IDOSIYE OYA Byabonetse"
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:395
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+
+#: ../src/applet.c:853
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+
+#: ../src/applet.c:856
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+
+#: ../src/applet.c:859
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+
+#: ../src/applet.c:862
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+
+#: ../src/applet.c:865
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+
+#: ../src/applet.c:888
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr ""
+
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr ""
+
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr ""
+
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+#, fuzzy
+msgid "disconnected"
+msgstr "Kwihuza"
+
+#: ../src/applet.c:1308
+#, fuzzy
+msgid "Disconnect"
+msgstr "Kwihuza"
+
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr ""
+
+#: ../src/applet.c:1395
+#, fuzzy
+msgid "No network devices available"
+msgstr "urusobe Byabonetse"
+
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr ""
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr ""
+
+#: ../src/applet.c:1508
+#, fuzzy
+msgid "_Disconnect VPN"
+msgstr "Kwihuza"
+
+#: ../src/applet.c:1615
+#, fuzzy
+msgid "NetworkManager is not running..."
+msgstr "ni OYA"
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr ""
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr ""
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+msgid "Enable _Wi-Fi"
+msgstr ""
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr ""
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr ""
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr ""
+
+#: ../src/applet.c:1894
+#, fuzzy
+msgid "_About"
+msgstr "Bigyanye"
+
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr ""
+
+#: ../src/applet.c:2222
+#, fuzzy
+msgid "Disconnected"
+msgstr "Kwihuza"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#: ../src/applet.c:2474
 #, fuzzy, c-format
-msgid "The network device \"%s (%s)\" does not support wireless scanning."
-msgstr "urusobe APAREYE OYA Gushigikira"
+msgid "Preparing network connection '%s'..."
+msgstr "urusobe Ukwihuza"
 
-#: panel-applet/NMWirelessApplet.c:403
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, fuzzy, c-format
-msgid "The network device \"%s (%s)\" does not support link detection."
-msgstr "urusobe APAREYE OYA Gushigikira Ihuza"
+msgid "Requesting a network address for '%s'..."
+msgstr "Kuri urusobe"
+
+#: ../src/applet.c:2483
+#, fuzzy, c-format
+msgid "Network connection '%s' active"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:627
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr ""
+
+#: ../src/applet.c:2616
 #, fuzzy
 msgid "No network connection"
 msgstr "urusobe Ukwihuza"
 
-#: panel-applet/NMWirelessApplet.c:632
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr ""
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr ""
+
+#: ../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
+msgid "Mobile Broadband"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr ""
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+#, fuzzy
+msgid "Connection Established"
+msgstr "Na: Bishunzwe: Bikora"
+
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:30
+msgid "Auto Ethernet"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:82
+#, c-format
+msgid "Ethernet Networks (%s)"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:84
+#, c-format
+msgid "Ethernet Network (%s)"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:87
+msgid "Ethernet Networks"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:89
 #, fuzzy
-msgid "Wired network connection"
+msgid "Ethernet Network"
+msgstr "Kuri"
+
+#: ../src/applet-device-ethernet.c:133
+msgid "You are now connected to the ethernet network."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "urusobe Ukwihuza"
 
-#: panel-applet/NMWirelessApplet.c:637
+#: ../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
+#, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:170
+#, c-format
+msgid "Requesting an ethernet network address for '%s'..."
+msgstr ""
+
+#: ../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
+msgid "DSL authentication"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:230
 #, fuzzy
-msgid "Connecting to a wired network..."
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Kuri a urusobe"
 
-#: panel-applet/NMWirelessApplet.c:646
+#: ../src/applet-device-wifi.c:281
 #, fuzzy
-msgid "Connected to an Ad-Hoc wireless network"
-msgstr "Kuri urusobe"
+msgid "Create _New Wi-Fi Network..."
+msgstr "Gishya"
 
-#: panel-applet/NMWirelessApplet.c:660
-#, fuzzy, c-format
-msgid "Wireless network connection to '%s' (%d%%)"
-msgstr "urusobe Ukwihuza Kuri"
+#: ../src/applet-device-wifi.c:431
+msgid "(none)"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:901
+#, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:903
+#, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Kuri"
+msgstr[1] "Kuri"
+
+#: ../src/applet-device-wifi.c:934
+msgid "Wi-Fi is disabled"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:665
+#: ../src/applet-device-wifi.c:996
 #, fuzzy
-msgid "Wireless network connection"
+msgid "More networks"
+msgstr "urusobe"
+
+#: ../src/applet-device-wifi.c:1180
+msgid "Wi-Fi Networks Available"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1181
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1364
+#, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "urusobe Ukwihuza"
 
-#: panel-applet/NMWirelessApplet.c:670
+#: ../src/applet-device-wifi.c:1402
 #, fuzzy, c-format
-msgid "Connecting to wireless network '%s'..."
-msgstr "Kuri urusobe"
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "urusobe Ukwihuza"
+
+#: ../src/applet-device-wifi.c:1405
+#, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1408
+#, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:676
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr "urusobe Ukwihuza Kuri"
+
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/applet-device-wifi.c:1442
 #, fuzzy
-msgid "NetworkManager is not running"
-msgstr "ni OYA"
+msgid "Failed to activate connection"
+msgstr "urusobe Ukwihuza"
 
-#: panel-applet/NMWirelessApplet.c:681
+#: ../src/applet-device-wifi.c:1465
 #, fuzzy
-msgid "Scanning for wireless networks..."
-msgstr "kugirango"
+msgid "Failed to add new connection"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/applet-dialogs.c:41
+msgid "Error displaying connection information:"
+msgstr ""
+
+#: ../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
+msgid "LEAP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:74
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
+msgid "WPA/WPA2"
+msgstr ""
+
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+msgid "More addresses"
+msgstr ""
+
+#: ../src/applet-dialogs.c:226
+msgid "WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+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
+#, c-format
+msgid "%u Mb/s"
+msgstr ""
+
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+msgctxt "Speed"
+msgid "Unknown"
+msgstr ""
+
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr ""
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:492
+#, c-format
+msgid "Ethernet (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:495
+#, c-format
+msgid "802.11 WiFi (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:502
+#, c-format
+msgid "GSM (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:504
+#, c-format
+msgid "CDMA (%s)"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1046
-msgid "Other Wireless Networks..."
+#. --- General ---
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
+msgid "General"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1067
+#: ../src/applet-dialogs.c:516
+msgid "Interface:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:536
+msgid "Hardware Address:"
+msgstr ""
+
+#. Driver
+#: ../src/applet-dialogs.c:550
+msgid "Driver:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:585
+msgid "Speed:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:600
+msgid "Security:"
+msgstr ""
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+msgid "IPv4"
+msgstr ""
+
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr ""
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+msgid "IPv6"
+msgstr ""
+
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+msgid "Ignored"
+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
 #, fuzzy
-msgid "Create new Wireless Network..."
-msgstr "Gishya"
+msgid "VPN Type:"
+msgstr "Ubwoko bw'agakandisho"
 
-#: panel-applet/NMWirelessApplet.c:1143
+#: ../src/applet-dialogs.c:822
+msgid "VPN Gateway:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:828
+msgid "VPN Username:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+msgid "Base Connection:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr ""
+
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:957
+msgid "No valid active connections found!"
+msgstr ""
+
+#: ../src/applet-dialogs.c:985
+msgid ""
+"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2005-2008 Novell, Inc.\n"
+"and many other community contributors and translators"
+msgstr ""
+
+#: ../src/applet-dialogs.c:988
 #, fuzzy
-msgid "No network devices have been found"
-msgstr "urusobe Byabonetse"
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr "Ubuso Apuleti... kugirango urusobe Na Ukwihuza"
 
-#: panel-applet/NMWirelessApplet.c:1285
+#: ../src/applet-dialogs.c:990
 #, fuzzy
-msgid "NetworkManager is not running..."
+msgid "NetworkManager Website"
 msgstr "ni OYA"
 
-#: panel-applet/NMWirelessApplet.c:1355 panel-applet/NMWirelessApplet.c:1403
-msgid "Pause Wireless Scanning"
+#: ../src/applet-dialogs.c:1005
+msgid "Missing resources"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1360
-msgid "Resume Wireless Scanning"
+#: ../src/applet-dialogs.c:1030
+msgid "Mobile broadband network password"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1370 panel-applet/NMWirelessApplet.c:1409
-msgid "Stop All Wireless Devices"
+#: ../src/applet-dialogs.c:1039
+#, c-format
+msgid "A password is required to connect to '%s'."
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1375
-#, fuzzy
-msgid "Start All Wireless Devices"
-msgstr "Gutangira"
+#: ../src/applet-dialogs.c:1054
+msgid "Password:"
+msgstr ""
 
-# scp/source\office\profile.lng:STR_VALUE_TEMPLATE_SERVICES_HELP.text
-#: panel-applet/NMWirelessApplet.c:1418
-msgid "Help"
-msgstr "Ifashayobora"
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1425
-msgid "About"
-msgstr "Bigyanye"
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:232
-#, fuzzy
-msgid "Create new wireless network"
-msgstr "Gishya urusobe"
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:233
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr ""
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr ""
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr ""
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
 #, fuzzy
+msgid "_OK"
+msgstr "YEGO"
+
+#: ../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
 msgid ""
-"Enter the ESSID and security settings of the wireless network you wish to "
-"create."
-msgstr "i Na Umutekano Amagenamiterere Bya i urusobe Kuri Kurema"
+"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: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
+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: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
+msgid "_Delete"
+msgstr ""
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr ""
+
+#: ../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…"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+msgid "Choose a Connection Type"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+msgid ""
+"Select the type of connection you wish to create.\n"
+"\n"
+"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."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:238
+#: ../src/connection-editor/ce-page-bond.ui.h:10
 #, fuzzy
-msgid "Custom wireless network"
-msgstr "Kugena urusobe"
+msgid "Bonded _connections:"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+msgid "_Interface name:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+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:"
+msgstr ""
 
-#: panel-applet/NMWirelessAppletOtherNetworkDialog.c:239
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+msgid "_Primary:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+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.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
 #, fuzzy
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
-msgstr "i Bya i urusobe Kuri Kuri Kwihuza"
+msgid "Bridged _connections:"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
 
-#: panel-applet/essid.glade.h:1 panel-applet/applet.glade.h:3
+# basctl/source\basicide\basidesh.src:RID_IMGBTN_REMOVEWATCH.text
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 #, fuzzy
+msgid "s"
+msgstr "%s"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "Enable I_GMP snooping"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr ""
+
+#: ../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
+msgid "default"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+msgid "MAC address"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+msgid "HW address"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+msgid "device"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr ""
+
+#: ../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.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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-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
+msgid "Automatic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr ""
+
+#: ../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
+msgid "_Device:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+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 ""
-"128-bit passphrase (WEP)\n"
-"Ascii key (WEP)\n"
-"Hex key (WEP)"
-msgstr "Urufunguzo Urufunguzo"
+"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-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+msgid "De_fault"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr ""
 
-#: panel-applet/essid.glade.h:4 panel-applet/applet.glade.h:15
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+msgid "_Broadcast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+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.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+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.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
 #, fuzzy
-msgid "C_onnect"
+msgid "Connected"
 msgstr "Kwihuza"
 
-#: panel-applet/essid.glade.h:5 panel-applet/applet.glade.h:16
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+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:186
+#: ../src/connection-editor/page-ip6.c:204
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Addresses"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr ""
+
+#: ../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
+msgid "S_earch domains:"
+msgstr ""
+
+#: ../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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+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:17
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+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
+msgid "Basic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "Nu_mber:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Advanced"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "_APN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "N_etwork ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Sho_w passwords"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
 #, fuzzy
-msgid "Connect with encryption enabled"
-msgstr "Na: Bishunzwe: Bikora"
+msgid "Authentication"
+msgstr "Icyerekezo"
 
-# #-#-#-#-#  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
-#: panel-applet/essid.glade.h:6 panel-applet/applet.glade.h:18
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
+msgid "Allowed methods:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+msgid "Compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
+msgid "_Require 128-bit encryption"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+msgid "Use _stateful MPPE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Allow _BSD data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
+msgid "Allow _Deflate data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Use TCP _header compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid "Send PPP _echo packets"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+msgid "_Teamed connections:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+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.h:3
+msgid "Cloned MAC _address:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
+msgid "Device name + number"
+msgstr ""
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
+
+#: ../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
+msgid "Allowed Authentication Methods"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:196
+msgid "Hardware"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+msgid "Import a saved VPN configuration..."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:332
 #, fuzzy
-msgid "Key type:"
-msgstr "Ubwoko bw'agakandisho"
+msgid "Could not create new connection"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr ""
+
+#: ../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
+msgid "Address"
+msgstr ""
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr ""
+
+#: ../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
+msgid "Gateway"
+msgstr ""
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr ""
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr ""
 
-#: panel-applet/essid.glade.h:8 panel-applet/applet.glade.h:20
-msgid "Wireless _adapter:"
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
 msgstr ""
 
-#: panel-applet/essid.glade.h:9 panel-applet/applet.glade.h:21
+#: ../src/connection-editor/nm-connection-editor.c:124
 #, fuzzy
-msgid "Wireless _network:"
-msgstr "urusobe"
+msgid "Missing connection name"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+msgid "Editor initializing..."
+msgstr ""
 
-#: panel-applet/menu-info.c:91
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+msgid "Connection cannot be modified"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
-msgid "Wired Network (%s)"
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+#, 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:419
+msgid "_Save"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
 msgstr ""
 
-#: panel-applet/menu-info.c:93
-msgid "Wired Network"
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 
-#: panel-applet/menu-info.c:166
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not edit connection"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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
+msgid "Connection _name:"
+msgstr ""
+
+# offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "Ibyerekeye"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr ""
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:160
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
-msgid "Wireless Network (%s)"
-msgid_plural "Wireless Networks (%s)"
+msgid "%d day ago"
+msgid_plural "%d days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: panel-applet/menu-info.c:168
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
+#: ../src/connection-editor/nm-connection-list.c:178
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: panel-applet/menu-info.c:294
+#: ../src/connection-editor/nm-connection-list.c:182
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:684
 #, fuzzy
-msgid " (invalid Unicode)"
-msgstr "(Sibyo"
+msgid "Edit the selected connection"
+msgstr "urusobe Ukwihuza"
 
-#: examples/python/systray/eggtrayicon.c:111 panel-applet/eggtrayicon.c:118
-msgid "Orientation"
-msgstr "Icyerekezo"
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:112 panel-applet/eggtrayicon.c:119
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:933
 #, fuzzy
-msgid "The orientation of the tray."
-msgstr "Icyerekezo Bya i"
+msgid "Error creating connection"
+msgstr "urusobe Ukwihuza"
 
-# offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
-#: panel-applet/NMWirelessApplet.xml.h:1
+#: ../src/connection-editor/nm-connection-list.c:955
 #, fuzzy
-msgid "_About..."
-msgstr "Ibyerekeye"
+msgid "Error editing connection"
+msgstr "urusobe Ukwihuza"
 
-#: panel-applet/applet.glade.h:1
-msgid " "
-msgstr " "
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:111
+msgid "Could not load 802.1x Security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr ""
+
+#: ../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
+msgid "Could not load Bluetooth user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Kuri"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Kuri"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bond.c:566
+msgid "primary"
+msgstr ""
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/page-bridge.c:213
+msgid "Could not load bridge user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+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
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+msgid "Could not load bridge port user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+msgid "Could not load DCB user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:129
+msgid "Could not load DSL user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:214
+#, c-format
+msgid "DSL connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:74
+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:328
+msgid "Could not load ethernet user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:457
+msgid "Ethernet device"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+msgid "cloned MAC"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr ""
+
+#: ../src/connection-editor/page-general.c:52
+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 "ni OYA"
+
+#: ../src/connection-editor/page-general.c:350
+msgid "Could not load General user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
+msgid "Automatic (VPN)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
+msgid "Automatic (VPN) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
+msgid "Automatic (PPPoE)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
+msgid "Automatic (PPPoE) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:135
+msgid "Automatic (DHCP)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:136
+msgid "Automatic (DHCP) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
+msgid "Link-Local Only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+msgid "Additional DNS ser_vers:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+msgid "Additional s_earch domains:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:965
+#, c-format
+msgid "Editing IPv4 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1160
+msgid "Could not load IPv4 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
+msgid "Ignore"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:172
+msgid "Automatic, DHCP only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:964
+#, c-format
+msgid "Editing IPv6 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1157
+msgid "Could not load IPv6 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
+msgid "Could not load mobile broadband user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:327
+msgid "Unsupported mobile broadband connection type."
+msgstr ""
+
+#. Fall back to just asking for GSM vs. CDMA
+#: ../src/connection-editor/page-mobile.c:529
+msgid "Select Mobile Broadband Provider Type"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:561
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:568
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+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:258
+msgid "PAP"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
+msgid "CHAP"
+msgstr ""
+
+#: ../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
+msgid "MSCHAPv2"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
+msgid "MSCHAP"
+msgstr ""
+
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:136
+msgid "none"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:196
+#, c-format
+msgid "Editing PPP authentication methods for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:281
+msgid "Could not load PPP user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+msgid "Could not load team user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "urusobe Ukwihuza"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/page-vlan.c:596
+msgid "Could not load vlan user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/page-vpn.c:103
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:118
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
+#, fuzzy, c-format
+msgid "VPN connection %d"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/page-vpn.c:229
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:255
+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
+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
+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
+#, c-format
+msgid "%u (%u MHz)"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:450
+msgid "Could not load Wi-Fi user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+msgid "Wi-Fi device"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+msgid "WEP 128-bit Passphrase"
+msgstr ""
+
+#: ../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)"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+msgid "WPA & WPA2 Enterprise"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:413
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:424
+msgid "Wi-Fi Security"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:426
+msgid "Could not load Wi-Fi security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:512
+#, c-format
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: panel-applet/applet.glade.h:7
-#, fuzzy, no-c-format
+#: ../src/connection-editor/vpn-helpers.c:138
+#, fuzzy
+msgid "Cannot import VPN connection"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/vpn-helpers.c:140
+#, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</span>\n"
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
 "\n"
-"%s  It will not be completely functional."
-msgstr "<Uburemere UTSINDAGIYE Ingano Kinini OYA"
+"Error: %s."
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:141
+msgid "unknown error"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:215
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:217
+msgid "_Replace"
+msgstr ""
 
-#: panel-applet/applet.glade.h:11
-#, fuzzy, no-c-format
+#: ../src/connection-editor/vpn-helpers.c:219
+#, c-format
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:255
+#, fuzzy
+msgid "Cannot export VPN connection"
+msgstr "urusobe Ukwihuza"
+
+#: ../src/connection-editor/vpn-helpers.c:257
+#, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
-"span>\n"
+"The VPN connection '%s' could not be exported to %s.\n"
 "\n"
-"You have chosen log in to the wireless network '%s'.  If you are sure this "
-"wireless network is secure, click the checkbox below and NetworkManager will "
-"no longer pester you with stupid questions when you connect to it."
+"Error: %s."
 msgstr ""
-"<Uburemere UTSINDAGIYE Ingano Kinini LOG in Kuri i urusobe iyi urusobe ni "
-"Kanda i munsi Na Oya Na: Ryari: Kwihuza Kuri"
 
-#: panel-applet/applet.glade.h:14
+#: ../src/connection-editor/vpn-helpers.c:292
+msgid "Export VPN connection..."
+msgstr ""
+
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 #, fuzzy
-msgid "Always Trust this Wireless Network"
-msgstr "iyi"
+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"
 
-#: panel-applet/applet.glade.h:17
-msgid "Don't remind me again"
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
 msgstr ""
 
-# crashrep/source\all\crashrep.lng:%OK_BUTTON%.text
-#: panel-applet/applet.glade.h:23
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr ""
+
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr ""
+
+#: ../src/info.ui.h:3
 #, fuzzy
-msgid "_OK"
-msgstr "YEGO"
+msgid "Active Network Connections"
+msgstr "urusobe Ukwihuza"
 
-#: src/nm-netlink-monitor.c:154
-#, fuzzy, c-format
+#: ../src/libnma/nma-mobile-wizard.c:198
+#: ../src/libnm-gtk/nm-mobile-wizard.c:199
 msgid ""
-"unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgstr "Kuri Kurema kugirango"
+"Your mobile broadband connection is configured with the following settings:"
+msgstr ""
 
-#: src/nm-netlink-monitor.c:172
-#, fuzzy, c-format
+#. 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-wizard.c:325
+#: ../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 ""
+
+#: ../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
+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
+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 ""
+
+#: ../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
+msgid "Installed GSM device"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../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
 msgid ""
-"unable to bind to netlink socket for monitoring wired ethernet devices - %s"
-msgstr "Kuri Kuri kugirango"
+"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:"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../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
+msgid "Your broadband billing plan name"
+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 ""
+
+#: ../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 ""
+
+#: ../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
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+msgid "New Mobile Broadband Connection"
+msgstr ""
 
-#: src/nm-netlink-monitor.c:403
-msgid "operation took too long"
+#: ../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/nm-netlink-monitor.c:500
+#: ../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
+msgid "Ask for this password every time"
+msgstr ""
+
+#: ../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.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+msgid "_Ternary 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-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 #, fuzzy
-msgid "received data from wrong type of sender"
-msgstr "BYAKIRIWE Ibyatanzwe Bivuye Ubwoko Bya Uwohereza"
+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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
+msgid "New..."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+msgid "C_reate"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+msgid "Wi-Fi Network Authentication Required"
+msgstr ""
 
-#: src/nm-netlink-monitor.c:513
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 #, fuzzy
-msgid "received data from unexpected sender"
-msgstr "BYAKIRIWE Ibyatanzwe Bivuye Uwohereza"
+msgid "Create New Wi-Fi Network"
+msgstr "Gishya"
 
-# basctl/source\basicide\basidesh.src:RID_IMGBTN_REMOVEWATCH.text
-#: src/nm-netlink-monitor.c:535
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+msgid "New Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, 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:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr "Kuri a urusobe"
+
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, 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:2 ../src/libnm-gtk/wifi.ui.h:2
+msgid "Wi-Fi _security:"
+msgstr ""
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Kwihuza"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+msgid "Wi-Fi _adapter:"
+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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr ""
+
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+
+#: ../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
+msgid "EVDO"
+msgstr ""
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:68
+msgid "HSPA+"
+msgstr ""
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr ""
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr ""
+
+#: ../src/mb-menu-item.c:141
+#, c-format
+msgid "Home network (%s)"
+msgstr ""
+
+#: ../src/mb-menu-item.c:143
 #, fuzzy, c-format
-msgid "%s"
-msgstr "%s"
+msgid "Home network"
+msgstr "Kugena urusobe"
+
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr ""
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr ""
+
+#: ../src/mb-menu-item.c:170
+#, c-format
+msgid "Roaming network (%s)"
+msgstr ""
+
+#: ../src/mb-menu-item.c:172
+#, fuzzy, c-format
+msgid "Roaming network"
+msgstr "Kuri"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr ""
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr ""
+
+#: ../src/mobile-helpers.c:619
+#, fuzzy, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "urusobe Ukwihuza Kuri"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "urusobe Ukwihuza"
+
+#: ../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/wireless-security/eap-method.c:452
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method.c:455
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+msgid "Anonymous"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+msgid "Authenticated"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+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
+msgid "_Inner authentication:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+msgid "MD5"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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
+msgid "No CA certificate is _required"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+msgid "PEAP _version:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
+msgid "Unencrypted private keys are insecure"
+msgstr ""
+
+#: ../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)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:475
+msgid "Choose your personal certificate..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:487
+msgid "Choose your private key..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "Private _key:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_Private key password:"
+msgstr ""
+
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
+msgid "TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
+msgid "Tunneled TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:493
+msgid "Protected EAP (PEAP)"
+msgstr ""
+
+#: ../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
+msgid "Au_thentication:"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
+msgid "Open System"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x:"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+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/wireless-security/ws-wpa-psk.ui.h:2
+#, fuzzy
+msgid "_Type:"
+msgstr "Ubwoko bw'agakandisho"
+
+#, fuzzy
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<Uburemere UTSINDAGIYE"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+#~ "Network</span>\n"
+#~ "\n"
+#~ "A passphrase or encryption key is required to access the wireless network "
+#~ "'%s'."
+#~ msgstr ""
+#~ "<Uburemere UTSINDAGIYE Ingano Kinini ku A Cyangwa Bishunzwe: Urufunguzo "
+#~ "ni Bya ngombwa Kuri i urusobe"
+
+#, fuzzy
+#~ msgid "You must log in to access the private network %s"
+#~ msgstr "LOG in Kuri i By'umwihariko urusobe"
+
+#, fuzzy
+#~ msgid "Copyright (C) 2004-2005 Red Hat, Inc."
+#~ msgstr "C"
+
+#, fuzzy
+#~ msgid "The network device \"%s (%s)\" does not support wireless scanning."
+#~ msgstr "urusobe APAREYE OYA Gushigikira"
+
+#, fuzzy
+#~ msgid "The network device \"%s (%s)\" does not support link detection."
+#~ msgstr "urusobe APAREYE OYA Gushigikira Ihuza"
+
+#, fuzzy
+#~ msgid "Connected to an Ad-Hoc wireless network"
+#~ msgstr "Kuri urusobe"
+
+#, fuzzy
+#~ msgid "Scanning for wireless networks..."
+#~ msgstr "kugirango"
+
+#, fuzzy
+#~ msgid "Start All Wireless Devices"
+#~ msgstr "Gutangira"
+
+# scp/source\office\profile.lng:STR_VALUE_TEMPLATE_SERVICES_HELP.text
+#~ msgid "Help"
+#~ msgstr "Ifashayobora"
+
+#, fuzzy
+#~ msgid "Create new wireless network"
+#~ msgstr "Gishya urusobe"
+
+#, fuzzy
+#~ msgid ""
+#~ "Enter the ESSID of the wireless network to which you wish to connect."
+#~ msgstr "i Bya i urusobe Kuri Kuri Kwihuza"
+
+#, fuzzy
+#~ msgid ""
+#~ "128-bit passphrase (WEP)\n"
+#~ "Ascii key (WEP)\n"
+#~ "Hex key (WEP)"
+#~ msgstr "Urufunguzo Urufunguzo"
+
+# #-#-#-#-#  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
+#, fuzzy
+#~ msgid "Key type:"
+#~ msgstr "Ubwoko bw'agakandisho"
+
+#, fuzzy
+#~ msgid " (invalid Unicode)"
+#~ msgstr "(Sibyo"
+
+#, fuzzy
+#~ msgid "The orientation of the tray."
+#~ msgstr "Icyerekezo Bya i"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</"
+#~ "span>\n"
+#~ "\n"
+#~ "%s  It will not be completely functional."
+#~ msgstr "<Uburemere UTSINDAGIYE Ingano Kinini OYA"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
+#~ "Confirmation</span>\n"
+#~ "\n"
+#~ "You have chosen log in to the wireless network '%s'.  If you are sure "
+#~ "this wireless network is secure, click the checkbox below and "
+#~ "NetworkManager will no longer pester you with stupid questions when you "
+#~ "connect to it."
+#~ msgstr ""
+#~ "<Uburemere UTSINDAGIYE Ingano Kinini LOG in Kuri i urusobe iyi urusobe ni "
+#~ "Kanda i munsi Na Oya Na: Ryari: Kwihuza Kuri"
+
+#, fuzzy
+#~ msgid "Always Trust this Wireless Network"
+#~ msgstr "iyi"
+
+#, fuzzy
+#~ msgid ""
+#~ "unable to create netlink socket for monitoring wired ethernet devices - %s"
+#~ msgstr "Kuri Kurema kugirango"
+
+#, fuzzy
+#~ msgid ""
+#~ "unable to bind to netlink socket for monitoring wired ethernet devices - "
+#~ "%s"
+#~ msgstr "Kuri Kuri kugirango"
+
+#, fuzzy
+#~ msgid "received data from wrong type of sender"
+#~ msgstr "BYAKIRIWE Ibyatanzwe Bivuye Ubwoko Bya Uwohereza"
+
+#, fuzzy
+#~ msgid "received data from unexpected sender"
+#~ msgstr "BYAKIRIWE Ibyatanzwe Bivuye Uwohereza"
 
-#: src/nm-netlink-monitor.c:644
 #, fuzzy
-msgid "too much data was sent over socket and some of it was lost"
-msgstr "Ibyatanzwe Yoherejwe: KURI Na Bya"
+#~ msgid "too much data was sent over socket and some of it was lost"
+#~ msgstr "Ibyatanzwe Yoherejwe: KURI Na Bya"
diff --git a/po/sk.po b/po/sk.po
index ca4dae13..415928e8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2015-02-14 23:18+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2015-02-15 12:14+0100\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Generator: Poedit 1.7.4\n"
 
 # desktop entry name
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Sieť"
 
@@ -32,7 +32,8 @@ msgstr "Spravuje vaše sieťové pripojenia"
 
 # desktop entry name
 # GtkDialog title
-#: ../nm-connection-editor.desktop.in.h:1 ../src/connection-editor/nm-connection-editor.ui.h:1
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
 msgid "Network Connections"
 msgstr "Sieťové pripojenia"
 
@@ -49,7 +50,8 @@ msgstr "Zakázať oznamovania pripojenia"
 # gsettings description
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
 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."
+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
@@ -58,8 +60,10 @@ msgstr "Zakázať oznamovania odpojenia"
 
 # gsettings description
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
-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."
+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
@@ -68,8 +72,12 @@ msgstr "Zakázať oznamovania VPN"
 
 # gsettings description
 #: ../org.gnome.nm-applet.gschema.xml.in.h:6
-msgid "Set this to true to disable notifications when connecting to or disconnecting from a VPN."
-msgstr "Nastavte na true, keď chcete zakázať oznámenia počas pripájania alebo odpájania z VPN."
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Nastavte na true, keď chcete zakázať oznámenia počas pripájania alebo "
+"odpájania z VPN."
 
 # gsettings summary
 #: ../org.gnome.nm-applet.gschema.xml.in.h:7
@@ -78,8 +86,10 @@ msgstr "Potlačiť oznámenia dostupných sietí"
 
 # gsettings description
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
-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."
+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
@@ -98,8 +108,11 @@ msgstr "Zakázať vytváranie WiFi"
 
 # gsettings description
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
-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."
+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
 msgid "Show the applet in notification area"
@@ -107,7 +120,8 @@ msgstr "Zobraziť aplet v oblasti oznámení"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:14
 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í."
+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
@@ -116,62 +130,118 @@ msgstr "Ignorovať certifikát CA"
 
 # gsettings description
 #: ../org.gnome.nm-applet.gschema.xml.in.h:16
-msgid "Set this to true to disable warnings about CA certificates in EAP authentication."
-msgstr "Nastavte na true, keď chcete zakázať upozornenia o certifikátoch certifikačnej autority pri overovaní totožnosti protokolom EAP."
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+"Nastavte na true, keď chcete zakázať upozornenia o certifikátoch "
+"certifikačnej autority pri overovaní totožnosti protokolom EAP."
 
 # gsettings description
 #: ../org.gnome.nm-applet.gschema.xml.in.h:17
-msgid "Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication."
-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."
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+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."
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Aplet Správca siete"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Aplet Správca siete"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
 
 # GtkDialog title
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Overenie totožnosti protokolom 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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "Prip_ojiť"
+
 # GtkLabel label
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Názov siete:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Zlyhalo pridanie/aktivovanie pripojenia"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646 ../src/applet-device-wifi.c:1323 ../src/applet-device-wifi.c:1342
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1326 ../src/applet-device-wifi.c:1345
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Pripojenie zlyhalo"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Odpojenie zariadenia zlyhalo"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Odpojenie zlyhalo"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Aktivácia pripojenia zlyhala"
 
-#: ../src/applet.c:953 ../src/applet-device-wifi.c:1045
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Túto správu viac nezobrazovať"
 
-#: ../src/applet.c:1042
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the network connection was interrupted."
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
 msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože sieťové pripojenie bolo prerušené."
 
-#: ../src/applet.c:1045
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -180,16 +250,18 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože služba VPN neočakávane skončila."
 
-#: ../src/applet.c:1048
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' failed because the VPN service returned invalid configuration."
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
 msgstr ""
 "\n"
-"Pripojenie k VPN „%s“ zlyhalo, pretože služba VPN vrátila neplatnú konfiguráciu."
+"Pripojenie k VPN „%s“ zlyhalo, pretože služba VPN vrátila neplatnú "
+"konfiguráciu."
 
-#: ../src/applet.c:1051
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -198,7 +270,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože vypršal čas pre pokus o pripojenie."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -207,7 +279,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože sa služba VPN nespustila načas."
 
-#: ../src/applet.c:1057
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -216,7 +288,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože sa služba VPN nespustila."
 
-#: ../src/applet.c:1060
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -225,7 +297,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo, pretože neboli nájdené platné heslá pre VPN."
 
-#: ../src/applet.c:1063
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -234,7 +306,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo pre neplatné VPN heslá."
 
-#: ../src/applet.c:1070
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -243,16 +315,18 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ zlyhalo."
 
-#: ../src/applet.c:1088
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
-"The VPN connection '%s' disconnected because the network connection was interrupted."
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
 msgstr ""
 "\n"
-"Pripojenie k VPN „%s“ bolo odpojené, pretože sieťové pripojenie bolo prerušené."
+"Pripojenie k VPN „%s“ bolo odpojené, pretože sieťové pripojenie bolo "
+"prerušené."
 
-#: ../src/applet.c:1091
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -261,7 +335,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ bolo odpojené, pretože služba VPN bola zastavená."
 
-#: ../src/applet.c:1097
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -270,7 +344,7 @@ msgstr ""
 "\n"
 "Pripojenie k VPN „%s“ bolo odpojené."
 
-#: ../src/applet.c:1127
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -281,19 +355,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1129
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Pripojenie k VPN bolo úspešne nadviazané.\n"
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Správa o prihlásení k VPN"
 
-#: ../src/applet.c:1137 ../src/applet.c:1145 ../src/applet.c:1195
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Zlyhanie pripojenia k VPN"
 
-#: ../src/applet.c:1202
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -306,7 +380,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1205
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -319,784 +393,556 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "zariadenie nepripravené (chýba firmvér)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "zariadenie nepripravené"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123 ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "odpojené"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Odpojiť"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "zariadenie nespravované"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Neboli nájdené sieťové zariadenia"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Pripojenia k _VPN"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Konfigurovať VPN…"
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Odpojiť VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Správca siete nebeží…"
 
-#: ../src/applet.c:1970 ../src/applet.c:2946
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Sieť deaktivovaná"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Povoliť _sieť"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Povoliť _bezdrôtové pripojenie"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Povoliť _mobilné pripojenie"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Povoliť mobilné WiMA_X pripojenie"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Povoliť o_znamovania"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Informácie o pripojení"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Upraviť pripojenia…"
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "_Pomocník"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_O programe"
 
-#: ../src/applet.c:2520
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Teraz ste pripojený k „%s“."
 
-#: ../src/applet.c:2561
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Odpojené"
 
-#: ../src/applet.c:2562
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Sieťové pripojenie bolo rozpojené."
 
-#: ../src/applet.c:2801
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Pripravuje sa sieťové pripojenie „%s“…"
 
-#: ../src/applet.c:2804
+#: ../src/applet.c:2477
 #, 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:2807 ../src/applet-device-bt.c:137 ../src/applet-device-wimax.c:446 ../src/mobile-helpers.c:592
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Žiada sa sieťová adresa pre „%s“…"
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Sieťové pripojenie „%s“ je aktívne"
 
-#: ../src/applet.c:2900
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Spúšťa sa pripojenie k VPN „%s“…"
 
-#: ../src/applet.c:2903
+#: ../src/applet.c:2560
 #, 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:2906
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Žiada sa adresa VPN pre „%s“…"
 
-#: ../src/applet.c:2909
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Pripojenie k VPN „%s“ je aktívne"
 
-#: ../src/applet.c:2951
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Bez sieťového pripojenia"
 
-#: ../src/applet.c:3557
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Aplet Správca siete"
 
-# to je o sieťach
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76 ../src/applet-device-broadband.c:774 ../src/applet-device-bt.c:90 ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127 ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190 ../src/applet-device-wifi.c:836 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Dostupné"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89 ../src/applet-device-broadband.c:801 ../src/applet-device-bt.c:102 ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142 ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203 ../src/applet-device-wifi.c:1242 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Pripojené"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Teraz ste pripojený k previazanej sieti."
-
-#: ../src/applet-device-bond.c:115
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Pripravuje sa previazané pripojenie „%s“…"
-
-#: ../src/applet-device-bond.c:118
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Nastavuje sa previazané pripojenie „%s“…"
-
-#: ../src/applet-device-bond.c:121
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Previazané pripojenie „%s“ vyžaduje overenie totožnosti používateľa…"
-
-#: ../src/applet-device-bond.c:124 ../src/applet-device-bridge.c:124 ../src/applet-device-infiniband.c:177 ../src/applet-device-team.c:120 ../src/applet-device-vlan.c:238
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Žiada sa adresa pre „%s“…"
-
-#: ../src/applet-device-bond.c:128
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Previazané pripojenie „%s“ je aktívne"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Teraz ste pripojený k premostenej sieti."
-
-#: ../src/applet-device-bridge.c:115
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Pripravuje sa premostené pripojenie „%s“…"
-
-#: ../src/applet-device-bridge.c:118
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Nastavuje sa premostené pripojenie „%s“…"
-
-#: ../src/applet-device-bridge.c:121
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Premostené pripojenie „%s“ vyžaduje overenie totožnosti používateľa…"
-
-#: ../src/applet-device-bridge.c:128
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Premostené pripojenie „%s“ je aktívne"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:509
+#: ../src/applet-device-broadband.c:159
 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:206 ../src/applet-device-gsm.c:486
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:536
+#: ../src/applet-device-broadband.c:252
 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:720 ../src/applet-device-cdma.c:247 ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilné (%s)"
 
-#: ../src/applet-device-broadband.c:722 ../src/applet-device-cdma.c:249 ../src/applet-device-gsm.c:305 ../src/connection-editor/connection-helpers.c:125 ../src/connection-editor/page-mobile.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobilné"
 
+# to je o sieťach
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Dostupné"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:787
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Nové mobilné pripojenie…"
 
-#: ../src/applet-device-broadband.c:802
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Pripojené"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Teraz ste pripojený k mobilnej sieti."
 
-#: ../src/applet-device-broadband.c:937 ../src/applet-device-broadband.c:943
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobilná sieť"
 
-#: ../src/applet-device-broadband.c:938 ../src/applet-device-cdma.c:407 ../src/applet-device-gsm.c:666
+#: ../src/applet-device-broadband.c:957
 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:944 ../src/applet-device-cdma.c:413 ../src/applet-device-gsm.c:672
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Teraz ste registrovaný v roamingovej sieti."
 
-#: ../src/applet-device-bt.c:103
+#: ../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:128 ../src/applet-device-wimax.c:437 ../src/mobile-helpers.c:583
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Pripravuje sa mobilné pripojenie „%s“…"
 
-#: ../src/applet-device-bt.c:131 ../src/applet-device-wimax.c:440 ../src/mobile-helpers.c:586
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Nastavuje sa mobilné pripojenie „%s“…"
 
-#: ../src/applet-device-bt.c:134 ../src/applet-device-wimax.c:443 ../src/mobile-helpers.c:589
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:141 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobilné pripojenie „%s“ je aktívne"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Nové mobilné (CDMA) pripojenie…"
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Teraz ste pripojený k sieti CDMA."
-
-#: ../src/applet-device-cdma.c:406 ../src/applet-device-cdma.c:412
-msgid "CDMA network."
-msgstr "CDMA sieť."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatický ethernet"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Siete ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Sieť ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Siete ethernet"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Sieť ethernet"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../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:172
+#: ../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:175
+#: ../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:178
+#: ../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…"
+msgstr ""
+"Pripojenie k sieti ethernet „%s“ vyžaduje overenie totožnosti používateľa…"
 
-#: ../src/applet-device-ethernet.c:181
+#: ../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:185
+#: ../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:364
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Overenie totožnosti k DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Nové mobilné (GSM) pripojenie…"
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Teraz ste pripojený k sieti GSM."
-
-# PM: Sieť GSM
-#: ../src/applet-device-gsm.c:665 ../src/applet-device-gsm.c:671
-msgid "GSM network."
-msgstr "Sieť GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "Automatický InfiniBand"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "Siete InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Sieť InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "Siete InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "Sieť InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Teraz ste pripojený k sieti InfiniBand."
-
-#: ../src/applet-device-infiniband.c:168
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Pripravuje sa pripojenie k InfiniBand „%s“…"
-
-#: ../src/applet-device-infiniband.c:171
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Nastavuje sa pripojenie k InfiniBand „%s“…"
-
-#: ../src/applet-device-infiniband.c:174
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Pripojenie k InfiniBand „%s“ vyžaduje overenie totožnosti používateľa…"
-
-#: ../src/applet-device-infiniband.c:181
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "Pripojenie k InfiniBand „%s“ je aktívne"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Teraz ste pripojený k tímovej sieti."
-
-#: ../src/applet-device-team.c:111
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Pripravuje sa tímové pripojenie „%s“…"
-
-#: ../src/applet-device-team.c:114
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Konfiguruje sa tímové pripojenie „%s“…"
-
-#: ../src/applet-device-team.c:117
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Tímové pripojenie „%s“ vyžaduje overenie totožnosti používateľa…"
-
-#: ../src/applet-device-team.c:124
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Tímové pripojenie „%s“ je aktívne"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Teraz ste pripojený k sieti VLAN."
-
-#: ../src/applet-device-vlan.c:229
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Pripravuje sa pripojenie k VLAN „%s“…"
-
-#: ../src/applet-device-vlan.c:232
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Nastavuje sa pripojenie k VLAN „%s“…"
-
-#: ../src/applet-device-vlan.c:235
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Pripojenie k VLAN „%s“ vyžaduje overenie totožnosti používateľa…"
-
-#: ../src/applet-device-vlan.c:242
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "Pripojenie k VLAN „%s“ je aktívne"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Pripojiť sa k skrytej sieti Wi-Fi…"
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Vytvoriť _novú sieť Wi-Fi…"
 
 # ssid
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(žiadne)"
 
-#: ../src/applet-device-wifi.c:768
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Siete Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:770
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Sieť Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:772
+#: ../src/applet-device-wifi.c:905
 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:801
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Sieť Wi-Fi je zakázaná"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:935
 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:863
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Ďalšie siete"
 
-#: ../src/applet-device-wifi.c:1041
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Dostupné siete Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1181
 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:1241
+#: ../src/applet-device-wifi.c:1364
 #, 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:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Pripravuje sa sieťové pripojenie k Wi-Fi „%s“…"
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Nastavuje sa sieťové pripojenie k Wi-Fi „%s“…"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, 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:1282
+#: ../src/applet-device-wifi.c:1408
 #, 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:1302
+#: ../src/applet-device-wifi.c:1419
 #, 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:1306
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Pripojenie k sieti Wi-Fi „%s“ je aktívne"
 
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Zlyhala aktivácia pripojenia"
 
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Zlyhalo pridanie nového pripojenia"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Mobilný WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX je zakázaný"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX je zakázaný hardvérovým vypínačom"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Teraz ste pripojený k sieti WiMAX."
-
-#: ../src/applet-device-wimax.c:455 ../src/mobile-helpers.c:603
-#, 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/applet-device-wimax.c:458 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "roaming"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Chyba pri zobrazovaní informácií o pripojení:"
 
-#: ../src/applet-dialogs.c:109 ../src/connection-editor/page-wifi-security.c:318 ../src/libnm-gtk/nm-wifi-dialog.c:924 ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamické WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242 ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Adresy"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257 ../src/connection-editor/page-wifi-security.c:270
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Žiadne"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (predvolené)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Neznáma"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "neznámy"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "neznámy"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "Adresa IP:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Neznáma"
 
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Adresa IP:"
+
 # všesmerového vysielania?
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Adresa šírenia:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Maska podsiete:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Neznáma"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Predvolené smerovanie:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Maska podsiete:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809 ../src/connection-editor/page-general.c:322
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Všeobecné"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Rozhranie:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Hardvérová adresa:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Ovládač:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Rýchlosť:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Zabezpečenie:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Predvolené smerovanie:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorované"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Typ VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Brána VPN:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Používateľské meno k VPN:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 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:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Základné pripojenie:"
 
 # base connection, device type
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:348
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Neznáme"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Žiadne platné aktívne sieťové pripojenie!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1104,131 +950,191 @@ msgstr ""
 "Autorské práva © 2005-2008 Novell, Inc.\n"
 "a veľa iných prispievateľov a prekladateľov z komunity"
 
-#: ../src/applet-dialogs.c:987
-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:988
+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:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Webové stránky pre program Správca siete"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Chýbajúce zdroje"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Heslo pre mobilnú sieť"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Na pripojenie k sieti „%s“ je potrebné heslo."
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Heslo:"
 
 # window title
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Žiadosť o kód PIN na odomknutie SIM"
 
 # desc
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 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:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
-msgid "The mobile broadband device '%s' requires a SIM PIN code before it can be used."
-msgstr "Zariadenie mobilného pripojenia „%s“ vyžaduje kód PIN od SIM predtým, ako sa bude dať použiť."
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
+"Zariadenie mobilného pripojenia „%s“ vyžaduje kód PIN od SIM predtým, ako sa "
+"bude dať použiť."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Kód PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Zobraziť kód PIN"
 
 # window title
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Žiadosť o kód PUK na odomknutie SIM"
 
 # desc
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 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:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
-msgid "The mobile broadband device '%s' requires a SIM PUK code before it can be used."
-msgstr "Zariadenie mobilného pripojenia „%s“ vyžaduje kód PUK od SIM predtým, ako sa bude dať použiť."
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr ""
+"Zariadenie mobilného pripojenia „%s“ vyžaduje kód PUK od SIM predtým, ako sa "
+"bude dať použiť."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Kód PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Nový kód PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Znova zadajte nový kód PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Zobraziť kódy PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1 ../src/connection-editor/ce-ip6-routes.ui.h:1 ../src/connection-editor/ce-page-ip4.ui.h:8 ../src/connection-editor/ce-page-ip6.ui.h:11
-msgid "IP addresses identify your computer on the network.  Click the \"Add\" button to add an IP address."
-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: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 ""
+
+#: ../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
+msgid ""
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
+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: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
+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: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
+msgid "_Delete"
+msgstr "O_dstrániť"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2 ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "Ig_norovať automaticky získané smerovania"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3 ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4 ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "If enabled, this connection will never be used as the default network connection."
-msgstr "Ak je povolené, toto pripojenie nebude nikdy použité ako predvolené sieťové pripojenie."
-
-#: ../src/connection-editor/ce-new-connection.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
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr ""
+"Ak je povolené, toto pripojenie nebude nikdy použité ako predvolené sieťové "
+"pripojenie."
+
+#: ../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:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Vytvoriť…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "Zvoľte typ pripojenia"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
-"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."
+"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."
 msgstr ""
 "Vyberte typ pripojenia ktorý chcete vytvoriť.\n"
 "\n"
-"Ak chcete vytvoriť pripojenie k VPN, ktoré sa nenachádza v zozname, tak by ste skontrolovať, či máte nainštalovaný správny zásuvný modul pre VPN."
+"Ak chcete vytvoriť pripojenie k VPN, ktoré sa nenachádza v zozname, tak by "
+"ste skontrolovať, či máte nainštalovaný správny zásuvný modul pre VPN."
 
 #  * http://en.wikipedia.org/wiki/Link_aggregation#Linux_Bonding_Driver_Modes
 #: ../src/connection-editor/ce-page-bond.ui.h:1
@@ -1274,65 +1180,93 @@ msgid "Bonded _connections:"
 msgstr "Previazané _pripojenia:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
 msgstr "R_ežim:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12 ../src/connection-editor/ce-page-bridge.ui.h:2 ../src/connection-editor/ce-page-team.ui.h:4 ../src/connection-editor/nm-connection-list.c:697
+#: ../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
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#. Delete
-#: ../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:713
-msgid "_Delete"
-msgstr "O_dstrániť"
-
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "Monitorovacia _frekvencia:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16 ../src/connection-editor/ce-page-bridge.ui.h:5 ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "_Názov rozhrania:"
 
 # link layer
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "_Sledovanie linkovej vrstvy:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP _ciele:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
-msgid "An IP address, or a comma-separated list of IP addresses, to look for when checking the link status."
-msgstr "Adresa IP alebo zoznam adries IP oddelených čiarkou, ktoré skontrolovať pri kontrole stavu spojenia"
-
 #: ../src/connection-editor/ce-page-bond.ui.h:20
+msgid ""
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
+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
 msgid "Link _up delay:"
 msgstr "Oneskorenie _pripojenia:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Oneskorenie _odpojenia:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Primárne:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
-msgid "The interface name of the primary device. If set, this device will always be the active slave when it is available."
-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:24
+msgid ""
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
+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: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:"
+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
+msgid "bytes"
+msgstr "bajtov"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "Cena _cesty:"
 
-#: ../src/connection-editor/ce-page-bridge-port.ui.h:2 ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Priorita:"
 
@@ -1345,47 +1279,96 @@ 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:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 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:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "Čas _Hello:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Povoliť _sieť"
+
 # PK: toto znie sialene
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Povoliť _STP (protokol kostry grafu)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Maximálna doba:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "Čas _starnutia:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automaticky"
 
-#: ../src/connection-editor/ce-page.c:92 ../src/connection-editor/ce-page-dcb.ui.h:13 ../src/connection-editor/page-wifi.c:171 ../src/connection-editor/page-wifi.c:175 ../src/connection-editor/page-wifi.c:196
+#: ../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
 msgid "default"
 msgstr "predvolené"
 
-#: ../src/connection-editor/ce-page.c:360
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Adresa"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Adresa"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Ľubovoľné zariadenie"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Kvôli neznámej chybe sa nepodarilo aktualizovať utajované údaje pripojenia."
+msgstr ""
+"Kvôli neznámej chybe sa nepodarilo aktualizovať utajované údaje pripojenia."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:1
-#| msgid "Use 802.1_X security for this connection"
 msgid "Use Data Center Bridging (DCB) for this connection"
 msgstr "Pre toto pripojenie použiť Data Center Bridging (DCB)"
 
@@ -1422,7 +1405,6 @@ msgid "Willing"
 msgstr ""
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:10
-#| msgid "_Priority:"
 msgid "Priority"
 msgstr "Priorita"
 
@@ -1442,15 +1424,18 @@ msgstr "0"
 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.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
 msgid "2"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:17 ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
 msgid "3"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:18 ../src/wireless-security/ws-wep-key.ui.h:4
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
 msgid "4"
 msgstr "4"
 
@@ -1478,96 +1463,104 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Riadenie toku dát priority"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
-msgstr "Povoľte alebo zakážte prioritné pozastavenie prevádzky pre každú používateľskú prioritu."
+msgstr ""
+"Povoľte alebo zakážte prioritné pozastavenie prevádzky pre každú "
+"používateľskú prioritu."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
-#| msgid "_Priority:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Priorita:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
-#| msgid "2"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
-#| msgid "3"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
-#| msgid "4"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Trieda sieťovej prevádzky:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Striktná šírka pásma:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Šírka pásma priority:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Šírka pásma skupiny:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "Identifikátor skupiny:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
-msgstr "Zadajte identifikátor skupiny priorít pre každú používateľskú prioritu."
+msgstr ""
+"Zadajte identifikátor skupiny priorít pre každú používateľskú prioritu."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
-msgid "Enter the allowed link bandwidth percent each Priority Group may use.  The sum of all groups must total 100%."
-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%."
+msgid ""
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
+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:44
-msgid "Enter the percentage of priority group bandwidth each user priority may use."
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+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:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 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."
+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:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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/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:"
 msgstr "Po_užívateľské meno:"
@@ -1576,18 +1569,33 @@ msgstr "Po_užívateľské meno:"
 msgid "_Service:"
 msgstr "_Služ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:4 ../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.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
 msgid "Sho_w password"
 msgstr "Z_obraziť heslo"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4 ../src/connection-editor/ce-page-mobile.ui.h:4 ../src/libnm-gtk/nm-vpn-password-dialog.c:95 ../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.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:"
 msgstr "_Heslo:"
 
-#: ../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:139 ../src/connection-editor/page-ip6.c:147 ../src/wireless-security/eap-method-peap.ui.h:2
+#: ../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
 msgid "Automatic"
 msgstr "Automaticky"
 
@@ -1642,26 +1650,77 @@ msgstr "Plný duple_x"
 msgid "Aut_onegotiate"
 msgstr "Aut_omaticky dohodnúť"
 
-# GtkLabel label
-#: ../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:8 ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "_MAC adresa zariadenia:"
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "_Služba:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:15 ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "_Klonovaná MAC adresa:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:16 ../src/connection-editor/ce-page-wifi.ui.h:9
-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 "Tu zadaná MAC adresa bude použitá ako hardvérová adresa pre sieťové 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-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 ""
+"Tu zadaná MAC adresa bude použitá ako hardvérová adresa pre sieťové "
+"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-ethernet.ui.h:17 ../src/connection-editor/ce-page-infiniband.ui.h:4 ../src/connection-editor/ce-page-vlan.ui.h:4 ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18 ../src/connection-editor/ce-page-infiniband.ui.h:3 ../src/connection-editor/ce-page-vlan.ui.h:5 ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "bajtov"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Predvolené"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ignorovať"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Všesmerové vysielanie"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Heslo _súkromného kľúča:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1693,55 +1752,86 @@ msgstr "Datagram"
 msgid "Connected"
 msgstr "Pripojené"
 
-#: ../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.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
 msgstr "Automatické s ručným nastavením DNS"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3 ../src/connection-editor/ce-page-ip6.ui.h:3 ../src/connection-editor/page-ip4.c:171 ../src/connection-editor/page-ip6.c:196
+#: ../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 "Ručné"
 
-#: ../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.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
 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:216
+#: ../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
 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:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_Metóda:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:7 ../src/connection-editor/ce-page-ip6.ui.h:10
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Adresy"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
-msgid "The DHCP client identifier allows the network administrator to customize your computer's configuration.  If you wish to use a DHCP client identifier, enter it here."
-msgstr "Identifikátor klienta DHCP umožňuje správcovi siete prispôsobiť nastavenia 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:11
+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 ""
+"Identifikátor klienta DHCP umožňuje správcovi siete prispôsobiť nastavenia "
+"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:12
-msgid "Domains used when resolving host names. Use commas to separate multiple domains."
-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:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+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.h:13
 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:13 ../src/connection-editor/page-ip4.c:309 ../src/connection-editor/page-ip6.c:318
+#: ../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
 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:14 ../src/connection-editor/page-ip4.c:300 ../src/connection-editor/page-ip6.c:309
+#: ../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:"
 msgstr "Servery _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-msgid "IP addresses of domain name servers used to resolve host names. Use commas to separate multiple domain name server addresses."
-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:16
+msgid ""
+"IP addresses of domain name servers used to resolve host names. Use commas "
+"to separate multiple domain name server addresses."
+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.h:17
 msgid "Require IPv_4 addressing for this connection to complete"
 msgstr "Na dokončenie tohto pripojenia je vyžadované adresovanie IPv_4"
 
@@ -1750,15 +1840,21 @@ 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
-msgid "When connecting to IPv6-capable networks, allows the connection to complete if IPv4 configuration fails but IPv6 configuration succeeds."
-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:18
+msgid ""
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
+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:19
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Smerovania…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:6 ../src/connection-editor/page-ip4.c:198
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Zakázané"
 
@@ -1770,25 +1866,34 @@ msgstr "Povolené (uprednostniť verejnú adresu)"
 msgid "Enabled (prefer temporary address)"
 msgstr "Povolené (uprednostniť dočasnú adresu)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
-msgid "IP addresses of domain name servers used to resolve host names. Use commas to separate multiple domain name server addresses. Link-local addresses will be automatically scoped to the connecting interface."
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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 ""
-"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. Lokálne adresy pre linku budú automaticky pôsobiť pre pripájané "
+"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. Lokálne adresy pre linku budú automaticky pôsobiť pre pripájané "
 "rozhranie."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "Rozšírenia _súkromia IPv6:"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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:18
-msgid "When connecting to IPv4-capable networks, allows the connection to complete if IPv6 configuration fails but IPv4 configuration succeeds."
-msgstr "Pri zlyhavaní nastavení IPv6 pri pripájaní k IPv4 sieťam sa použijú nastavenia IPv4."
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+msgid ""
+"When connecting to IPv4-capable networks, allows the connection to complete "
+"if IPv6 configuration fails but IPv4 configuration succeeds."
+msgstr ""
+"Pri zlyhavaní nastavení IPv6 pri pripájaní k IPv4 sieťam sa použijú "
+"nastavenia IPv4."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
 msgid "Basic"
@@ -1874,7 +1979,8 @@ msgstr "Echo"
 msgid "Send PPP _echo packets"
 msgstr "Posielať pakety _echo cez PPP"
 
-#: ../src/connection-editor/ce-page-team-port.ui.h:1 ../src/connection-editor/ce-page-team.ui.h:2
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
 msgid "_JSON config:"
 msgstr "Konfigurácia _JSON:"
 
@@ -1887,32 +1993,55 @@ msgid "_Teamed connections:"
 msgstr "_Tímové pripojenia:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "I_mportovať tímovú konfiguráciu zo súboru…"
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "Importovať uloženú tímovú konfiguráciu zo súboru…"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "_Rodičovské rozhranie:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Názov rozhrania VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Klonovaná MAC adresa:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "_Identifikátor VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Názov zariadenia + číslo"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "„vlan“ + číslo"
 
@@ -1929,198 +2058,265 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infraštruktúra"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 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.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Rýchlosť:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "Kaná_l:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Pá_smo:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "R_ežim:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Povolené metódy overenia totožnosti"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Rozšíriteľný protokol overenia totožnosti"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Protokol overenia totožnosti heslom"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protokol vzájomného overenia totožnosti"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 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:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
-msgid "In most cases, the provider's PPP servers will support all authentication methods.  If connections fail, try disabling support for some methods."
-msgstr "Servery PPP poskytovateľa väčšinou podporujú všetky metódy overenia totožnosti. Ak pripojenia zlyhávajú, skúste podporu pre niektoré metódy zakázať."
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+"Servery PPP poskytovateľa väčšinou podporujú všetky metódy overenia "
+"totožnosti. Ak pripojenia zlyhávajú, skúste podporu pre niektoré metódy "
+"zakázať."
 
-#: ../src/connection-editor/connection-helpers.c:122 ../src/connection-editor/page-ethernet.c:240 ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:123 ../src/connection-editor/page-wifi.c:464 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:131 ../src/connection-editor/page-wimax.c:123 ../src/libnm-gtk/nm-ui-utils.c:332 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:132 ../src/connection-editor/page-dsl.c:135
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:133 ../src/connection-editor/page-infiniband.c:159 ../src/libnm-gtk/nm-ui-utils.c:336
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:134 ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:338 ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Bond"
 msgstr "Previazané"
 
-#: ../src/connection-editor/connection-helpers.c:135 ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Team"
 msgstr "Tím"
 
-#: ../src/connection-editor/connection-helpers.c:136 ../src/connection-editor/page-bridge.c:208 ../src/libnm-gtk/nm-ui-utils.c:342 ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../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
 msgid "Bridge"
 msgstr "Premostené"
 
-#: ../src/connection-editor/connection-helpers.c:137 ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:344 ../src/libnm-gtk/nm-ui-utils.c:588
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:146 ../src/connection-editor/connection-helpers.c:286 ../src/connection-editor/page-vpn.c:112
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:232
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Hardvérové"
 
-#: ../src/connection-editor/connection-helpers.c:256
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtuálne"
 
-#: ../src/connection-editor/connection-helpers.c:324 ../src/connection-editor/connection-helpers.c:326
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Importovať uloženú konfiguráciu VPN…"
 
-#: ../src/connection-editor/connection-helpers.c:355
-msgid "The connection editor dialog could not be initialized due to an unknown error."
-msgstr "Dialógové okno úpravy pripojenia sa nepodarilo inicializovať pre neznámu chybu."
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+"Dialógové okno úpravy pripojenia sa nepodarilo inicializovať pre neznámu "
+"chybu."
 
-#: ../src/connection-editor/connection-helpers.c:364
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Nepodarilo sa vytvoriť nové pripojenie"
 
-#: ../src/connection-editor/connection-helpers.c:499
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Odstránenie pripojenia zlyhalo"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Naozaj chcete odstrániť pripojenie %s?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724 ../src/connection-editor/ip6-routes-dialog.c:666 ../src/connection-editor/page-ip4.c:925 ../src/connection-editor/page-ip6.c:921
+#: ../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
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:741 ../src/connection-editor/page-ip4.c:942
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Maska podsiete"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:758 ../src/connection-editor/ip6-routes-dialog.c:700 ../src/connection-editor/page-ip4.c:959 ../src/connection-editor/page-ip6.c:955
+#: ../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
 msgid "Gateway"
 msgstr "Brána"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:775 ../src/connection-editor/ip6-routes-dialog.c:717
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrika"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:683 ../src/connection-editor/page-ip6.c:938
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:124
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Úprava pripojenia %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:128
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Úprava nepomenovaného pripojenia"
 
-#: ../src/connection-editor/nm-connection-editor.c:288
-msgid "The connection editor could not find some required resources (the .ui file was not found)."
-msgstr "Editor pripojení nemohol nájsť niektoré vyžadované zdroje (súbor .ui nebol nájdený)."
+# GtkLabel label
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Názov pripojenia:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Chyba inicializácie editora"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Pridanie spojenia zlyhalo"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr ""
+"Editor pripojení nemohol nájsť niektoré vyžadované zdroje (súbor .ui nebol "
+"nájdený)."
 
 #: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
@@ -2133,7 +2329,9 @@ msgstr "Uloží urobené zmeny na tomto pripojení."
 
 #: ../src/connection-editor/nm-connection-editor.c:421
 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ť."
+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:437
 msgid "Could not create connection"
@@ -2147,43 +2345,39 @@ msgstr "Nepodarilo sa upraviť pripojenie"
 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:573
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Chyba inicializácie editora"
 
-#: ../src/connection-editor/nm-connection-editor.c:912
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Pridanie spojenia zlyhalo"
 
-#: ../src/connection-editor/nm-connection-editor.c:952
-msgid "Error saving connection"
-msgstr "Chyba pri ukladaní pripojenia"
-
-#: ../src/connection-editor/nm-connection-editor.c:953
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Vlastnosť „%s“ / „%s“ je neplatná: %d"
+#: ../src/connection-editor/nm-connection-editor.ui.h:2 ../src/info.ui.h:2
+msgid "_Close"
+msgstr ""
 
 # GtkLabel label
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "_Názov pripojenia:"
 
 # GTKButton label
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Exportovať…"
 
-#: ../src/connection-editor/nm-connection-list.c:145
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nikdy"
 
-#: ../src/connection-editor/nm-connection-list.c:156 ../src/connection-editor/nm-connection-list.c:167
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "teraz"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2191,7 +2385,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:178
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2199,7 +2393,7 @@ msgstr[0] "pred %d hodinami"
 msgstr[1] "pred %d hodinou"
 msgstr[2] "pred %d hodinami"
 
-#: ../src/connection-editor/nm-connection-list.c:190
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2207,7 +2401,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:196
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2215,7 +2409,7 @@ msgstr[0] "pred %d mesiacmi"
 msgstr[1] "pred %d mesiacom"
 msgstr[2] "pred %d mesiacmi"
 
-#: ../src/connection-editor/nm-connection-list.c:200
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2223,87 +2417,125 @@ msgstr[0] "pred %d rokmi"
 msgstr[1] "pred %d rokom"
 msgstr[2] "pred %d rokmi"
 
-#: ../src/connection-editor/nm-connection-list.c:641
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Názov"
 
-#: ../src/connection-editor/nm-connection-list.c:654
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Naposledy použité"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Upraviť vybrané pripojenie"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:685
 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:714
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Odstrániť vybrané pripojenie"
 
-#: ../src/connection-editor/nm-connection-list.c:715
+#: ../src/connection-editor/nm-connection-list.c:701
 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:950
+#: ../src/connection-editor/nm-connection-list.c:929
 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:952
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:954
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Chyba pri vytváraní pripojenia"
 
-#: ../src/connection-editor/nm-connection-list.c:1010
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Chyba pri úprave pripojenia"
 
-#: ../src/connection-editor/nm-connection-list.c:1011
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Nenašlo sa pripojenie s UUID „%s“"
 
-#: ../src/connection-editor/page-8021x-security.c:119
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Zabezpečenie protokolu 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
-msgstr "Nepodarilo sa načítať používateľské rozhranie pre zabezpečenie protokolu 802.1x."
+msgstr ""
+"Nepodarilo sa načítať používateľské rozhranie pre zabezpečenie protokolu "
+"802.1x."
 
-#: ../src/connection-editor/page-8021x-security.c:135
+#: ../src/connection-editor/page-8021x-security.c:125
 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:108 ../src/libnm-gtk/nm-ui-utils.c:328
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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:110
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre Bluetooth."
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Previazané pripojenie %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Sieť ethernet"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Siete Wi-Fi"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
-msgstr "Nepodarilo sa načítať používateľské rozhranie pre previazané pripojenie."
+msgstr ""
+"Nepodarilo sa načítať používateľské rozhranie pre previazané pripojenie."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Primárne:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Previazané pripojenie %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
-msgstr "Nepodarilo sa načítať používateľské rozhranie pre premostené pripojenie."
+msgstr ""
+"Nepodarilo sa načítať používateľské rozhranie pre premostené pripojenie."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Premostené pripojenie č. %d"
@@ -2311,247 +2543,361 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Port premostenia"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 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:605
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:607
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre DCB."
 
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre DSL."
 
-#: ../src/connection-editor/page-dsl.c:229
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Pripojenie k DSL č. %d"
 
-#: ../src/connection-editor/page-ethernet.c:79 ../src/connection-editor/page-infiniband.c:65 ../src/connection-editor/page-wifi.c:94 ../src/connection-editor/page-wimax.c:59
-msgid "This option locks this connection to the network device specified by its permanent MAC address entered here.  Example: 00:11:22:33:44:55"
-msgstr "Táto voľba uzamkne toto pripojenie so sieťovým zariadením, ktoré má trvalú adresu MAC rovnakú ako je zadaná tu. Príklad: 00:11:22:33:44:55"
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"Táto voľba uzamkne toto pripojenie so sieťovým zariadením, ktoré má trvalú "
+"adresu MAC rovnakú ako je zadaná tu. Príklad: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:242
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:385
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Klonovaná MAC adresa:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:56 ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../src/connection-editor/page-general.c:57
-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 "Zóna definuje úroveň dôvery tohto pripojenia. Predvolená nie je obyčajná 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:52
+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 ""
+"Zóna definuje úroveň dôvery tohto pripojenia. Predvolená nie je obyčajná "
+"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:58
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD nebeží."
 
-#: ../src/connection-editor/page-general.c:325
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Nepodarilo sa načítať všeobecné používateľské rozhranie."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:258
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Pripojenie k InfiniBand č. %d"
 
-#: ../src/connection-editor/page-ip4.c:135 ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automaticky (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:136 ../src/connection-editor/page-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Automaticky (VPN) len adresy"
 
-#: ../src/connection-editor/page-ip4.c:140 ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automaticky, len adresy"
 
-#: ../src/connection-editor/page-ip4.c:142 ../src/connection-editor/page-ip6.c:144
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automaticky (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143 ../src/connection-editor/page-ip6.c:145
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Automaticky (PPPoE) len adresy"
 
-#: ../src/connection-editor/page-ip4.c:145
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automaticky (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:146
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Automaticky (DHCP) len adresy"
 
-#: ../src/connection-editor/page-ip4.c:183 ../src/connection-editor/page-ip6.c:209
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Lokálne pre linku"
 
-#: ../src/connection-editor/page-ip4.c:298 ../src/connection-editor/page-ip6.c:307
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Dodatočné servery _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:307 ../src/connection-editor/page-ip6.c:316
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Dodatočné domény _hľadania:"
 
-#: ../src/connection-editor/page-ip4.c:857
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Úprava IPv4 smerovania pre %s"
 
-#: ../src/connection-editor/page-ip4.c:1009
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Nastavenia IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre IPv4."
 
-#: ../src/connection-editor/page-ip6.c:160
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorovať"
 
-#: ../src/connection-editor/page-ip6.c:184
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automaticky, iba DHCP"
 
-#: ../src/connection-editor/page-ip6.c:853
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Úprava smerovaní IPv6 pre %s"
 
-#: ../src/connection-editor/page-ip6.c:1004
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Nastavenia IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1006
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre IPv6."
 
-#: ../src/connection-editor/page-master.c:244 ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Duplikátne podriadené rozhrania"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
-msgstr "Obidve podriadené rozhrania „%s“ a „%s“ sú aplikované na zariadení „%s“"
+msgstr ""
+"Obidve podriadené rozhrania „%s“ a „%s“ sú aplikované na zariadení „%s“"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
-msgid "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the same physical device."
-msgstr "Podriadené zariadenia „%s“ a „%s“ sú aplikované na rozdielne virtuálne porty („%s“ a „%s“) toho istého fyzického zariadenia."
+msgid ""
+"Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
+"same physical device."
+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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "Podriadené rozhranie %s č. %d"
 
-#: ../src/connection-editor/page-mobile.c:320
+#: ../src/connection-editor/page-mobile.c:310
 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:337
+#: ../src/connection-editor/page-mobile.c:327
 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:556
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Zvoľte si typ mobilného poskytovateľa"
 
-#: ../src/connection-editor/page-mobile.c:583
-msgid "Select the technology your mobile broadband provider uses.  If you are unsure, ask your provider."
-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:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+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:588
+#: ../src/connection-editor/page-mobile.c:561
 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, UMTS, HSDPA)"
+msgstr ""
+"Môj poskytovateľ používa technológiu založenú na _GSM (napr. GPRS, EDGE, "
+"UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:595
+#: ../src/connection-editor/page-mobile.c:568
 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)"
+msgstr ""
+"Môj poskytovateľ používa technológiu založenú na _CDMA (napr. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:605 ../src/mb-menu-item.c:54 ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:608 ../src/mb-menu-item.c:58 ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:136
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:137 ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:138 ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:139 ../src/wireless-security/eap-method-fast.c:281 ../src/wireless-security/eap-method-peap.c:269 ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:140 ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:143
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "žiadne"
 
-#: ../src/connection-editor/page-ppp.c:203
+#: ../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:286
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Nastavenia PPP"
 
-#: ../src/connection-editor/page-ppp.c:288
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre PPP."
 
-#: ../src/connection-editor/page-team.c:92 ../src/connection-editor/page-team-port.c:77 ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Výber súboru na import"
 
-#: ../src/connection-editor/page-team.c:112 ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Chyba: súbor neobsahuje platnú konfiguráciu JSON"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Nepodarilo sa načítať tímové používateľské rozhranie."
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Tímové pripojenie č. %d"
@@ -2559,47 +2905,57 @@ 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:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Port tímu"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (cez „%s“)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Bez sieťového pripojenia"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre vlan."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Pripojenie k VLAN č. %d"
 
-#: ../src/connection-editor/page-vpn.c:114
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Nepodarilo sa načítať používateľské rozhranie pre VPN."
 
-#: ../src/connection-editor/page-vpn.c:129
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Nepodarilo sa nájsť zásuvný modul služby VPN pre „%s“."
 
-#: ../src/connection-editor/page-vpn.c:216 ../src/connection-editor/page-vpn.c:313
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Pripojenie k VPN č. %d"
 
 # PM: Zásuvnému modulu; pripojenie k VPN
-#: ../src/connection-editor/page-vpn.c:242
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2609,107 +2965,151 @@ msgstr ""
 "\n"
 "Chyba: neuvedený typ služby VPN."
 
-#: ../src/connection-editor/page-vpn.c:267
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Zvoľte typ pripojenia k VPN"
 
-#: ../src/connection-editor/page-vpn.c:268
-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 "Zvoľte si typ VPN, ktorý chcete použiť pre nové pripojenie. Ak sa požadovaný typ VPN pripojenia v zozname nenachádza, asi nemáte nainštalovaný správny VPN zásuvný modul."
+#: ../src/connection-editor/page-vpn.c:255
+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 ""
+"Zvoľte si typ VPN, ktorý chcete použiť pre nové pripojenie. Ak sa požadovaný "
+"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
+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 ""
+"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:84
-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 "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
+#, 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)\""
+msgstr ""
+"Táto voľba uzamkne toto pripojenie so sieťovým zariadením, ktoré má trvalú "
+"adresu MAC rovnakú ako je zadaná tu. Príklad: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:466
+#: ../src/connection-editor/page-wifi.c:450
 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:637
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Ľubovoľné zariadenie"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Pripojenie k Wi-Fi č. %d"
 
-#: ../src/connection-editor/page-wifi-security.c:295 ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:305 ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:331 ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Dynamické WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:345 ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Osobné WPA a WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:359 ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Podnikové WPA a WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:400
+#: ../src/connection-editor/page-wifi-security.c:413
 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."
+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:411
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Zabezpečenie Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:413
+#: ../src/connection-editor/page-wifi-security.c:426
 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-wimax.c:126
-msgid "Could not load WiMAX user interface."
-msgstr "Nepodarilo sa načítať používateľské rozhranie pre WiMAX."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:222
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Pripojenie k WiMAX č. %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Nedá sa importovať pripojenie k VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../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"
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
 "\n"
 "Error: %s."
 msgstr ""
-"Súbor „%s“ sa nepodarilo čítať alebo neobsahuje známe informácie o pripojení k VPN.\n"
+"Súbor „%s“ sa nepodarilo čítať alebo neobsahuje známe informácie o pripojení "
+"k VPN.\n"
 "\n"
 "Chyba: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Neznáma chyba"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Súbor s názvom „%s“ už existuje."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "Nah_radiť"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Nedá sa exportovať pripojenie k VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2720,95 +3120,24 @@ msgstr ""
 "\n"
 "Chyba: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exportovať pripojenie k VPN…"
 
 # warning dialog
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
-msgid "The NetworkManager Applet could not find some required resources (the .ui file was not found)."
-msgstr "Aplet Správca siete nemohol nájsť niektoré vyžadované zdroje (súbor .ui nebol nájdený)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "Nastavenie bluetooth nie je možné (zlyhalo pripojenie k D-Bus: (%s) %s)."
-
-# NetworkManager is service
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid "Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "Nastavenie BLuetooth nie je možné (chyba pri hľadaní služby NetworkManager: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Použite svoj mobilný telefón ako sieťové zariadenie (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Pripojte sa na internet pomocou svojho mobilu (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Chyba: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Zlyhalo vytvorenie pripojenia k DUN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433 ../src/gnome-bluetooth/nma-bt-device.c:952
-msgid "Your phone is now ready to use!"
-msgstr "Váš telefón je pripravený na použitie!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Asistent mobilného pripojenia bol zrušený"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Neznámy typ zariadenia telefónu (nie je GSM ani CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:721 ../src/gnome-bluetooth/nma-bt-device.c:727
-msgid "failed to connect to the phone."
-msgstr "pripojenie k telefónu zlyhalo."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:740
-msgid "error getting bus connection"
-msgstr "chyba pri získavaní zbernice pripojenia"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
-msgid "unexpectedly disconnected from the phone."
-msgstr "neočakávane odpojené od telefónu."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:804
-msgid "timed out detecting phone details."
-msgstr "vypršal čas zisťovania podrobností o telefóne."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:815
-msgid "Detecting phone configuration..."
-msgstr "Zisťuje sa konfigurácia telefónu…"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:913
-msgid "The default Bluetooth adapter must be enabled before setting up a Dial-Up-Networking connection."
-msgstr "Predvolený Bluetooth adaptér musí byť povolený pred nastavovaním vytáčaného sieťového pripojenia."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:950
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Zlyhalo vytvorenie pripojenia k PAN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:971
-#, c-format
-msgid "%s Network"
-msgstr "Sieť %s"
+#: ../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 ""
+"Aplet Správca siete nemohol nájsť niektoré vyžadované zdroje (súbor .ui "
+"nebol nájdený)."
 
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Odomknúť"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Automaticky odomknúť toto zariadenie"
 
@@ -2816,415 +3145,535 @@ msgstr "Automaticky odomknúť toto zariadenie"
 msgid "Connection Information"
 msgstr "Informácie o pripojení"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Aktívne sieťové pripojenia"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
-msgid "Your mobile broadband connection is configured with the following settings:"
-msgstr "Vaše mobilné pripojenie je nakonfigurované pomocou nasledovných nastavení:"
+#: ../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še mobilné pripojenie je nakonfigurované pomocou nasledovných nastavení:"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Vaše zariadenie:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../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/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Váš program:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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."
+"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 ""
-"Teraz bude vytvorené pripojenie k vášmu poskytovateľovi mobilného pripojenia pomocou nastavení, ktoré ste si zvolili.  Ak pripojenie zlyhá, alebo sa nebudete môcť dostať k sieťovým prostriedkom, preverte vaše "
-"nastavenia. Keď chcete zmeniť nastavenia vášho mobilného pripojenia, tak zvoľte „Sieťové pripojenia“ z ponuky Systém >> Nastavenia."
-
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+"Teraz bude vytvorené pripojenie k vášmu poskytovateľovi mobilného pripojenia "
+"pomocou nastavení, ktoré ste si zvolili.  Ak pripojenie zlyhá, alebo sa "
+"nebudete môcť dostať k sieťovým prostriedkom, preverte vaše nastavenia. Keď "
+"chcete zmeniť nastavenia vášho mobilného pripojenia, tak zvoľte „Sieťové "
+"pripojenia“ z ponuky Systém >> Nastavenia."
+
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Potvrďte nastavenia mobilného pripojenia"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Neuvedené"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "Vyberte _svoj program:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
+"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 ""
-"Upozornenie: Zvolenie nesprávneho programu môže spôsobiť problémy pri fakturácii za váš mobilný účet, alebo znemožniť pripojenie.\n"
+"Upozornenie: Zvolenie nesprávneho programu môže spôsobiť problémy pri "
+"fakturácii za váš mobilný účet, alebo znemožniť pripojenie.\n"
 "\n"
-"Ak si nie ste istý vaším programom, zistite si, prosím, APN vášho programu u vášho poskytovateľa."
+"Ak si nie ste istý vaším programom, zistite si, prosím, APN vášho programu u "
+"vášho poskytovateľa."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Zvoľte si program fakturácie"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Môj program nie je uvedený…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Poskytovateľ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Nenašiel som môjho poskytovateľa, chcem ho zadať _ručne:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Poskytovateľ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 "Môj poskytovateľ používa technológiu GSM (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Zvoľte si poskytovateľa"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../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:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Krajina alebo región"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Moja krajina nie je uvedená"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Nainštalované zariadenie pre GSM"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Nainštalované zariadenie pre CDMA"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
-msgid "This assistant helps you easily set up a mobile broadband connection to a cellular (3G) network."
-msgstr "Tento asistent vám pomôže poľahky nastaviť mobilné pripojenie do bunkovej (3G) siete."
+#: ../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 ""
+"Tento asistent vám pomôže poľahky nastaviť mobilné pripojenie do bunkovej "
+"(3G) siete."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Budete potrebovať nasledovné informácie:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 "(v niektorých prípadoch) APN (názov prípojného bodu) programu fakturácie vášho mobilného pripojenia"
+msgstr ""
+"(v niektorých prípadoch) APN (názov prípojného bodu) programu fakturácie "
+"vášho mobilného pripojenia"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Vytvoriť pripojenie pre _toto mobilné zariadenie:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Ľubovoľné zariadenie"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Nastaviť mobilné pripojenie"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nové mobilné pripojenie"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:374
-msgid "Wired"
-msgstr "Drôtové"
+#: ../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 "Uložiť heslo iba pre tohto _používateľa"
 
-# 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:330
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+#, fuzzy
+msgid "Store the password for all users"
+msgstr "Uložiť heslo pre _všetkých používateľov"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:346
-msgid "ADSL"
-msgstr "ADSL"
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+#, fuzzy
+msgid "Ask for this password every time"
+msgstr "Za_každým si pýtať toto heslo"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
+#, fuzzy
+msgid "The password is not required"
+msgstr "Na pripojenie k sieti „%s“ je potrebné heslo."
 
-#: ../src/libnm-gtk/nm-ui-utils.c:411
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Sekundárne heslo:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:487 ../src/libnm-gtk/nm-ui-utils.c:507
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Sekundárne heslo:"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+msgid "Sh_ow passwords"
+msgstr "Z_obraziť heslá"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Odpojiť"
+
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nové…"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Žiadne"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "Vy_tvoriť"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
-msgid "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
-msgstr "Na prístup do siete Wi-Fi „%s“ je vyžadované heslo alebo šifrovací kľúč."
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
+"Na prístup do siete Wi-Fi „%s“ je vyžadované heslo alebo šifrovací kľúč."
 
 # window title
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Žiadosť o overenie totožnosti pre sieť Wi-Fi"
 
 # desc
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Vyžaduje sa overenie totožnosti pre sieť Wi-Fi"
 
 #  window title
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Vytvorenie novej siete Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nová sieť Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Zadajte názov siete Wi-Fi, ktorú chcete vytvoriť."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Pripojiť sa k skrytej sieti Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Skrytá sieť Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
-msgid "Enter the name and security details of the hidden Wi-Fi network you wish to connect to."
-msgstr "Zadajte názov a podrobnosti o zabezpečení skrytej siete W-Fi, ku ktorej sa chcete pripojiť."
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Sekundárne heslo:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "Z_obraziť heslá"
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+"Zadajte názov a podrobnosti o zabezpečení skrytej siete W-Fi, ku ktorej sa "
+"chcete pripojiť."
 
 # GtkLabel label
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Zabezpečenie _Wi-Fi:"
 
 # GtkLabel label
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "_Pripojenie:"
 
 # GtkLabel label
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "_Adaptér Wi-Fi:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Použitie:"
 
-#: ../src/main.c:75
-msgid "This program is a component of NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/)."
-msgstr "Tento program je súčasťou programu Správca siete (https://wiki.gnome.org/Projects/NetworkManager/)."
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+"Tento program je súčasťou programu Správca siete (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
 
-#: ../src/main.c:76
-msgid "It is not intended for command-line interaction but instead runs in the GNOME desktop environment."
-msgstr "Nie je určený na ovládanie pomocou príkazového riadka, beží ale v pracovnom prostredí GNOME."
+#: ../src/main.c:45
+msgid ""
+"It is not intended for command-line interaction but instead runs in the "
+"GNOME desktop environment."
+msgstr ""
+"Nie je určený na ovládanie pomocou príkazového riadka, beží ale v pracovnom "
+"prostredí GNOME."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nepovolené"
 
 # pripojenie
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "neregistrované"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Domáca sieť (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Domáca sieť"
 
 # pripojenie
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "vyhľadáva"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrácia odoprená"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Roamingová sieť (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Roamingová sieť"
 
 # id karty; id zariadenia
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, 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:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Je vyžadovaný kód PIN"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Zariadenie mobilného pripojenia vyžaduje kód PIN"
 
+#: ../src/mobile-helpers.c:619
+#, 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:622
+msgid "roaming"
+msgstr "roaming"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "pripojenie k sieti %s"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Uložiť heslo iba pre tohto _používateľa"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "Uložiť heslo pre _všetkých používateľov"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Certifikáty DER alebo PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266 ../src/wireless-security/eap-method-peap.c:299 ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Zvoľte súbor PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Súbory PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Všetky súbory"
 
@@ -3243,7 +3692,9 @@ msgstr "Overená totožnosť"
 msgid "Both"
 msgstr "Obe"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5 ../src/wireless-security/eap-method-peap.ui.h:5 ../src/wireless-security/eap-method-ttls.ui.h:2
+#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../src/wireless-security/eap-method-ttls.ui.h:2
 msgid "Anony_mous identity:"
 msgstr "Anony_mná identita:"
 
@@ -3251,7 +3702,9 @@ msgstr "Anony_mná identita:"
 msgid "PAC _file:"
 msgstr "_Súbor PAC:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7 ../src/wireless-security/eap-method-peap.ui.h:8 ../src/wireless-security/eap-method-ttls.ui.h:5
+#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "V_nútorné overenie totožnosti:"
 
@@ -3259,12 +3712,33 @@ msgstr "V_nútorné overenie totožnosti:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Povoliť automatické nastavovanie PAC"
 
-#: ../src/wireless-security/eap-method-peap.c:284 ../src/wireless-security/eap-method-ttls.c:315 ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
 # dialog title
-#: ../src/wireless-security/eap-method-peap.c:378 ../src/wireless-security/eap-method-tls.c:461 ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Voľba certifikátu certifikačnej autority…"
 
@@ -3276,11 +3750,15 @@ msgstr "Verzia 0"
 msgid "Version 1"
 msgstr "Verzia 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
+#: ../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 "Certifikát C_A:"
 
-#: ../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.h:7
+#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:4
 msgid "No CA certificate is _required"
 msgstr "N_ie je vyžadovaný žiadny certifikát CA"
 
@@ -3288,31 +3766,66 @@ msgstr "N_ie je vyžadovaný žiadny certifikát CA"
 msgid "PEAP _version:"
 msgstr "Verzia protokolu _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Za_každým si pýtať toto heslo"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Certifikát C_A:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Nešifrované súkromné kľúče nie sú bezpečné"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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"
+"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 ""
-"Zvolený súkromný kľúč sa nezdá byť zabezpečený heslom. Môže to spôsobiť kompromitáciu vašich bezpečnostných údajov. Zvoľte, prosím, heslom chránený súkromný kľúč.\n"
+"Zvolený súkromný kľúč sa nezdá byť zabezpečený heslom. Môže to spôsobiť "
+"kompromitáciu vašich bezpečnostných údajov. Zvoľte, prosím, heslom chránený "
+"súkromný kľúč.\n"
 "\n"
 "(Súkromný kľúč si môžete zabezpečiť heslom pomocou openssl)"
 
 # window title
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Voľba vášho osobného certifikátu…"
 
 # window title
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Voľba vášho súkromného kľúča…"
 
@@ -3332,31 +3845,84 @@ msgstr "Súkromný _kľúč:"
 msgid "_Private key password:"
 msgstr "Heslo _súkromného kľúča:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
 # protocol
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunelované TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Chránený EAP (PEAP)"
 
-#: ../src/wireless-security/ws-dynamic-wep.ui.h:2 ../src/wireless-security/ws-wep-key.ui.h:9 ../src/wireless-security/ws-wpa-eap.ui.h:2
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../src/wireless-security/ws-wep-key.ui.h:9
+#: ../src/wireless-security/ws-wpa-eap.ui.h:2
 msgid "Au_thentication:"
 msgstr "_Overenie totožnosti:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (Predvolené)"
@@ -3381,10 +3947,268 @@ msgstr "Zo_braziť kľúč"
 msgid "WEP inde_x:"
 msgstr "Inde_x kľúča WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "_Typ:"
 
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Povoliť mobilné WiMA_X pripojenie"
+
+#~ msgid "_Help"
+#~ msgstr "_Pomocník"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Teraz ste pripojený k previazanej sieti."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Pripravuje sa previazané pripojenie „%s“…"
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Nastavuje sa previazané pripojenie „%s“…"
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr ""
+#~ "Previazané pripojenie „%s“ vyžaduje overenie totožnosti používateľa…"
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Žiada sa adresa pre „%s“…"
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Previazané pripojenie „%s“ je aktívne"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Teraz ste pripojený k premostenej sieti."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Pripravuje sa premostené pripojenie „%s“…"
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Nastavuje sa premostené pripojenie „%s“…"
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr ""
+#~ "Premostené pripojenie „%s“ vyžaduje overenie totožnosti používateľa…"
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Premostené pripojenie „%s“ je aktívne"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Nové mobilné (CDMA) pripojenie…"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Teraz ste pripojený k sieti CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA sieť."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Nové mobilné (GSM) pripojenie…"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Teraz ste pripojený k sieti GSM."
+
+# PM: Sieť GSM
+#~ msgid "GSM network."
+#~ msgstr "Sieť GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "Automatický InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Siete InfiniBand (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Sieť InfiniBand (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Siete InfiniBand"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "Sieť InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Teraz ste pripojený k sieti InfiniBand."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Pripravuje sa pripojenie k InfiniBand „%s“…"
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Nastavuje sa pripojenie k InfiniBand „%s“…"
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr ""
+#~ "Pripojenie k InfiniBand „%s“ vyžaduje overenie totožnosti používateľa…"
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "Pripojenie k InfiniBand „%s“ je aktívne"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Teraz ste pripojený k tímovej sieti."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Pripravuje sa tímové pripojenie „%s“…"
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Konfiguruje sa tímové pripojenie „%s“…"
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Tímové pripojenie „%s“ vyžaduje overenie totožnosti používateľa…"
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Tímové pripojenie „%s“ je aktívne"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Teraz ste pripojený k sieti VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Pripravuje sa pripojenie k VLAN „%s“…"
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Nastavuje sa pripojenie k VLAN „%s“…"
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Pripojenie k VLAN „%s“ vyžaduje overenie totožnosti používateľa…"
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "Pripojenie k VLAN „%s“ je aktívne"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Mobilný WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX je zakázaný"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX je zakázaný hardvérovým vypínačom"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Teraz ste pripojený k sieti WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "neznámy"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "neznámy"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "R_ežim:"
+
+# GtkLabel label
+#~ msgid "_Device MAC address:"
+#~ msgstr "_MAC adresa zariadenia:"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "I_mportovať tímovú konfiguráciu zo súboru…"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infraštruktúra"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Chyba pri ukladaní pripojenia"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Vlastnosť „%s“ / „%s“ je neplatná: %d"
+
+#~ msgid "Could not load WiMAX user interface."
+#~ msgstr "Nepodarilo sa načítať používateľské rozhranie pre WiMAX."
+
+#~ msgid "WiMAX connection %d"
+#~ msgstr "Pripojenie k WiMAX č. %d"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Nastavenie bluetooth nie je možné (zlyhalo pripojenie k D-Bus: (%s) %s)."
+
+# NetworkManager is service
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Nastavenie BLuetooth nie je možné (chyba pri hľadaní služby "
+#~ "NetworkManager: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Použite svoj mobilný telefón ako sieťové zariadenie (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Pripojte sa na internet pomocou svojho mobilu (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "Chyba: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Zlyhalo vytvorenie pripojenia k DUN: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Váš telefón je pripravený na použitie!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Asistent mobilného pripojenia bol zrušený"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Neznámy typ zariadenia telefónu (nie je GSM ani CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "pripojenie k telefónu zlyhalo."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "chyba pri získavaní zbernice pripojenia"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "neočakávane odpojené od telefónu."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "vypršal čas zisťovania podrobností o telefóne."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Zisťuje sa konfigurácia telefónu…"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Predvolený Bluetooth adaptér musí byť povolený pred nastavovaním "
+#~ "vytáčaného sieťového pripojenia."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Zlyhalo vytvorenie pripojenia k PAN: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Sieť %s"
+
 #~ msgid "Secondary DNS:"
 #~ msgstr "Sekundárny DNS:"
 
@@ -3435,8 +4259,14 @@ msgstr "_Typ:"
 #~ msgstr "Nebol zvolený certifikát certifikačnej autority"
 
 # PM: sieťam wi-fi
-#~ msgid "Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate Authority certificate?"
-#~ msgstr "Nepoužitie certifikátu certifikačnej autority (CA) môže spôsobiť pripojenie k nezabezpečeným, nebezpečným sieťam Wi-Fi. Chcete si zvoliť certifikát certifikačnej autority?"
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Nepoužitie certifikátu certifikačnej autority (CA) môže spôsobiť "
+#~ "pripojenie k nezabezpečeným, nebezpečným sieťam Wi-Fi. Chcete si zvoliť "
+#~ "certifikát certifikačnej autority?"
 
 #~ msgid "Choose CA Certificate"
 #~ msgstr "Zvoliť certifikát CA"
diff --git a/po/sl.po b/po/sl.po
index 7fb9c16b..bf405d09 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,9 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2015-03-24 11:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -24,7 +23,7 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3444
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Omrežje"
 
@@ -127,54 +126,89 @@ msgstr ""
 "Izbrana možnost onemogoča opozorila o potrdilih CA na drugem koraku overitve "
 "EAP."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Aplet upravljalnika omrežja"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Aplet upravljalnika omrežja"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Overitev 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "Po_veži se"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Ime omrežja:"
 
-#: ../src/ap-menu-item.c:86
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/ap-menu-item.c:91
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "varna."
 
-#: ../src/applet.c:494
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Dodajanje ali odpiranje povezave je spodletelo."
 
-#: ../src/applet.c:496 ../src/applet.c:550 ../src/applet.c:585
-#: ../src/applet-device-wifi.c:1319 ../src/applet-device-wifi.c:1342
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: ../src/applet.c:499 ../src/applet.c:588 ../src/applet-device-wifi.c:1322
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Povezava je spodletela"
 
-#: ../src/applet.c:548
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Odklapljanje naprave je spodletelo."
 
-#: ../src/applet.c:553
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Napaka odklapljanja"
 
-#: ../src/applet.c:583
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Omogočanje povezave je spodletelo."
 
-#: ../src/applet.c:907 ../src/applet-device-wifi.c:1035
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Tega sporočila ne pokaži več"
 
-#: ../src/applet.c:994
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -184,7 +218,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi prekinitve omrežne povezave."
 
-#: ../src/applet.c:997
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +228,7 @@ msgstr ""
 "Povezava VPN '%s' je spodletela zaradi nepričakovane zaustavitve storitve "
 "VPN."
 
-#: ../src/applet.c:1000
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -205,7 +239,7 @@ msgstr ""
 "Povezava VPN '%s' je spodletela, ker je storitev VPN vrnila neveljavno "
 "nastavitev. "
 
-#: ../src/applet.c:1003
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -214,7 +248,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi zakasnitve poskusa povezave. "
 
-#: ../src/applet.c:1006
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -223,7 +257,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi nepravočasnega zagona storitve VPN."
 
-#: ../src/applet.c:1009
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -232,7 +266,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi spodletelega zagona storitve VPN."
 
-#: ../src/applet.c:1012
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -241,7 +275,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi neveljavnih varovanih podatkov VPN."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -250,7 +284,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela zaradi neveljavnih varovanih podatkov VPN ."
 
-#: ../src/applet.c:1022
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -259,7 +293,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je spodletela."
 
-#: ../src/applet.c:1038
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -269,7 +303,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je prekinjena zaradi prekinitve omrežne povezave."
 
-#: ../src/applet.c:1041
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -278,7 +312,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je prekinjena zaradi zaustavitve storitve VPN ."
 
-#: ../src/applet.c:1047
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -287,7 +321,7 @@ msgstr ""
 "\n"
 "Povezava VPN '%s' je prekinjena."
 
-#: ../src/applet.c:1077
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -298,19 +332,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1079
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "Povezava VPN je uspešno vzpostavljena.\n"
 
-#: ../src/applet.c:1081
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Prijavno sporočilo VPN"
 
-#: ../src/applet.c:1087 ../src/applet.c:1095 ../src/applet.c:1136
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Neuspela povezava VPN "
 
-#: ../src/applet.c:1143
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -323,7 +357,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1146
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -336,477 +370,306 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1469
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "naprava ni pripravljena (strojna programska oprema manjka)"
 
-#: ../src/applet.c:1471
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "naprava ni pripravljena"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1481 ../src/applet-device-ethernet.c:114
-#: ../src/applet-device-infiniband.c:112 ../src/applet-device-vlan.c:171
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "povezava je bila prekinjena"
 
-#: ../src/applet.c:1497
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Prekini povezavo"
 
-#: ../src/applet.c:1511
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "naprava ni upravljana"
 
-#: ../src/applet.c:1671
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Ni razpoložljivih omrežnih naprav"
 
-#: ../src/applet.c:1725
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Povezave _VPN"
 
-#: ../src/applet.c:1779
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Nastavi VPN ..."
 
-#: ../src/applet.c:1784
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Prekini povezavo z VPN"
 
-#: ../src/applet.c:1905
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Upravljalnik omrežja ni zagnan ..."
 
-#: ../src/applet.c:1910 ../src/applet.c:2937
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Omrežje je onemogočeno"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2140
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Omogoči _omrežje"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2149
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Omogoči _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2158
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Omogoči _mobilno širokopasovno omrežje"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2167
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Omogoči mobilno širokopasovno povezavo WiMA_X"
-
 #. Toggle notifications item
-#: ../src/applet.c:2179
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Omogoči _obvestila"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2191
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "_Podrobnosti o povezavi"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2201
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Urejanje povezav ..."
 
-#. Help item
-#: ../src/applet.c:2216
-msgid "_Help"
-msgstr "Pomo_č"
-
-#. About item
-#: ../src/applet.c:2225
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_O Programu"
 
-#: ../src/applet.c:2506
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Vzpostavljena je povezava z '%s'."
 
-#: ../src/applet.c:2549
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Povezava je prekinjena"
 
-#: ../src/applet.c:2550
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Omrežna povezava je bila prekinjena."
 
-#: ../src/applet.c:2805
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Pripravljanje omrežne povezave '%s' ..."
 
-#: ../src/applet.c:2808
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Za omrežno povezavo '%s' je zahtevana overitev uporabnika ..."
 
-#: ../src/applet.c:2811 ../src/applet-device-bt.c:127
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:598
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Poteka zahteva za pridobitev omrežnega naslova za '%s' ..."
 
-#: ../src/applet.c:2814
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Omrežna povezava '%s' je dejavna"
 
-#: ../src/applet.c:2888
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Zaganjanje VPN povezave '%s' ..."
 
-#: ../src/applet.c:2891
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Za povezavo VPN  '%s' je zahtevana overitev uporabnika ..."
 
-#: ../src/applet.c:2894
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Poteka zahteva naslova VPN za '%s' ..."
 
-#: ../src/applet.c:2897
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Povezava VPN '%s' je dejavna"
 
-#: ../src/applet.c:2941
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Nobene omrežne povezave"
 
-#: ../src/applet.c:3559
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Aplet upravljalnika omrežja"
 
-#: ../src/applet-device-bond.c:67 ../src/applet-device-bridge.c:67
-#: ../src/applet-device-broadband.c:774 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-infiniband.c:120
-#: ../src/applet-device-team.c:64 ../src/applet-device-vlan.c:180
-#: ../src/applet-device-wifi.c:822 ../src/applet-device-wimax.c:268
-msgid "Available"
-msgstr "Na voljo"
-
-#: ../src/applet-device-bond.c:79 ../src/applet-device-bridge.c:79
-#: ../src/applet-device-broadband.c:801 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-infiniband.c:135
-#: ../src/applet-device-team.c:76 ../src/applet-device-vlan.c:193
-#: ../src/applet-device-wifi.c:1234 ../src/applet-device-wimax.c:400
-msgid "Connection Established"
-msgstr "Povezava je vzpostavljena"
-
-#: ../src/applet-device-bond.c:80
-msgid "You are now connected to the bonded network."
-msgstr "Sedaj ste povezani v širokopasovno omrežje."
-
-#: ../src/applet-device-bond.c:105
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Pripravljanje omrežne povezave '%s' ..."
-
-#: ../src/applet-device-bond.c:108
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Nastavljanje širokopasovne povezave '%s' ..."
-
-#: ../src/applet-device-bond.c:111
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Za omrežno povezavo '%s' je zahtevana overitev uporabnika ..."
-
-#: ../src/applet-device-bond.c:114 ../src/applet-device-bridge.c:114
-#: ../src/applet-device-infiniband.c:170 ../src/applet-device-team.c:111
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Poteka zahteva za pridobitev naslova za '%s' ..."
-
-#: ../src/applet-device-bond.c:118
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Omrežna povezava '%s' je dejavna"
-
-#: ../src/applet-device-bridge.c:80
-msgid "You are now connected to the bridged network."
-msgstr "Povezani ste v omrežni most."
-
-#: ../src/applet-device-bridge.c:105
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Pripravljanje omrežnega mostu '%s' ..."
-
-#: ../src/applet-device-bridge.c:108
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Nastavljanje omrežnega mostu '%s' ..."
-
-#: ../src/applet-device-bridge.c:111
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr ""
-"Za povezovanje omrežnega mostu '%s' je zahtevana overitev uporabnika ..."
-
-#: ../src/applet-device-bridge.c:118
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Omrežni most '%s' je dejaven"
-
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Napačna koda PUK; stopite v stik s svojim ponudnikom."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 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:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Pošiljanje kode za odklepanje ..."
 
-#: ../src/applet-device-broadband.c:720 ../src/applet-dialogs.c:471
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilni širokopasovni dostop (%s)"
 
-#: ../src/applet-device-broadband.c:722
-#: ../src/connection-editor/connection-helpers.c:125
-#: ../src/connection-editor/page-mobile.c:309
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobilni širokopasovni dostop"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Na voljo"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:787
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Nova mobilna širokopasovna povezava ..."
 
-#: ../src/applet-device-broadband.c:802
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Povezava je vzpostavljena"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Povezani ste z mobilnim širokopasovnim omrežjem."
 
-#: ../src/applet-device-broadband.c:939 ../src/applet-device-broadband.c:945
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobilno širokopasovno omrežje."
 
-#: ../src/applet-device-broadband.c:940
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Vzpostavljena je povezava v domače omrežje."
 
-#: ../src/applet-device-broadband.c:946
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Vzpostavljena je povezava v gostujoče omrežje."
 
-#: ../src/applet-device-bt.c:93
+#: ../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:118 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:589
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Pripravljanje mobilne širokopasovne povezave '%s' ..."
 
-#: ../src/applet-device-bt.c:121 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:592
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Nastavljanje mobilne širokopasovne povezave '%s' ..."
 
-#: ../src/applet-device-bt.c:124 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:595
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:131 ../src/mobile-helpers.c:614
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobilna širokopasovna povezava '%s' je dejavna"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Samodejni eternet"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Omrežja eternet (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Omrežje eternet (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Omrežja eternet"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Omrežje eternet"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../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:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Pripravljanje žične omrežne povezave '%s' ..."
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Prilagajanje nastavitev žične omrežne povezave '%s' ..."
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, 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:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Poteka pridobivanje omrežnega naslova povezave '%s' ..."
 
-#: ../src/applet-device-ethernet.c:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Žična omrežna povezava '%s' je dejavna"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL overitev"
 
-#: ../src/applet-device-infiniband.c:33
-msgid "Auto InfiniBand"
-msgstr "Samodejni Infiniband"
-
-#: ../src/applet-device-infiniband.c:85
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "Omrežja InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:87
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Omrežje InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:90
-msgid "InfiniBand Networks"
-msgstr "Omrežja Infiniband"
-
-#: ../src/applet-device-infiniband.c:92
-msgid "InfiniBand Network"
-msgstr "Omrežje InfiniBand"
-
-#: ../src/applet-device-infiniband.c:136
-msgid "You are now connected to the InfiniBand network."
-msgstr "Sedaj ste povezani z omrežjem InfiniBand."
-
-#: ../src/applet-device-infiniband.c:161
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Pripravljanje povezave Infiniband '%s' ..."
-
-#: ../src/applet-device-infiniband.c:164
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Nastavljanje povezave InfiniBand '%s' ..."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Za povezavo InfiniBand '%s' je zahtevana overitev uporabnika ..."
-
-#: ../src/applet-device-infiniband.c:174
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "Povezava InfiniBand '%s' je dejavna"
-
-#: ../src/applet-device-team.c:77
-msgid "You are now connected to the teamed network."
-msgstr "Sedaj ste povezani v skupinsko omrežje."
-
-#: ../src/applet-device-team.c:102
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Pripravljanje povezave skupine '%s' ..."
-
-#: ../src/applet-device-team.c:105
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Nastavljanje povezave skupine '%s' ..."
-
-#: ../src/applet-device-team.c:108
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Za omrežno povezavo '%s' je zahtevana overitev uporabnika ..."
-
-#: ../src/applet-device-team.c:115
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Povezava skupine '%s' je dejavna"
-
-#: ../src/applet-device-vlan.c:194
-msgid "You are now connected to the VLAN."
-msgstr "Sedaj ste povezani z VLAN."
-
-#: ../src/applet-device-vlan.c:219
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Pripravljanje povezave VLAN '%s' ..."
-
-#: ../src/applet-device-vlan.c:222
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Nastavljanje povezave VLAN '%s' ..."
-
-#: ../src/applet-device-vlan.c:225
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Za povezavo VLAN '%s' je zahtevana overitev uporabnika ..."
-
-#: ../src/applet-device-vlan.c:232
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "Povezava VLAN '%s' je dejavna"
-
-#: ../src/applet-device-wifi.c:86
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Po_veži se s skritim brezžičnim omrežjem ..."
 
-#: ../src/applet-device-wifi.c:137
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "_Ustvari novo brezžično omrežje ..."
 
-#: ../src/applet-device-wifi.c:287
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(brez)"
 
-#: ../src/applet-device-wifi.c:754
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Omrežja Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:756
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Omrežje Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Omrežja Wi-Fi"
@@ -814,291 +677,238 @@ msgstr[1] "Omrežje Wi-Fi"
 msgstr[2] "Omrežji Wi-Fi"
 msgstr[3] "Omrežja Wi-Fi"
 
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Brezžično omrežje Wi-Fi je onemogočeno"
 
-#: ../src/applet-device-wifi.c:788
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Vmesnik WiMAX je onemogočen s stikalom strojne opreme"
 
-#: ../src/applet-device-wifi.c:849
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Več omrežij"
 
-#: ../src/applet-device-wifi.c:1031
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Razpoložljiva omrežija Wi-Fi"
 
-#: ../src/applet-device-wifi.c:1032
+#: ../src/applet-device-wifi.c:1181
 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:1233
+#: ../src/applet-device-wifi.c:1364
 #, 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:1265
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Pripravljanje omrežne povezave Wi-Fi '%s' ..."
 
-#: ../src/applet-device-wifi.c:1268
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Prilagajanje nastavitev omrežne povezave Wi-Fi '%s' ..."
 
-#: ../src/applet-device-wifi.c:1271
+#: ../src/applet-device-wifi.c:1405
 #, 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:1274
+#: ../src/applet-device-wifi.c:1408
 #, 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:1294
+#: ../src/applet-device-wifi.c:1419
 #, 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:1298
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Brezžična omrežna povezava '%s' je dejavna"
 
-#: ../src/applet-device-wifi.c:1317
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Omogočanje povezave je spodletelo."
 
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Dodajanje nove povezave je spodletelo."
 
-#: ../src/applet-device-wimax.c:220
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX mobilno širokopasovno omrežje (%s)"
-
-#: ../src/applet-device-wimax.c:222
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX mobilno širokopasovno omrežje"
-
-#: ../src/applet-device-wimax.c:248
-msgid "WiMAX is disabled"
-msgstr "WiMAX je onemogočen"
-
-#: ../src/applet-device-wimax.c:249
-msgid "WiMAX is disabled by hardware switch"
-msgstr "Vmesnik WiMAX je onemogočen s stikalom strojne opreme"
-
-#: ../src/applet-device-wimax.c:401
-msgid "You are now connected to the WiMAX network."
-msgstr "Vzpostavljena je povezava z omrežjem WiMAX."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:609
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Mobilna širokopasovna povezava '%s' je dejavna: (%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:612
-msgid "roaming"
-msgstr "prehajajoči način"
-
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Napaka pri prikazovanju podrobnosti o povezavi:"
 
-#: ../src/applet-dialogs.c:75
-#: ../src/connection-editor/page-wifi-security.c:311
-#: ../src/libnma/nma-wifi-dialog.c:910 ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:436
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dinamični WEP"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:184
-#: ../src/applet-dialogs.c:186
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:182
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Naslovi"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:190 ../src/applet-dialogs.c:199
-#: ../src/connection-editor/page-wifi-security.c:263
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Brez"
 
-#: ../src/applet-dialogs.c:216
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (privzeto)"
 
-#: ../src/applet-dialogs.c:285 ../src/applet-dialogs.c:549
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:287 ../src/applet-dialogs.c:551
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/applet-dialogs.c:300
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:302
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "neznano"
-
-#: ../src/applet-dialogs.c:314
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "neznano"
-
 #. Address
-#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:351
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/applet-dialogs.c:330 ../src/applet-dialogs.c:392
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "Naslov IP:"
 
-#: ../src/applet-dialogs.c:352
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Naslov za razpršeno oddajanje:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:364
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/applet-dialogs.c:365
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Maska podomrežja:"
 
-#: ../src/applet-dialogs.c:457
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:467
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:469
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:473
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:479 ../src/applet-dialogs.c:807
-#: ../src/connection-editor/page-general.c:349
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Splošno"
 
-#: ../src/applet-dialogs.c:483
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Vmesnik:"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Naslov strojne opreme:"
 
 #. Driver
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Gonilnik:"
 
-#: ../src/applet-dialogs.c:554
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Hitrost:"
 
-#: ../src/applet-dialogs.c:569
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Varnost:"
 
-#: ../src/applet-dialogs.c:587
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:605
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:627 ../src/applet-dialogs.c:848
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:641 ../src/applet-dialogs.c:686
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Privzeta smer:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:661 ../src/applet-dialogs.c:870
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:670 ../src/applet-dialogs.c:879
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Prezrto"
 
-#: ../src/applet-dialogs.c:812
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Vrsta VPN:"
 
-#: ../src/applet-dialogs.c:819
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Prehod VPN:"
 
-#: ../src/applet-dialogs.c:825
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Uporabniško ime VPN:"
 
-#: ../src/applet-dialogs.c:831
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Pasica VPN:"
 
-#: ../src/applet-dialogs.c:837
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Osnovna povezava:"
 
-#: ../src/applet-dialogs.c:839 ../src/libnm-gtk/nm-ui-utils.c:348
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Neznano"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:954
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Ni mogoče najti veljavnih dejavnih povezav!"
 
-#: ../src/applet-dialogs.c:982
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -1108,43 +918,43 @@ msgstr ""
 "Avtorske pravice © 2005-2008 Novell, Inc.\n"
 "in veliko drugih posameznikov, ki so prispevali skupnosti."
 
-#: ../src/applet-dialogs.c:985
+#: ../src/applet-dialogs.c:988
 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:987
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Spletišče upravljalnika omrežja"
 
-#: ../src/applet-dialogs.c:1002
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Manjkajoča sredstva"
 
-#: ../src/applet-dialogs.c:1027
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Geslo mobilnega širokopasovnega dostopa"
 
-#: ../src/applet-dialogs.c:1036
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Za povezavo z '%s' je zahtevano geslo."
 
-#: ../src/applet-dialogs.c:1051
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../src/applet-dialogs.c:1332
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Zahtevan je odklep PIN SIM"
 
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1337
 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:1335
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1154,25 +964,25 @@ msgstr ""
 "PIN."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Koda PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1341
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Pokaži kodo kodo PIN"
 
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Zahtevan je odklep PUK SIM"
 
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1348
 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:1346
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1182,27 +992,34 @@ msgstr ""
 "PUK."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Koda PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Nova koda PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Znova vnesite novo kodo PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1358
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Pokaži kode PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1212,18 +1029,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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Izbriši"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Prezri samodejno pridobljene smeri"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
@@ -1232,8 +1072,7 @@ msgstr ""
 "privzeta omrežna povezava."
 
 #: ../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/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
@@ -1241,15 +1080,15 @@ msgstr ""
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Ustvari ..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1302,49 +1141,41 @@ 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
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
 msgid "M_ode:"
 msgstr "_Način:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:675
-msgid "_Edit"
-msgstr "_Uredi"
-
-#. Delete
 #: ../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:691
-msgid "_Delete"
-msgstr "_Izbriši"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Uredi"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "_Pogostost nadzora:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "_Ime vmesnika:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "Nadzo_rovanje povezav:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "_Cilji ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1352,19 +1183,19 @@ 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Zamik povezave navz_gor:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Zamik povezave navz_dol:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Osnovno:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1372,19 +1203,21 @@ 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:24
+#: ../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:7
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
 msgid "_MTU:"
 msgstr "_MTU:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:25
+#: ../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:6
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
 msgid "bytes"
 msgstr "bajti"
 
@@ -1393,7 +1226,7 @@ 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:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Prednost:"
 
@@ -1405,48 +1238,88 @@ msgstr "Način _lasnice:"
 msgid "Bridged _connections:"
 msgstr "Premoščene pove_zave:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "Zamik prepo_šiljanja:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Pozdravni čas:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
 msgid "Enable I_GMP snooping"
 msgstr "Omogoči poizvedovanje I_GMP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Omogoči _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "_Najv. starost:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:12
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "Čas _staranja:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "samodejno"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:166
-#: ../src/connection-editor/page-wifi.c:170
-#: ../src/connection-editor/page-wifi.c:191
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "privzeto"
 
-#: ../src/connection-editor/ce-page.c:349
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Naslov"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Naslov"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Katerakoli naprava"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Zaradi neznane napake ni mogoče posodobiti varovanih podatkov povezave."
@@ -1546,77 +1419,77 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Nadzor prednostnega pretoka"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 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:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Prednost:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Vrsta prometa:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "Omejena pasovna širina:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Prednostna pasovna širina:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Pasovna širina skupine:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "ID skupine:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 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:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1625,18 +1498,18 @@ msgstr ""
 "Vpis dovoljenega odstotka povezave za vsako prednostno skupino. Vsota vseh "
 "skupin mora biti 100 %."
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 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:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 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:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 msgid "Enter the traffic class for each user priority."
 msgstr "Vpišite razred prometa za vsako uporabniško skupino."
 
@@ -1654,7 +1527,7 @@ 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:4
+#: ../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
@@ -1663,8 +1536,8 @@ 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:95
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1677,7 +1550,7 @@ msgstr "_Geslo:"
 #: ../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:137
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Samodejno"
@@ -1732,18 +1605,18 @@ msgstr "Sa_modejno pogajanje"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "MAC naslov _naprave:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Storitev:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "_Kloniran naslov MAC:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1753,6 +1626,55 @@ 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-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Privzeto"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Prezri"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Razpršeno oddajanje"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Geslo osebnega ključa:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
 msgstr "Ob uporabi te povezave se samodejno poveži v _VPN"
@@ -1790,8 +1712,8 @@ msgstr "Samodejno z ročnimi nastavitvami DNS"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:161
-#: ../src/connection-editor/page-ip6.c:186
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Ročno"
 
@@ -1802,8 +1724,8 @@ 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:179
-#: ../src/connection-editor/page-ip6.c:206
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Souporaba z ostalimi računalniki"
 
@@ -1817,7 +1739,7 @@ msgstr "_Način:"
 msgid "Addresses"
 msgstr "Naslovi"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1827,8 +1749,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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1836,25 +1758,25 @@ msgstr ""
 "Domene uporabljene za razreševanje imen gostiteljev. Za ločevanje več domen "
 "uporabite vejice."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:299
-#: ../src/connection-editor/page-ip6.c:308
+#: ../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
 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:290
-#: ../src/connection-editor/page-ip6.c:299
+#: ../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:"
 msgstr "_Strežniki DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1862,11 +1784,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1874,13 +1796,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Smeri ..."
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:188
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Onemogočeno"
 
@@ -1892,7 +1814,7 @@ msgstr "Omogočeno (prednostni javni naslov)"
 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.h:17
 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 "
@@ -1902,15 +1824,15 @@ 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
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 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.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -2016,32 +1938,55 @@ msgid "_Teamed connections:"
 msgstr "Povezave _skupine:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "Uvozi _nastavitve skupine iz datoteke ..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "_Uvozi nastavitve skupine iz datoteke ..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "Nadrejeni vmesnik:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Ime vmesnika VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_Kloniran naslov MAC:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "_ID VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Ime naprave + številka"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + številka"
 
@@ -2058,91 +2003,99 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Infrastruktura"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Prenosna _moč:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Hitrost:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Kanal:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "Pa_s:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Dovoljeni načini overitve"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Razširljivi overitveni protokol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Protokol overitve gesla"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Protokol Challenge za overitev izmenjave signalov"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Protokol Microsoft Challenge za overitev izmenjave signalov"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2151,136 +2104,157 @@ msgstr ""
 "primeru, da povezave spodletijo, poskusite onemogoči podporo za nekatere "
 "načine."
 
-#: ../src/connection-editor/connection-helpers.c:122
-#: ../src/connection-editor/page-ethernet.c:231
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Eternet"
 
-#: ../src/connection-editor/connection-helpers.c:123
-#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:131
-#: ../src/connection-editor/page-wimax.c:113
-#: ../src/libnm-gtk/nm-ui-utils.c:332 ../src/mb-menu-item.c:75
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:132
-#: ../src/connection-editor/page-dsl.c:128
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:133
-#: ../src/connection-editor/page-infiniband.c:149
-#: ../src/libnm-gtk/nm-ui-utils.c:336
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:134
-#: ../src/connection-editor/page-bond.c:444 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Bond"
 msgstr "Vez"
 
-#: ../src/connection-editor/connection-helpers.c:135
-#: ../src/connection-editor/page-team.c:241 ../src/libnm-gtk/nm-ui-utils.c:340
-#: ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Team"
 msgstr "Skupina"
 
-#: ../src/connection-editor/connection-helpers.c:136
-#: ../src/connection-editor/page-bridge.c:209
-#: ../src/libnm-gtk/nm-ui-utils.c:342 ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../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
 msgid "Bridge"
 msgstr "Premosti"
 
-#: ../src/connection-editor/connection-helpers.c:137
-#: ../src/connection-editor/page-vlan.c:491 ../src/libnm-gtk/nm-ui-utils.c:344
-#: ../src/libnm-gtk/nm-ui-utils.c:588
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:146
-#: ../src/connection-editor/connection-helpers.c:289
-#: ../src/connection-editor/page-vpn.c:103
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:232
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Strojna oprema"
 
-#: ../src/connection-editor/connection-helpers.c:259
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Navidezno"
 
-#: ../src/connection-editor/connection-helpers.c:327
-#: ../src/connection-editor/connection-helpers.c:329
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Uvozi shranjene nastavitve VPN ..."
 
-#: ../src/connection-editor/connection-helpers.c:358
+#: ../src/connection-editor/connection-helpers.c:323
 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:367
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Ni mogoče ustvariti nove povezave"
 
-#: ../src/connection-editor/connection-helpers.c:504
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Izbris povezave ni uspel"
 
-#: ../src/connection-editor/connection-helpers.c:552
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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:792
-#: ../src/connection-editor/ip6-routes-dialog.c:734
-#: ../src/connection-editor/page-ip4.c:983
-#: ../src/connection-editor/page-ip6.c:983
+#: ../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
 msgid "Address"
 msgstr "Naslov"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:811
-#: ../src/connection-editor/page-ip4.c:1002
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Omrežna maska"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:830
-#: ../src/connection-editor/ip6-routes-dialog.c:772
-#: ../src/connection-editor/page-ip4.c:1021
-#: ../src/connection-editor/page-ip6.c:1021
+#: ../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
 msgid "Gateway"
 msgstr "Prehod"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:849
-#: ../src/connection-editor/ip6-routes-dialog.c:791
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Merilo"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:753
-#: ../src/connection-editor/page-ip6.c:1002
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Predpona"
 
-#: ../src/connection-editor/nm-connection-editor.c:104
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Urejanje %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:108
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Urejanje neimenovane povezave"
 
-#: ../src/connection-editor/nm-connection-editor.c:268
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Ime povezave:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Napaka med začenjanjem urejevalnika"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Dodajanje povezave ni uspelo"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2288,57 +2262,61 @@ msgstr ""
 "Urejevalnik povezav ni našel zahtevanih sredstev (datoteke .ui ni mogoče "
 "najti)."
 
-#: ../src/connection-editor/nm-connection-editor.c:397
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../src/connection-editor/nm-connection-editor.c:398
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Shrani vse spremembe narejene na tej povezavi."
 
-#: ../src/connection-editor/nm-connection-editor.c:399
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:415
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Povezave ni mogoče ustvariti"
 
-#: ../src/connection-editor/nm-connection-editor.c:415
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Ni mogoče urediti povezave"
 
-#: ../src/connection-editor/nm-connection-editor.c:417
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Neznana napaka med ustvarjanjem pogovornega okna urejevalnika povezav."
 
-#: ../src/connection-editor/nm-connection-editor.c:551
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Napaka med začenjanjem urejevalnika"
 
-#: ../src/connection-editor/nm-connection-editor.c:894
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Dodajanje povezave ni uspelo"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: ../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
 msgid "Connection _name:"
 msgstr "_Ime povezave:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Izvozi ..."
 
-#: ../src/connection-editor/nm-connection-list.c:130
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nikoli"
 
-#: ../src/connection-editor/nm-connection-list.c:141
-#: ../src/connection-editor/nm-connection-list.c:152
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "zdaj"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:159
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2347,7 +2325,7 @@ msgstr[1] "Pred %d minuto"
 msgstr[2] "Pred %d minutama"
 msgstr[3] "Pred %d minutami"
 
-#: ../src/connection-editor/nm-connection-list.c:163
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2356,7 +2334,7 @@ msgstr[1] "Pred %d uro"
 msgstr[2] "Pred %d urama"
 msgstr[3] "Pred %d urami"
 
-#: ../src/connection-editor/nm-connection-list.c:175
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2365,7 +2343,7 @@ msgstr[1] "Pred %d dnevom"
 msgstr[2] "Pred %d dnevoma"
 msgstr[3] "Pred %d dnevi"
 
-#: ../src/connection-editor/nm-connection-list.c:181
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2374,7 +2352,7 @@ msgstr[1] "Pred %d mesecem"
 msgstr[2] "Pred %d mesecema"
 msgstr[3] "Pred %d meseci"
 
-#: ../src/connection-editor/nm-connection-list.c:185
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2383,87 +2361,120 @@ msgstr[1] "Pred %d letom"
 msgstr[2] "Pred %d letoma"
 msgstr[3] "Pred %d leti"
 
-#: ../src/connection-editor/nm-connection-list.c:619
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Nazadnje uporabljeno"
 
-#: ../src/connection-editor/nm-connection-list.c:676
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Uredi izbrano povezavo"
 
-#: ../src/connection-editor/nm-connection-list.c:677
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Overi za urejanje izbrane povezave"
 
-#: ../src/connection-editor/nm-connection-list.c:692
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Izbriši izbrano povezavo"
 
-#: ../src/connection-editor/nm-connection-list.c:693
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Overi za izbris izbrane povezave"
 
-#: ../src/connection-editor/nm-connection-list.c:923
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Vstavki VPN niso nameščeni."
 
-#: ../src/connection-editor/nm-connection-list.c:925
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:927
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Napaka med ustvarjanjem povezave"
 
-#: ../src/connection-editor/nm-connection-list.c:949
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Napaka med urejanjem povezave"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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:110
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Varnost 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:111
 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:126
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Za to povezavo uporabi varnostni protokol 802.1X"
 
-#: ../src/connection-editor/page-bluetooth.c:107
-#: ../src/libnm-gtk/nm-ui-utils.c:328
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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:109
+#: ../src/connection-editor/page-bluetooth.c:125
 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
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Povezava vezi %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Omrežje eternet"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Omrežja Wi-Fi"
+
 #: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Uporabniškega vmesnika nastavitev vezi ni mogoče naložiti."
 
-#: ../src/connection-editor/page-bond.c:613
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Osnovno:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Povezava vezi %d"
 
-#: ../src/connection-editor/page-bridge.c:212
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Uporabniškega vmesnika premoščanja ni mogoče naložiti."
 
-#: ../src/connection-editor/page-bridge.c:309
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Premosti povezavo %d"
@@ -2471,59 +2482,74 @@ 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:109
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Vrata premostitve"
 
-#: ../src/connection-editor/page-bridge-port.c:111
+#: ../src/connection-editor/page-bridge-port.c:110
 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:604
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Uporabniškega vmesnika DCB ni mogoče naložiti."
 
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Uporabniškega vmesnika DSL ni mogoče naložiti."
 
-#: ../src/connection-editor/page-dsl.c:215
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Povezava DSL %d"
 
 #: ../src/connection-editor/page-ethernet.c:74
-#: ../src/connection-editor/page-infiniband.c:60
-#: ../src/connection-editor/page-wifi.c:89
-#: ../src/connection-editor/page-wimax.c:54
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "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:233
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Uporabniškega vmesnika za eternet ni mogoče naložiti."
 
-#: ../src/connection-editor/page-ethernet.c:371
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Eternet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Kloniran naslov MAC:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:55
-#: ../src/libnma/nma-mobile-providers.c:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Privzeto"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2533,45 +2559,57 @@ msgstr ""
 "njegovim izborom uporabite privzeto območje, nastavljeno s požarnim zidom. "
 "Uporabno le, če je aktvirian firewalld."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD ni zagnan ..."
 
-#: ../src/connection-editor/page-general.c:352
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Splošnega uporabniškega vmesnika ni mogoče naložiti."
 
-#: ../src/connection-editor/page-infiniband.c:152
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Uporabniškega vmesnika InfiniBand ni mogoče naložiti."
 
-#: ../src/connection-editor/page-infiniband.c:245
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Povezava InfiniBand %d"
 
 #: ../src/connection-editor/page-ip4.c:125
-#: ../src/connection-editor/page-ip6.c:131
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Samodejno (VPN)"
 
 #: ../src/connection-editor/page-ip4.c:126
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Le samodejni (VON) naslovi"
 
 #: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:138
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Samodejno, le naslovi"
 
 #: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Samodejno (PPPoE)"
 
 #: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:135
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Le samodejni (PPPoE) naslovi"
 
@@ -2583,66 +2621,106 @@ msgstr "Samodejno (DHCP)"
 msgid "Automatic (DHCP) addresses only"
 msgstr "Le samodejni (DHCP) naslovi"
 
-#: ../src/connection-editor/page-ip4.c:173
-#: ../src/connection-editor/page-ip6.c:199
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Poveži le krajevno"
 
-#: ../src/connection-editor/page-ip4.c:288
-#: ../src/connection-editor/page-ip6.c:297
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Dodatni strežniki _DNS:"
 
-#: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:306
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Dodatne i_skalne domene:"
 
-#: ../src/connection-editor/page-ip4.c:883
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Urejanje smeri IPv4 za %s"
 
-#: ../src/connection-editor/page-ip4.c:1071
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Nastavitve IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1073
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Uporabniškega vmesnika IPv4 ni mogoče naložiti."
 
-#: ../src/connection-editor/page-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../src/connection-editor/page-ip6.c:174
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Samodejno, le DHCP"
 
-#: ../src/connection-editor/page-ip6.c:884
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Urejanje smeri IPv6 za %s"
 
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Nastavitve IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1072
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Uporabniškega vmesnika IPv6 ni mogoče naložiti."
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Podvojene podrejene vezi"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, 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:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2651,26 +2729,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:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s podrejen %d"
 
-#: ../src/connection-editor/page-mobile.c:311
+#: ../src/connection-editor/page-mobile.c:310
 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:328
+#: ../src/connection-editor/page-mobile.c:327
 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:547
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Izbor vrste ponudnika mobilnih širokopasovnih povezav"
 
-#: ../src/connection-editor/page-mobile.c:574
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2678,87 +2756,87 @@ msgstr ""
 "Izberite tehnologijo svojega ponudnika mobilnih širokopasovnih povezav. Če "
 "niste prepričani, vprašajte ponudnika."
 
-#: ../src/connection-editor/page-mobile.c:579
+#: ../src/connection-editor/page-mobile.c:561
 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, "
 "HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:586
+#: ../src/connection-editor/page-mobile.c:568
 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:596 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:276
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:599 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:274
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:252
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:297
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:278
-#: ../src/wireless-security/eap-method-peap.c:266
-#: ../src/wireless-security/eap-method-ttls.c:282
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:267
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "brez"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../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:281
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Nastavitve PPP"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Uporabniškega vmesnika PPP ni mogoče naložiti."
 
-#: ../src/connection-editor/page-team.c:91
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:232
+#: ../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 "Izbor datoteke za uvoz"
 
-#: ../src/connection-editor/page-team.c:111
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Napaka: datoteka ne vsebuje veljavnih JSON nastavitev"
 
-#: ../src/connection-editor/page-team.c:244
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Uporabniškega vmesnika skupine ni mogoče naložiti."
 
-#: ../src/connection-editor/page-team.c:339
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Povezava skupine %d"
@@ -2766,47 +2844,56 @@ 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:152
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Vrata skupine"
 
-#: ../src/connection-editor/page-team-port.c:154
+#: ../src/connection-editor/page-team-port.c:153
 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:335
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (preko \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:493
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Nobene omrežne povezave"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Uporabniškega vmesnika VLAN ni mogoče naložiti."
 
-#: ../src/connection-editor/page-vlan.c:686
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Povezava VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Ni mogoče naložiti uporabniškega vmesnika VPN"
 
-#: ../src/connection-editor/page-vpn.c:120
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Vstavka storitve VPN za '%s' ni mogoče najti."
 
-#: ../src/connection-editor/page-vpn.c:207
-#: ../src/connection-editor/page-vpn.c:302
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Povezava VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:231
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2816,11 +2903,11 @@ msgstr ""
 "\n"
 "Napaka: vrsta storitve VPN ni navedena."
 
-#: ../src/connection-editor/page-vpn.c:256
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Izberite vrsto povezave VPN"
 
-#: ../src/connection-editor/page-vpn.c:257
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2830,7 +2917,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:79
+#: ../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"
@@ -2838,7 +2925,17 @@ 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:195
+#: ../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)\""
+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
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
@@ -2847,64 +2944,74 @@ msgstr "%u (%u MHz)"
 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:613
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Katerakoli naprava"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Povezava Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:288
-#: ../src/libnma/nma-wifi-dialog.c:884 ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:298
-#: ../src/libnma/nma-wifi-dialog.c:893 ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:324
-#: ../src/libnma/nma-wifi-dialog.c:923 ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "Dinamični WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:338
-#: ../src/libnma/nma-wifi-dialog.c:937 ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Osebni WPA in WPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:352
-#: ../src/libnma/nma-wifi-dialog.c:951 ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../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:392
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Uporabniškega vmesnika varnosti WiFi ni mogoče naložiti; manjka nastavitev "
 "Wi-Fi."
 
-#: ../src/connection-editor/page-wifi-security.c:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Varnost Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 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-wimax.c:116
-msgid "Could not load WiMAX user interface."
-msgstr "Uporabniškega vmesnika WiMAX ni mogoče naložiti."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:210
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Povezava WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:205
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Povezave VPN ni mogoče uvoziti "
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2917,27 +3024,32 @@ msgstr ""
 "\n"
 "Napaka:%s."
 
-#: ../src/connection-editor/vpn-helpers.c:282
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Neznana napaka"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Datoteka z imenom \"%s\" že obstaja."
 
-#: ../src/connection-editor/vpn-helpers.c:284
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
-#: ../src/connection-editor/vpn-helpers.c:286
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:322
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Ni mogoče izvoziti povezave VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:324
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2948,11 +3060,11 @@ msgstr ""
 "\n"
 "Napaka: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:359
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Izvoz povezave VPN ..."
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -2960,11 +3072,11 @@ msgstr ""
 "Aplet upravljalnika omrežja ne najde nekaterih zahtevanih sredstev "
 "(datoteke .ui ni mogoče najti)."
 
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Odkleni"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Samodejno odkleni napravo"
 
@@ -2972,36 +3084,36 @@ msgstr "Samodejno odkleni napravo"
 msgid "Connection Information"
 msgstr "Podatki o povezavi"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Dejavne omrežne storitve"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../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:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../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:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3015,29 +3127,29 @@ msgstr ""
 "nastavitev mobilne širokopasovne povezave izberite \"Omrežne povezave\" v "
 "meniju Sistem >> Možnosti. "
 
-#: ../src/libnma/nma-mobile-wizard.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Nenavedeno"
 
 # tukaj govorimo o načinu preklopa
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../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:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3051,83 +3163,83 @@ msgstr ""
 "vaš naročniški paket."
 
 # način je bolj smiselno kot načrt ..
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Moj načrt ni na seznamu ..."
 
-#: ../src/libnma/nma-mobile-wizard.c:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Ponudnik"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Ponudnika ne morem najti, zato želim nastavitve vnesti _ročno:"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../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:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../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:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../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:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 msgid "Choose your Provider's Country or Region"
 msgstr "Izberite državo ali področje svojega ponudnika"
 
-#: ../src/libnma/nma-mobile-wizard.c:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Nameščena naprava GSM"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Nameščena naprava CDMA"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3135,72 +3247,109 @@ msgstr ""
 "Pomočnik pomaga pri hitrem nastavljanju mobilne širokopasovne povezavo v "
 "mobilno 3G omrežje."
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Ime ponudnika širokopasovnih storitev"
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(v nekaterih primerih) IPK (Ime PriKlopne točke) vašega širokopasovnega "
 "naročniškega paketa"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Ustvari povezavo za _to širokopasovno mobilno napravo:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nova mobilna širokopasovna povezava"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:97
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
+#: ../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
+#, 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
+#, 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
+#, 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.c:236
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary 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-wifi-dialog.c:433 ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Novo ..."
 
-#: ../src/libnma/nma-wifi-dialog.c:867 ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Brez"
 
-#: ../src/libnma/nma-wifi-dialog.c:1035 ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "Ustva_ri"
 
-#: ../src/libnma/nma-wifi-dialog.c:1119 ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3208,35 +3357,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:1121 ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Zahtevana je overitev za brezžično omrežje"
 
-#: ../src/libnma/nma-wifi-dialog.c:1123 ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Brezžično omrežje zahteva overitev"
 
-#: ../src/libnma/nma-wifi-dialog.c:1128 ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Ustvari novo brezžično omrežje"
 
-#: ../src/libnma/nma-wifi-dialog.c:1130 ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Novo omrežje Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1131 ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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:1133 ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Poveži se s skritim omrežjem Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1135 ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Skrito omrežje Wi-Fi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1136 ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3256,23 +3405,23 @@ msgstr "P_ovezava:"
 msgid "Wi-Fi _adapter:"
 msgstr "Vmeskin Wi-Fi:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:374
+#: ../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:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "Mreža OLPC"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:411
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3282,17 +3431,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:487 ../src/libnm-gtk/nm-ui-utils.c:507
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Uporaba:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3300,144 +3449,157 @@ msgstr ""
 "Ta program je sestavni del programa NetworkManager (http://projects.gnome."
 "org/NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../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:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:77
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:131
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ni omogočeno"
 
-#: ../src/mb-menu-item.c:137
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ni vpisano"
 
-#: ../src/mb-menu-item.c:155
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Domače omrežje (%s)"
 
-#: ../src/mb-menu-item.c:157
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Domače omrežje"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "iskanje"
 
-#: ../src/mb-menu-item.c:168
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "vpis je zavrnjen"
 
-#: ../src/mb-menu-item.c:173 ../src/mb-menu-item.c:179
+#: ../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:175 ../src/mb-menu-item.c:181
+#: ../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:184
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Prehajajoče omrežje (%s)"
 
-#: ../src/mb-menu-item.c:186
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Prehajajoče omrežje"
 
-#: ../src/mobile-helpers.c:324
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "Koda PIN za kartico SIM '%s' na '%s'"
 
-#: ../src/mobile-helpers.c:457
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Zahtevana koda PIN"
 
-#: ../src/mobile-helpers.c:465
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Za napravo mobilnega širokopasovnega dostopa je zahtevana koda PIN."
 
+#: ../src/mobile-helpers.c:619
+#, 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:622
+msgid "roaming"
+msgstr "prehajajoči način"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Povezava %s"
 
-#: ../src/utils/utils.c:386
-msgid "Store the password only for this _user"
-msgstr "Shrani gesla le za tega _uporabnika"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:388
-msgid "Store the password for _all users"
-msgstr "Shrani gesla za _vse uporabnike"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:458
+#: ../src/wireless-security/eap-method.c:452
 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:461
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ali PEM potrdila (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:263
-#: ../src/wireless-security/eap-method-peap.c:296
-#: ../src/wireless-security/eap-method-ttls.c:327
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:401
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Izbor datoteke PAC ..."
 
-#: ../src/wireless-security/eap-method-fast.c:408
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Datoteke PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:412
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Vse datoteke"
 
@@ -3473,15 +3635,32 @@ msgstr "_Notranja overitev:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Dovoli samodejno odbiro PAC"
 
-#: ../src/wireless-security/eap-method-peap.c:281
-#: ../src/wireless-security/eap-method-ttls.c:312
-#: ../src/wireless-security/wireless-security.c:412
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:375
-#: ../src/wireless-security/eap-method-tls.c:458
-#: ../src/wireless-security/eap-method-ttls.c:406
+#: ../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 "Izbor pooblastitelja potrdila ..."
 
@@ -3509,15 +3688,46 @@ msgstr "Ni _zahtevano nobeno potrdilo"
 msgid "PEAP _version:"
 msgstr "_Različica PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Vsakokrat _vprašaj za to geslo"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:273
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Potrdilo _CA:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Nešifrirani zasebni ključi niso varni"
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../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 "
@@ -3530,11 +3740,11 @@ msgstr ""
 "\n"
 "(Zasebne ključe lahko zaščitite z geslom z openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:452
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Izbor osebnega potrdila ..."
 
-#: ../src/wireless-security/eap-method-tls.c:464
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Izbor osebnega ključa ..."
 
@@ -3554,23 +3764,36 @@ msgstr "Osebni _ključ:"
 msgid "_Private key password:"
 msgstr "_Geslo osebnega ključa:"
 
-#: ../src/wireless-security/wireless-security.c:424
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:448
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "ges"
 
-#: ../src/wireless-security/wireless-security.c:459
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "Hitro"
 
-#: ../src/wireless-security/wireless-security.c:470
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tuneliran TLS"
 
-#: ../src/wireless-security/wireless-security.c:481
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Varovani EAP (PEAP)"
 
@@ -3580,6 +3803,44 @@ msgstr "Varovani EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Overitev:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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)"
@@ -3604,10 +3865,174 @@ msgstr "_Pokaži ključ"
 msgid "WEP inde_x:"
 msgstr "_Določilo WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
 #: ../src/wireless-security/ws-wpa-psk.ui.h:2
 msgid "_Type:"
 msgstr "Vrs_ta:"
 
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Omogoči mobilno širokopasovno povezavo WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "Pomo_č"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Sedaj ste povezani v širokopasovno omrežje."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Pripravljanje omrežne povezave '%s' ..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Nastavljanje širokopasovne povezave '%s' ..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Za omrežno povezavo '%s' je zahtevana overitev uporabnika ..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Poteka zahteva za pridobitev naslova za '%s' ..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Omrežna povezava '%s' je dejavna"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Povezani ste v omrežni most."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Pripravljanje omrežnega mostu '%s' ..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Nastavljanje omrežnega mostu '%s' ..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr ""
+#~ "Za povezovanje omrežnega mostu '%s' je zahtevana overitev uporabnika ..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Omrežni most '%s' je dejaven"
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "Samodejni Infiniband"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Omrežja InfiniBand (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Omrežje InfiniBand (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Omrežja Infiniband"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "Omrežje InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Sedaj ste povezani z omrežjem InfiniBand."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Pripravljanje povezave Infiniband '%s' ..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Nastavljanje povezave InfiniBand '%s' ..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "Za povezavo InfiniBand '%s' je zahtevana overitev uporabnika ..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "Povezava InfiniBand '%s' je dejavna"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Sedaj ste povezani v skupinsko omrežje."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Pripravljanje povezave skupine '%s' ..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Nastavljanje povezave skupine '%s' ..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Za omrežno povezavo '%s' je zahtevana overitev uporabnika ..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Povezava skupine '%s' je dejavna"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Sedaj ste povezani z VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Pripravljanje povezave VLAN '%s' ..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Nastavljanje povezave VLAN '%s' ..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Za povezavo VLAN '%s' je zahtevana overitev uporabnika ..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "Povezava VLAN '%s' je dejavna"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX mobilno širokopasovno omrežje (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX mobilno širokopasovno omrežje"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX je onemogočen"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "Vmesnik WiMAX je onemogočen s stikalom strojne opreme"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Vzpostavljena je povezava z omrežjem WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "neznano"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "neznano"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "MAC naslov _naprave:"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "Uvozi _nastavitve skupine iz datoteke ..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "Infrastruktura"
+
+#~ 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 ..."
 
diff --git a/po/sq.po b/po/sq.po
index b425d1e3..79eb6894 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,162 +7,3748 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-19 13:38-0400\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info-daemon/networks.glade:11
-msgid "Modify Wireless Networks"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#, fuzzy
+msgid "Network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: info-daemon/networks.glade:92
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">Rrjete Wireless:</span>"
+#: ../nm-applet.desktop.in.h:2
+#, fuzzy
+msgid "Manage your network connections"
+msgstr "Lidhjet e rrjetit"
 
-#: info-daemon/passphrase.glade:9
-msgid "Wireless Network Key Required"
-msgstr "Nevoitet Kyçi i Rrjetit Wireless"
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "Lidhjet e rrjetit"
 
-#: info-daemon/passphrase.glade:52
-msgid "_Login to Network"
-msgstr "_Identifikohu në Rrjet"
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+msgid "Disable connected notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+msgid "Disable disconnected notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+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
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+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 WiFi Create"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+msgid "Ignore CA certificate"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "NetworkManager nuk është duke punuar..."
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "NetworkManager nuk është duke punuar..."
 
-#: info-daemon/passphrase.glade:100
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr ""
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 #, fuzzy
+msgid "_Network name:"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr ""
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+msgid "Failed to add/activate connection"
+msgstr ""
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr ""
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+msgid "Connection failure"
+msgstr ""
+
+#: ../src/applet.c:399
+msgid "Device disconnect failed"
+msgstr ""
+
+#: ../src/applet.c:404
+msgid "Disconnect failure"
+msgstr ""
+
+#: ../src/applet.c:434
+msgid "Connection activation failed"
+msgstr ""
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr ""
+
+#: ../src/applet.c:844
+#, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
 "\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Fjalëkalimi kërkohet nga Rrjeti  "
-"Wirelessi</span>\n"
+
+#: ../src/applet.c:847
+#, c-format
+msgid ""
 "\n"
-"Për t'u futur në rrjetin wireless '%s' kërkohet fjalëkalimi ose një kyç WEP."
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
 
-#: info-daemon/passphrase.glade:129
-msgid "Key Type:"
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
 msgstr ""
 
-#: info-daemon/passphrase.glade:150
+#: ../src/applet.c:853
+#, c-format
 msgid ""
-"128-bit Passphrase\n"
-"128-bit Raw Hex Key"
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
 msgstr ""
 
-#: info-daemon/passphrase.glade:180
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
-msgid "Passphrase:"
-msgstr "Fjalëkalimi:"
+#: ../src/applet.c:856
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
 
-#: info-daemon/passphrase.glade:208 panel-applet/essid.glade:162
-msgid "*"
-msgstr "*"
+#: ../src/applet.c:859
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
-msgid "Key:"
+#: ../src/applet.c:862
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
 msgstr ""
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessApplet.c:691 panel-applet/NMWirelessApplet.c:701
+#: ../src/applet.c:865
+#, c-format
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
 msgstr ""
-"Instrumenti NetworkManager nuk arrin të gjejë disa burime të nevojshme (file "
-"glade nuk u gjet)."
 
-#: panel-applet/NMWirelessApplet.c:716
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+
+#: ../src/applet.c:888
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 #, fuzzy
-msgid "Custom wireless network"
-msgstr "Ndrysho Rrjetet Wireless"
+msgid "VPN Connection Failed"
+msgstr "Lidhjet e rrjetit"
 
-#: panel-applet/NMWirelessApplet.c:717
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr ""
+
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr ""
+
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:800
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr ""
+
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr ""
+
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr ""
+
+#: ../src/applet.c:1449
 #, fuzzy
-msgid "Other Wireless Networks..."
-msgstr "Rrjete të tjerë Wireless..."
+msgid "_VPN Connections"
+msgstr "Lidhjet e rrjetit"
 
-#: panel-applet/NMWirelessApplet.c:911
-msgid "No network devices have been found"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1028
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr ""
+
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager nuk është duke punuar..."
 
-#: panel-applet/essid.glade:52
-msgid "C_onnect"
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
 msgstr ""
 
-#: panel-applet/essid.glade:131
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
 #, fuzzy
-msgid "Wireless _Network:"
+msgid "Enable _Networking"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: panel-applet/essid.glade:177
-msgid "Wireless _adapter:"
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+msgid "Enable _Wi-Fi"
 msgstr ""
 
-#: panel-applet/menu-info.c:101
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr ""
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr ""
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+#, fuzzy
+msgid "Edit Connections..."
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/applet.c:1894
+#, fuzzy
+msgid "_About"
+msgstr "_Informacione..."
+
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr ""
+
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr ""
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr ""
+
+#: ../src/applet.c:2474
 #, fuzzy, c-format
-msgid "Wired Network (%s)"
+msgid "Preparing network connection '%s'..."
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2483
+#, fuzzy, c-format
+msgid "Network connection '%s' active"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr ""
+
+#: ../src/applet.c:2616
+#, fuzzy
+msgid "No network connection"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/applet.c:3204
+#, fuzzy
+msgid "NetworkManager Applet"
+msgstr "NetworkManager nuk është duke punuar..."
+
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr ""
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr ""
+
+#: ../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
+msgid "Mobile Broadband"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr ""
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:30
+msgid "Auto Ethernet"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: panel-applet/menu-info.c:103
+#: ../src/applet-device-ethernet.c:89
 #, fuzzy
-msgid "Wired Network"
+msgid "Ethernet Network"
 msgstr "Ndrysho Rrjetet Wireless"
 
-#: panel-applet/menu-info.c:168
+#: ../src/applet-device-ethernet.c:133
+msgid "You are now connected to the ethernet network."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:161
+#, c-format
+msgid "Preparing ethernet network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:164
+#, c-format
+msgid "Configuring ethernet network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:167
+#, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:170
+#, c-format
+msgid "Requesting an ethernet network address for '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:174
+#, c-format
+msgid "Ethernet network connection '%s' active"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:346
+msgid "DSL authentication"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:230
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:281
+msgid "Create _New Wi-Fi Network..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:431
+msgid "(none)"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:901
 #, fuzzy, c-format
-msgid "Wireless Network (%s)"
-msgid_plural "Wireless Networks (%s)"
-msgstr[0] "Ndrysho Rrjetet Wireless"
-msgstr[1] "Ndrysho Rrjetet Wireless"
+msgid "Wi-Fi Networks (%s)"
+msgstr "Ndrysho Rrjetet Wireless"
 
-#: panel-applet/menu-info.c:170
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../src/applet-device-wifi.c:905
 #, fuzzy
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
 msgstr[0] "Ndrysho Rrjetet Wireless"
 msgstr[1] "Ndrysho Rrjetet Wireless"
 
-#: panel-applet/menu-info.c:307
-msgid " (invalid Unicode)"
+#: ../src/applet-device-wifi.c:934
+msgid "Wi-Fi is disabled"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:996
+#, fuzzy
+msgid "More networks"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../src/applet-device-wifi.c:1180
+msgid "Wi-Fi Networks Available"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1181
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1364
+#, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1399
+#, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1402
+#, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1405
+#, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1408
+#, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1419
+#, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/applet-device-wifi.c:1442
+msgid "Failed to activate connection"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1465
+msgid "Failed to add new connection"
+msgstr ""
+
+#: ../src/applet-dialogs.c:41
+msgid "Error displaying connection information:"
+msgstr ""
+
+#: ../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
+msgid "LEAP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:74
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
+msgid "WPA/WPA2"
+msgstr ""
+
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+msgid "More addresses"
+msgstr ""
+
+#: ../src/applet-dialogs.c:226
+msgid "WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+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
+#, c-format
+msgid "%u Mb/s"
+msgstr ""
+
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+msgctxt "Speed"
+msgid "Unknown"
+msgstr ""
+
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr ""
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:492
+#, c-format
+msgid "Ethernet (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:495
+#, c-format
+msgid "802.11 WiFi (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:502
+#, c-format
+msgid "GSM (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:504
+#, c-format
+msgid "CDMA (%s)"
+msgstr ""
+
+#. --- General ---
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
+msgid "General"
+msgstr ""
+
+#: ../src/applet-dialogs.c:516
+msgid "Interface:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:536
+msgid "Hardware Address:"
+msgstr ""
+
+#. Driver
+#: ../src/applet-dialogs.c:550
+msgid "Driver:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:585
+msgid "Speed:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:600
+msgid "Security:"
+msgstr ""
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+msgid "IPv4"
+msgstr ""
+
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr ""
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+msgid "IPv6"
+msgstr ""
+
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+msgid "Ignored"
+msgstr ""
+
+#: ../src/applet-dialogs.c:815
+msgid "VPN Type:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:822
+msgid "VPN Gateway:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:828
+msgid "VPN Username:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr ""
+
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:957
+msgid "No valid active connections found!"
+msgstr ""
+
+#: ../src/applet-dialogs.c:985
+msgid ""
+"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2005-2008 Novell, Inc.\n"
+"and many other community contributors and translators"
+msgstr ""
+
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr ""
+
+#: ../src/applet-dialogs.c:990
+#, fuzzy
+msgid "NetworkManager Website"
+msgstr "NetworkManager nuk është duke punuar..."
+
+#: ../src/applet-dialogs.c:1005
+msgid "Missing resources"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1030
+msgid "Mobile broadband network password"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1039
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr ""
+
+#: ../src/applet-dialogs.c:1054
+#, fuzzy
+msgid "Password:"
+msgstr "Fjalëkalimi:"
+
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr ""
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr ""
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr ""
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr ""
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
+
+#: ../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
+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: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
+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: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
+msgid "_Delete"
+msgstr ""
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr ""
+
+#: ../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…"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+msgid "Choose a Connection Type"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+msgid ""
+"Select the type of connection you wish to create.\n"
+"\n"
+"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."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+msgid "_Interface name:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+msgid "_Primary:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+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.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "Enable I_GMP snooping"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr ""
+
+#: ../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
+msgid "default"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+msgid "MAC address"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+msgid "HW address"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+msgid "device"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr ""
+
+#: ../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.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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-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
+msgid "Automatic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr ""
+
+#: ../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
+msgid "_Device:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+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 ""
+"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-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+msgid "De_fault"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+msgid "_Broadcast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+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.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+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.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+msgid "Connected"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+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:186
+#: ../src/connection-editor/page-ip6.c:204
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Addresses"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr ""
+
+#: ../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
+msgid "S_earch domains:"
+msgstr ""
+
+#: ../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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+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:17
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+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
+msgid "Basic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "Nu_mber:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Advanced"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "_APN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "N_etwork ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Sho_w passwords"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
+msgid "Authentication"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
+msgid "Allowed methods:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+msgid "Compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
+msgid "_Require 128-bit encryption"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+msgid "Use _stateful MPPE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Allow _BSD data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
+msgid "Allow _Deflate data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Use TCP _header compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid "Send PPP _echo packets"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+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.h:3
+msgid "Cloned MAC _address:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
+msgid "Device name + number"
+msgstr ""
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
+
+#: ../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
+msgid "Allowed Authentication Methods"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:196
+msgid "Hardware"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+msgid "Import a saved VPN configuration..."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr ""
+
+#: ../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
+msgid "Address"
+msgstr ""
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr ""
+
+#: ../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
+msgid "Gateway"
+msgstr ""
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr ""
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+msgid "Missing connection name"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+msgid "Editor initializing..."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+msgid "Connection cannot be modified"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+#, fuzzy
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr ""
+"Instrumenti NetworkManager nuk arrin të gjejë disa burime të nevojshme (file "
+"glade nuk u gjet)."
+
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "_Save"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not create connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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
+msgid "Connection _name:"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "_Informacione..."
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr ""
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:160
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:178
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:182
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:111
+msgid "Could not load 802.1x Security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr ""
+
+#: ../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
+msgid "Could not load Bluetooth user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "_Identifikohu në Rrjet"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bond.c:566
+msgid "primary"
+msgstr ""
+
+#: ../src/connection-editor/page-bond.c:616
+#, c-format
+msgid "Bond connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge.c:213
+msgid "Could not load bridge user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bridge.c:310
+#, c-format
+msgid "Bridge connection %d"
+msgstr ""
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+msgid "Could not load bridge port user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+msgid "Could not load DCB user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:129
+msgid "Could not load DSL user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:214
+#, c-format
+msgid "DSL connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:74
+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:328
+msgid "Could not load ethernet user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:457
+msgid "Ethernet device"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+msgid "cloned MAC"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, c-format
+msgid "Ethernet connection %d"
+msgstr ""
+
+#. 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
+msgid "Default"
+msgstr ""
+
+#: ../src/connection-editor/page-general.c:52
+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 nuk është duke punuar..."
+
+#: ../src/connection-editor/page-general.c:350
+msgid "Could not load General user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
+msgid "Automatic (VPN)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
+msgid "Automatic (VPN) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
+msgid "Automatic (PPPoE)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
+msgid "Automatic (PPPoE) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:135
+msgid "Automatic (DHCP)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:136
+msgid "Automatic (DHCP) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
+msgid "Link-Local Only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+msgid "Additional DNS ser_vers:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+msgid "Additional s_earch domains:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:965
+#, c-format
+msgid "Editing IPv4 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1160
+msgid "Could not load IPv4 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
+msgid "Ignore"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:172
+msgid "Automatic, DHCP only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:964
+#, c-format
+msgid "Editing IPv6 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1157
+msgid "Could not load IPv6 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
+msgid "Could not load mobile broadband user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:327
+msgid "Unsupported mobile broadband connection type."
+msgstr ""
+
+#. Fall back to just asking for GSM vs. CDMA
+#: ../src/connection-editor/page-mobile.c:529
+msgid "Select Mobile Broadband Provider Type"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:561
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:568
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+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:258
+msgid "PAP"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
+msgid "CHAP"
+msgstr ""
+
+#: ../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
+msgid "MSCHAPv2"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
+msgid "MSCHAP"
+msgstr ""
+
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:136
+msgid "none"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:196
+#, c-format
+msgid "Editing PPP authentication methods for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:281
+msgid "Could not load PPP user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+msgid "Could not load team user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:377
+#, c-format
+msgid "Team connection %d"
+msgstr ""
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/connection-editor/page-vlan.c:596
+msgid "Could not load vlan user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, c-format
+msgid "VLAN connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:103
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:118
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
+#, fuzzy, c-format
+msgid "VPN connection %d"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/connection-editor/page-vpn.c:229
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:255
+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
+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
+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
+#, c-format
+msgid "%u (%u MHz)"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:450
+msgid "Could not load Wi-Fi user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+msgid "Wi-Fi device"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:619
+#, c-format
+msgid "Wi-Fi connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Fjalëkalimi:"
+
+#: ../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)"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+msgid "WPA & WPA2 Enterprise"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:413
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:424
+msgid "Wi-Fi Security"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:426
+msgid "Could not load Wi-Fi security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:512
+#, c-format
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:138
+msgid "Cannot import VPN connection"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/vpn-helpers.c:141
+msgid "unknown error"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:215
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:217
+msgid "_Replace"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:219
+#, c-format
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:255
+msgid "Cannot export VPN connection"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:257
+#, c-format
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:292
+msgid "Export VPN connection..."
+msgstr ""
+
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
+#, fuzzy
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"Instrumenti NetworkManager nuk arrin të gjejë disa burime të nevojshme (file "
+"glade nuk u gjet)."
+
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr ""
+
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr ""
+
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr ""
+
+#: ../src/info.ui.h:3
+#, fuzzy
+msgid "Active Network Connections"
+msgstr "Lidhjet e rrjetit"
+
+#: ../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-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
+msgid "Unlisted"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
+msgid "_Select your plan:"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
+#: ../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
+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
+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 ""
+
+#: ../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
+msgid "Installed GSM device"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../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
+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:"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../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
+msgid "Your broadband billing plan name"
+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 ""
+
+#: ../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 ""
+
+#: ../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
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#, fuzzy
+msgid "New Mobile Broadband Connection"
+msgstr "Lidhjet e rrjetit"
+
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+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.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+msgid "_Ternary 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-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
+msgid "New..."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+msgid "C_reate"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
+msgstr "Nevoitet Kyçi i Rrjetit Wireless"
+
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+msgid "Create New Wi-Fi Network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+msgid "Wi-Fi _security:"
+msgstr ""
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Lidhjet e rrjetit"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+msgid "Wi-Fi _adapter:"
+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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr ""
+
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+
+#: ../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
+msgid "EVDO"
+msgstr ""
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:68
+msgid "HSPA+"
+msgstr ""
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr ""
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr ""
+
+#: ../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
+msgid "Home network"
+msgstr "Ndrysho Rrjetet Wireless"
+
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr ""
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr ""
+
+#: ../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
+msgid "Roaming network"
+msgstr "_Identifikohu në Rrjet"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr ""
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr ""
+
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr ""
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Lidhjet e rrjetit"
+
+#: ../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/wireless-security/eap-method.c:452
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method.c:455
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+msgid "Anonymous"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+msgid "Authenticated"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+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
+msgid "_Inner authentication:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+msgid "MD5"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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
+msgid "No CA certificate is _required"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+msgid "PEAP _version:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
+msgid "Unencrypted private keys are insecure"
+msgstr ""
+
+#: ../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)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:475
+msgid "Choose your personal certificate..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:487
+msgid "Choose your private key..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "Private _key:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_Private key password:"
+msgstr ""
+
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
+msgid "TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
+msgid "Tunneled TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:493
+msgid "Protected EAP (PEAP)"
+msgstr ""
+
+#: ../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
+msgid "Au_thentication:"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
+msgid "Open System"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x:"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr ""
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "Ndrysho Rrjetet Wireless"
+
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">Rrjete Wireless:</span>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+#~ "Network</span>\n"
+#~ "\n"
+#~ "A passphrase or encryption key is required to access the wireless network "
+#~ "'%s'."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Fjalëkalimi kërkohet nga Rrjeti  "
+#~ "Wirelessi</span>\n"
+#~ "\n"
+#~ "Për t'u futur në rrjetin wireless '%s' kërkohet fjalëkalimi ose një kyç "
+#~ "WEP."
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#, fuzzy
+#~ msgid "Custom wireless network"
+#~ msgstr "Ndrysho Rrjetet Wireless"
+
+#, fuzzy
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "Rrjete të tjerë Wireless..."
+
+#, fuzzy
+#~ msgid "Wireless Network (%s)"
+#~ msgid_plural "Wireless Networks (%s)"
+#~ msgstr[0] "Ndrysho Rrjetet Wireless"
+#~ msgstr[1] "Ndrysho Rrjetet Wireless"
+
 #~ msgid "There are no wireless networks..."
 #~ msgstr "Nuk ekziston asnjë rrjet wireless..."
 
 #~ msgid "There are no network devices..."
 #~ msgstr "Nuk ekziston asnjë dispozitiv rrjeti..."
 
-#~ msgid "Network Connections"
-#~ msgstr "Lidhjet e rrjetit"
-
-#~ msgid "_About..."
-#~ msgstr "_Informacione..."
-
-#~ msgid " "
-#~ msgstr " "
-
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
 #~ "Confirmation</span>\n"
diff --git a/po/sr.po b/po/sr.po
index c296e6c4..1b0c8ed5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,27 +1,30 @@
 # Serbian translation of network-manager-applet
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2004 — 2016.
 # This file is distributed under the same license as the totem package.
+#
+# Translators: 
 # Filip Miletic
 # Милош Поповић <gpopac@gmail.com>, 2010.
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2016.
+# Марко М. Костић <marko.m.kostic@gmail.com>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\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-01-04 01:59+0000\n"
-"PO-Revision-Date: 2016-01-05 10:42+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
+"PO-Revision-Date: 2016-03-29 18:34+0200\n"
+"Last-Translator: Марко М. Костић <marko.m.kostic@gmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\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"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3258
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Мрежа"
 
@@ -127,12 +130,10 @@ msgstr ""
 "потврђивања идентитета."
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
-#| msgid "NetworkManager Applet"
 msgid "NetworkManager"
 msgstr "Управник мреже"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-#| msgid "NetworkManager Applet"
 msgid "NetworkManager for GNOME"
 msgstr "Управник мреже за Гном"
 
@@ -152,7 +153,7 @@ msgstr ""
 "Програм ум-уређивач-веза ради са Управником мреже да би направио и уредио "
 "постојеће профиле везе за Управника мреже."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Потврђивање идентитета за 802.1X везу"
 
@@ -167,7 +168,6 @@ msgid "_Cancel"
 msgstr "_Откажи"
 
 #: ../src/8021x.ui.h:3
-#| msgid "Connected"
 msgid "C_onnect"
 msgstr "_Повежи"
 
@@ -175,46 +175,45 @@ msgstr "_Повежи"
 msgid "_Network name:"
 msgstr "_Име мреже:"
 
-#: ../src/ap-menu-item.c:87
-#| msgid "Ad-hoc"
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ад-хок"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "обезбеди."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Нисам успео да додам/активирам везу"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Неуспело повезивање"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Неуспело прекидање везе уређаја"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Неуспело прекидање везе"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Неуспело активирање везе"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Не приказуј више ову поруку"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -224,7 +223,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ због прекида везе у мрежи."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -233,7 +232,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ због неочекиваног искључења ВПН сервиса."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -244,7 +243,7 @@ msgstr ""
 "Не могу да успоставим ВПН везу „%s“ јер је ВПН сервис послао неодговарајућа "
 "подешавања."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -253,7 +252,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ јер је истекло време за повезивање."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -262,7 +261,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ јер ВПН сервис није покренут на време."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -271,7 +270,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ зато што не могу да покренем ВПН сервис."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -280,7 +279,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ јер не постоје исправне ВПН лозинке."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -289,7 +288,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“ због неисправних ВПН лозинки."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -298,7 +297,7 @@ msgstr ""
 "\n"
 "Не могу да успоставим ВПН везу „%s“."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -308,7 +307,7 @@ msgstr ""
 "\n"
 "Прекинута је ВПН веза „%s“ због прекида везе у мрежи."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -317,7 +316,7 @@ msgstr ""
 "\n"
 "Прекинута је ВПН веза „%s“ због искључивања ВПН сервиса."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -326,7 +325,7 @@ msgstr ""
 "\n"
 "ВПН веза „%s“ је прекинута."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -337,19 +336,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "ВПН веза је успешно успостављена.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Порука за ВПН пријаву"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Није успело повезивање на ВПН"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -363,7 +362,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -376,311 +375,305 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "уређај није спреман (недостаје фирмвер)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "уређај није спреман"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "веза је прекинута"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Прекини везу"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "не могу да управљам уређајем"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Није пронађен ниједан мрежни уређај"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_ВПН везе"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "По_деси ВПН..."
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Прекини ВПН везу"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Управљач мрежом није покренут..."
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Умрежавање искључено"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Укључи _мрежне услуге"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Укључи _бежично мрежење"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Омогући _мобилне везе"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "_Прикажи обавештења"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Пода_ци о вези"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Уреди везе..."
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "По_моћ"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_О програму"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Повезани сте на „%s“."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Веза је прекинута"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Мрежна веза је прекинута."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Припремам мрежну везу „%s“..."
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Потребна је пријава корисника за успостављање везе „%s“..."
 
-#: ../src/applet.c:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Захтевам мрежну адресу за „%s“..."
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Повезани сте преко везе „%s“"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Успостављам ВПН везу „%s“..."
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Потребна је пријава корисника за успостављање ВПН везе „%s“..."
 
-#: ../src/applet.c:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Захтевам ВПН мрежну адресу за „%s“..."
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Повезани сте преко ВПН везе „%s“"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Нема мрежне везе"
 
-#: ../src/applet.c:3384
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Програмче управника мреже"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Погрешан ПУК код, контактирајте вашег провајдера."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Погрешан ПИН код, контактирајте вашег провајдера."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Шаљем код за откључавање..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Мобилна веза (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Мобилна"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Доступно"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Нова мобилна, широкопојасна веза..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Веза успостављена"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Повезани сте мобилном широкопојасном мрежом."
 
-#: ../src/applet-device-broadband.c:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Мобилна широкопојасна мрежа."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Сада сте регистровани на кућну мрежу."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Сада сте регистровани на мрежу пребацивања."
 
-#: ../src/applet-device-bt.c:93
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Повезани сте мобилном широкопојасном мрежом."
 
-#: ../src/applet-device-bt.c:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Припремам мобилну, широкопојасну везу „%s“..."
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Подешавам мобилну, широкопојасну везу „%s“..."
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Потребна је пријава корисника за повезивање у мобилној мрежи „%s“..."
 
-#: ../src/applet-device-bt.c:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Повезани сте преко мобилне широкопојасне везе „%s“"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Аутоматска жичана веза"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Жичане мреже (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Жичана мрежа (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Жичане мреже"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Жичана мрежа"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Повезани сте на жичану мрежу."
 
-#: ../src/applet-device-ethernet.c:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Припремам везу преко жичане мрежу „%s“..."
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Подешавам везу преко жичане мрежу „%s“..."
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Потребна је пријава корисника за успостављање жичане везе „%s“..."
 
-#: ../src/applet-device-ethernet.c:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Захтевам адресу за жичану мрежу „%s“..."
 
-#: ../src/applet-device-ethernet.c:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Повезани сте преко жичане везе „%s“"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Потврђивање идентитета ДСЛ-а"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Повежи се на _скривену бежичну мрежу..."
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Направи _нову бежичну мрежу..."
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ништа)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Бежичне мреже (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Бежична мрежа (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Бежична мрежа"
@@ -688,243 +681,238 @@ msgstr[1] "Бежичне мреже"
 msgstr[2] "Бежичне мреже"
 msgstr[3] "Жичана мрежа"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Бежична мрежа је искључена"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Бежична мрежа је искључена физичким прекидачем"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Још мрежа"
 
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Доступне су бежичне мреже"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Користите изборник мреже да се повежете на бежичну мрежу"
 
-#: ../src/applet-device-wifi.c:1237
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Повезани сте на бежичну мрежу „%s“."
 
-#: ../src/applet-device-wifi.c:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Припремам бежичну мрежну везу „%s“..."
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Подешавам везу преко бежичне мреже „%s“..."
 
-#: ../src/applet-device-wifi.c:1275
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Потребна је пријава корисника за успостављање бежичне везе „%s“..."
 
-#: ../src/applet-device-wifi.c:1278
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Захтевам адресу бежичне мреже за „%s“..."
 
-#: ../src/applet-device-wifi.c:1289
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Повезани сте преко бежичне везе „%s“ : %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Повезани сте преко бежичне везе „%s“"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Нисам успео да активирам везу"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Нисам успео да додам нову везу"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Грешка при приказивању података о вези:"
 
-#: ../src/applet-dialogs.c:75 ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "ЛЕАП"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Динамички ВЕП"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "ВПА/ВПА2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
-#| msgid "Addresses"
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Још адреса"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "ВЕП"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ништа"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (основно)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Непознато"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Непозната"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "ИП адреса:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Адреса за емитовање:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Непозната"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Мрежна маска:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Жичана мрежа (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 бежична (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "ГСМ (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "ЦДМА (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Опште"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Уређај:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Хардверска адреса:"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Драјвер:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Безбедност:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "ИПв4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Подразумевана рута:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "ИПв6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Занемарено"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "ВПН врста:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "ВПН мрежни пролаз:"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "ВПН корисничко име:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "ВПН банер:"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Веза основе:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Непознато"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Нема исправних, покренутих веза!"
 
-#: ../src/applet-dialogs.c:977
-#| msgid ""
-#| "Copyright © 2004-2011 Red Hat, Inc.\n"
-#| "Copyright © 2005-2008 Novell, Inc.\n"
-#| "and many other community contributors and translators"
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -934,42 +922,42 @@ msgstr ""
 "Ауторска права © 2005-2008 Новел, Доо.\n"
 "и многи други сарадници заједнице и преводиоци"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Програмче обавештајне зоне за управљање мрежним уређајима и везама."
 
-#: ../src/applet-dialogs.c:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Веб страница Управника мрежом"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Недостају ресурси"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Лозинка мобилне широкопојасне мреже"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Потребна је лозинка за повезивање на „%s“."
 
-#: ../src/applet-dialogs.c:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Потребно је откључати СИМ ПИН"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "Потребно је откључати СИМ ПИН"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -977,25 +965,25 @@ msgid ""
 msgstr "Мобилни широкопојасни уређај „%s“ захтева СИМ ПИН код."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "ПИН кôд:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Прикажи ПИН кôд"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Потребно је откључати СИМ ПУК"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "Потребно је откључати СИМ ПУК"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1003,22 +991,22 @@ msgid ""
 msgstr "Мобилни широкопојасни уређај „%s“ захтева СИМ ПУК кôд."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "ПУК кôд:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Нови ПИН кôд:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Поново унесите ПИН кôд:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Прикажи ПИН/ПУК кôдове"
 
@@ -1059,7 +1047,7 @@ msgstr "_Додај"
 #: ../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:697
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Обриши"
 
@@ -1160,7 +1148,7 @@ 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:5
-#: ../src/connection-editor/nm-connection-list.c:681
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Уређивање"
 
@@ -1203,7 +1191,6 @@ msgid "Link _down delay:"
 msgstr "Застој _развезивања:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:23
-#| msgid "Primary DNS:"
 msgid "_Primary:"
 msgstr "_Примарни:"
 
@@ -1263,7 +1250,6 @@ msgid "s"
 msgstr "s"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:10
-#| msgid "Enable _Networking"
 msgid "Enable I_GMP snooping"
 msgstr "Укључи И_ГМП њушкање"
 
@@ -1279,65 +1265,61 @@ msgstr "_Највеће време:"
 msgid "_Aging time:"
 msgstr "Време _старења:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "аутоматски"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "основно"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "непозната грешка"
 
-#: ../src/connection-editor/ce-page.c:247
-#| msgid "Address"
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "МАЦ адреса"
 
-#: ../src/connection-editor/ce-page.c:247
-#| msgid "Address"
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "ХВ адреса"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "неисправно %s за %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:486
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "неисправно %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "неисправан назив сучеља за %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "неисправан назив сучеља (%s)"
 
-#: ../src/connection-editor/ce-page.c:487
-#| msgid "Any device"
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "уређај"
 
-#: ../src/connection-editor/ce-page.c:593
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Не могу да ажурурам лозинке везе због непознате грешке."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:1
-#| msgid "Use 802.1_X security for this connection"
 msgid "Use Data Center Bridging (DCB) for this connection"
 msgstr "Користи премошћавање центра података (ДЦБ) за ову везу"
 
@@ -1362,7 +1344,6 @@ msgid "Feature"
 msgstr "Функција"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:7
-#| msgid "Enable _Wi-Fi"
 msgid "Enable"
 msgstr "Укључи"
 
@@ -1375,7 +1356,6 @@ msgid "Willing"
 msgstr "Приправан"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:10
-#| msgid "_Priority:"
 msgid "Priority"
 msgstr "Важност"
 
@@ -1384,7 +1364,6 @@ msgid "Options..."
 msgstr "Опције..."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:12
-#| msgid "_Priority:"
 msgid "Priority Groups"
 msgstr "Групе важности"
 
@@ -1441,7 +1420,6 @@ msgstr ""
 "Укључите или искључите важност паузе преноса за сваку корисничку важност."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:28
-#| msgid "_Priority:"
 msgid "Priority:"
 msgstr "Важност:"
 
@@ -1454,17 +1432,14 @@ msgid "1:"
 msgstr "1:"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:31
-#| msgid "2"
 msgid "2:"
 msgstr "2:"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:32
-#| msgid "3"
 msgid "3:"
 msgstr "3:"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:33
-#| msgid "4"
 msgid "4:"
 msgstr "4:"
 
@@ -1489,7 +1464,6 @@ msgid "Strict Bandwidth:"
 msgstr "Изричита појасна ширина:"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:39
-#| msgid "_Priority:"
 msgid "Priority Bandwidth:"
 msgstr "Појасна ширина важности:"
 
@@ -1557,8 +1531,8 @@ 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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1570,8 +1544,8 @@ msgstr "_Лозинка:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Самостално"
@@ -1627,7 +1601,6 @@ msgstr "_Самоуговарање"
 #: ../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
-#| msgid "_Service:"
 msgid "_Device:"
 msgstr "_Уређај:"
 
@@ -1651,41 +1624,42 @@ msgid "Wake on LAN:"
 msgstr "Пробуди на ЛАН-у:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:20
-#| msgid "Default"
 msgid "De_fault"
 msgstr "_Основно"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr "_Занемари"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Физички"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "За _једну"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "За _више"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
-#| msgid "Broadcast"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "За _све"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_ПРА"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "_Магично"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
-#| msgid "_Private key password:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "_Пробуди са ЛАН лозинком:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr "Пробуди-са-ЛАН лозинком (жичани МАК). Важи само за магичне пакете."
@@ -1727,8 +1701,8 @@ msgstr "Аутоматски са ручним ДНС подешавањем"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Ручно"
 
@@ -1739,8 +1713,8 @@ 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:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Подељено са осталим рачунарима"
 
@@ -1779,15 +1753,15 @@ msgstr "_ИБ ДХЦП клијента:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "Домени _претраге:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_ДНС сервери:"
 
@@ -1817,7 +1791,7 @@ msgid "_Routes…"
 msgstr "_Руте…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Искључено"
 
@@ -1830,9 +1804,6 @@ msgid "Enabled (prefer temporary address)"
 msgstr "Укључено (првенство привременој адреси)"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:17
-#| msgid ""
-#| "IP addresses of domain name servers used to resolve host names. Use "
-#| "commas to separate multiple domain name server addresses."
 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 "
@@ -1948,17 +1919,14 @@ msgid "_JSON config:"
 msgstr "_ЈСОН подешавање:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
-#| msgid "Import a saved VPN configuration..."
 msgid "_Import team configuration from a file..."
 msgstr "_Увези тимско подешавање из датотеке..."
 
 #: ../src/connection-editor/ce-page-team.ui.h:1
-#| msgid "Bonded _connections:"
 msgid "_Teamed connections:"
 msgstr "_Тимске везе:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-#| msgid "Import a saved VPN configuration..."
 msgid "Im_port team configuration from a file..."
 msgstr "Увези тимско _подешавање из датотеке..."
 
@@ -1967,12 +1935,10 @@ msgid "_Parent interface:"
 msgstr "_Родитељски уређај:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-#| msgid "VLAN interface _name:"
 msgid "VLAN inter_face name:"
 msgstr "Назив _ВЛАН уређаја:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#| msgid "_Cloned MAC address:"
 msgid "Cloned MAC _address:"
 msgstr "_Клонирана МАК адреса:"
 
@@ -2068,7 +2034,7 @@ msgstr "_Опсег:"
 msgid "SS_ID:"
 msgstr "СС_ИД:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Нема овлашћења полкита за обављање радње"
 
@@ -2126,156 +2092,153 @@ msgstr ""
 "У већини случајева, ППП сервери добављача ће подржати све начине потврђивања "
 "идентитета.  Ако веза не успе, покушајте да искључите подршку за неке начине."
 
-#: ../src/connection-editor/connection-helpers.c:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Жичана веза"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Бежична"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:126
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Блутут"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "ДСЛ"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "Инфини банд"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Веза"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Тим"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Мост"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:597 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "ВЛАН"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "ВПН"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Хардвер"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Виртуелно"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Увези сачувна ВПН подешавања..."
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "Не могу да покренем прозорче за измену везе због непознате грешке."
 
-#: ../src/connection-editor/connection-helpers.c:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Не могу да направим нову везу"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Не могу да обришем везу"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Да ли да заиста обришем везу %s?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Мрежна маска"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Мрежни пролаз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Метрички"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Префикс"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Уређујем %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Уређујем неименовану везу"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
-#| msgid "Connection _name:"
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Недостаје назив везе"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
-#| msgid "Error initializing editor"
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Покретање уређивача..."
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
-#| msgid "Connection add failed"
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "Веза не може бити измењена"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Неисправно подешавање %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2283,35 +2246,35 @@ msgstr ""
 "Програм за уређивање веза не може да пронађе неке од потребних ресурса (није "
 "нађена „.ui“ датотека)."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Сачувај све промене у овој вези."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Пријавите се како би сачували ову везу за све кориснике рачунара."
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Не могу да направим везу"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Не могу да уредим везу"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Непозната грешка стварања прозорчета за уређивање веза."
 
-#: ../src/connection-editor/nm-connection-editor.c:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Грешка у покретању уређивача"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Није успело додавање везе"
 
@@ -2327,17 +2290,17 @@ msgstr "Име _везе:"
 msgid "_Export..."
 msgstr "_Извези..."
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "никад"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "сада"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2346,7 +2309,7 @@ msgstr[1] "пре %d минута"
 msgstr[2] "пре %d минута"
 msgstr[3] "пре %d минут"
 
-#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2355,7 +2318,7 @@ msgstr[1] "пре %d сата"
 msgstr[2] "пре %d сати"
 msgstr[3] "пре %d сат"
 
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2364,7 +2327,7 @@ msgstr[1] "пре %d дана"
 msgstr[2] "пре %d дана"
 msgstr[3] "пре %d дан"
 
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2373,7 +2336,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:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2382,123 +2345,116 @@ msgstr[1] "пре %d године"
 msgstr[2] "пре %d година"
 msgstr[3] "пре %d године"
 
-#: ../src/connection-editor/nm-connection-list.c:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Назив"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Употрбљена"
 
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Уређује податке за изабрану везу"
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Пријавите се како би изменили изабрану везу"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Брише изабрану везу"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Пријавите се како би обрисали изабрану везу"
 
-#: ../src/connection-editor/nm-connection-list.c:924
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Нису инсталирани ВПН прикључци."
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "Не знам како да направим „%s“ везу"
 
-#: ../src/connection-editor/nm-connection-list.c:928
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Грешка приликом стварања везе"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Грешка приликом уређивања везе"
 
-#: ../src/connection-editor/nm-connection-list.c:951
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Нисам нашао везу која има УУИД „%s“"
 
-#: ../src/connection-editor/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Безбедност 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "Не могу да учитам безбедносно корисничко сучеље за 802.1x."
 
-#: ../src/connection-editor/page-8021x-security.c:128
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Користи 802.1_X безбедност за ову везу"
 
-#: ../src/connection-editor/page-bluetooth.c:61
+#: ../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:128
-#| msgid "Could not load ethernet user interface."
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Не могу да учитам корисничко сучеље блутута."
 
-#: ../src/connection-editor/page-bluetooth.c:178
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "неисправан блутут уређај (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:261
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
-#| msgid "Bond connection %d"
 msgid "Bluetooth connection %d"
 msgstr "Блутут веза „%d“"
 
-#: ../src/connection-editor/page-bluetooth.c:305
-#| msgid "Bluetooth"
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Врста блутута"
 
-#: ../src/connection-editor/page-bluetooth.c:323
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Изаберите врсту профила блутут везе."
 
-#: ../src/connection-editor/page-bluetooth.c:328
-#| msgid "Ethernet Network"
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "Мрежа _личног домена"
 
-#: ../src/connection-editor/page-bluetooth.c:333
-#| msgid "Wi-Fi Network"
-#| msgid_plural "Wi-Fi Networks"
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "Мрежа _двојне парице"
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Не могу да учитам корисничко сучеље свезе."
 
-#: ../src/connection-editor/page-bond.c:568
-#| msgid "Primary DNS:"
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "примарни"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Веза свезе %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Не могу да учитам корисничко сучеље моста."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Веза моста %d"
@@ -2506,78 +2462,72 @@ msgstr "Веза моста %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Прикључник моста"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Не могу да учитам корисничко сучеље прикључника моста."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "ДЦБ"
 
-#: ../src/connection-editor/page-dcb.c:608
-#| msgid "Could not load DSL user interface."
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Не могу да учитам ДЦБ корисничко сучеље."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Не могу да учитам корисничко сучеље за DSL."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "ДСЛ веза „%d“"
 
-#: ../src/connection-editor/page-ethernet.c:77
-#| msgid ""
-#| "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:74
 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 ""
 "Ова опција додељује ову везу мрежном уређају који је одређен или својим "
-"називом или трајном МАК адресом или са оба.  Нпр: „em1“, „3C:97:0E:42:1A:19“"
-", „em1 (3C:97:0E:42:1A:19)“"
+"називом или трајном МАК адресом или са оба.  Нпр: „em1“, "
+"„3C:97:0E:42:1A:19“, „em1 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-ethernet.c:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Не могу да учитам корисничко сучеље за жичану мрежу."
 
-#: ../src/connection-editor/page-ethernet.c:447
-#| msgid "Ethernet"
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Уређај жичане везе"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:744
-#: ../src/connection-editor/page-wifi.c:583
-#| msgid "C_loned MAC address:"
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "клониран МАК"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Пробуди са ЛАН лозинком"
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Подразумевана"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2587,15 +2537,15 @@ msgstr ""
 "бирање доводи до коришћења задате области подешене у мрежној баријери. Може "
 "се користити само ако је покренут демон мрежне баријере (firewalld)."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "Демон мрежне баријере није покренут."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Не могу да учитам опште корисничко сучеље."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2603,156 +2553,156 @@ msgid ""
 "(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)\""
 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)“"
+"називом или трајном МАК адресом или са оба.  Нпр: „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:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Не могу да учитам корисничко сучеље Инфини банда."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 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-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Самостално (ВПН)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Само самосталне (ВПН) адресе"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Аутоматски, само адресе"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Самостално (ПППоЕ)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Само самосталне (ПППоЕ) адресе"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Самостално (ДХЦП)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Само самосталне (ДХЦП) адресе"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Само вежи-локално"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Додатни _ДНС сервери:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Додатни домени _претраге:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Уређујем ИПв4 руте за %s"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "ИПв4 подешавања"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Не могу да учитам ИПв4 корисничко сучеље."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "ИПв4 адреса „%s“ је неисправна"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "ИПв4 мрежна маска адресе „%s“ је неисправна"
 
-#: ../src/connection-editor/page-ip4.c:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "ИПв4 мрежни пролаз „%s“ је неисправан"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "ИПв4 ДНС сервер „%s“ је неисправан"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Занемари"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Аутоматски, само ДХЦП"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Уређујем ИПв6 руте за %s"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "ИПв6 подешавања"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Не могу да учитам ИПв6 корисничко сучеље."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "ИПв6 адреса „%s“ је неисправна"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "ИПв4 префикс „%s“ је неисправан"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "ИПв6 мрежни пролаз „%s“ је неисправан"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "ИПв5 ДНС сервер „%s“ је неисправан"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Умножи подређене"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "Оба подређена „%s“ и „%s“ се примењују на уређај „%s“"
 
-#: ../src/connection-editor/page-master.c:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2761,25 +2711,25 @@ msgstr ""
 "Подређени „%s“ и „%s“ се примењују на различите виртуелне прикључнике („%s“ "
 "и „%s“) истог физичког уређаја."
 
-#: ../src/connection-editor/page-master.c:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s подређује %d"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Не могу да учитам корисничко сучеље за мобилну, широкопојасну мрежу."
 
-#: ../src/connection-editor/page-mobile.c:330
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Није подржана ова врста мобилне, широкопојасне мреже."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Изаберите врсту мобилног широкопојасног издавача"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2787,146 +2737,141 @@ msgstr ""
 "Изаберите технологију коју користи ваш издавач мобилних широкопојасних "
 "услуга.  Уколико нисте сигурни, питајте издавача."
 
-#: ../src/connection-editor/page-mobile.c:564
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Мој издавач користи _ГСМ технологије (нпр. ГПРС, ЕДГЕ, УМТС, ХСДПА)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Мој издавач користи Ц_ДМА технологије (нпр. 1xРТТ, ЕВДО)"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "ЦДМА"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "ГСМ"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "ЕАП"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "ПАП"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "ЦХАП"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "МСЦХАПв2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "МСЦХАП"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ништа"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Уређујем ППП начине пријаве за %s"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "ППП подешавања"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Не могу да учитам ППП корисничко сучеље."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Изаберите датотеку за увоз"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Грешка: датотека не садржи исправно ЈСОН подешавање"
 
-#: ../src/connection-editor/page-team.c:272
-#| msgid "Could not load vlan user interface."
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Не могу да учитам тимско корисничко сучеље."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
-#| msgid "DSL connection %d"
 msgid "Team connection %d"
 msgstr "Тимска веза „%d“"
 
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:154
-#| msgid "Bridge Port"
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Тимски прикључник"
 
-#: ../src/connection-editor/page-team-port.c:156
-#| msgid "Could not load bridge port user interface."
+#: ../src/connection-editor/page-team-port.c:153
 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:417
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (путем „%s“)"
 
-#: ../src/connection-editor/page-vlan.c:429
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
-#| msgid "No network connection"
 msgid "New connection..."
 msgstr "Нова веза..."
 
-#: ../src/connection-editor/page-vlan.c:599
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Не могу да учитам корисничко сучеље влан-а."
 
-#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr "влан надређени"
 
-#: ../src/connection-editor/page-vlan.c:800
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "ВЛАН веза %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Не могу да учитам ВПН корисничко сучеље."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Не могу да нађем услугу ВПН прикључка за „%s“."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "ВПН веза %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2936,11 +2881,11 @@ msgstr ""
 "\n"
 "Грешка: није изабрана врста ВПН сервиса."
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Избор врсте ВПН везе"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2950,7 +2895,7 @@ msgstr ""
 "врста ВПН везе коју желите да направите не појави на списку, можда немате "
 "инсталиран исправан ВПН прикључак."
 
-#: ../src/connection-editor/page-wifi.c:80
+#: ../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"
@@ -2958,10 +2903,7 @@ msgstr ""
 "Ова опција додељује ову везу тачки бежичног приступа (АП) која је наведена "
 "овде унетим БССИД-ом.  Нпр: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:91
-#| msgid ""
-#| "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:88
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"wlan0\", "
@@ -2971,83 +2913,82 @@ msgstr ""
 "називом или трајном МАК адресом или са оба.  Нпр: „wlan0“, "
 "„3C:97:0E:42:1A:19“, „wlan0 (3C:97:0E:42:1A:19)“"
 
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Не могу да учитам корисничко сучеље за бежичну мрежу."
 
-#: ../src/connection-editor/page-wifi.c:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "бссид"
 
-#: ../src/connection-editor/page-wifi.c:579
-#| msgid "Any device"
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Бежични уређај"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Бежична веза %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "ВЕП 128-битна лозинка"
 
-#: ../src/connection-editor/page-wifi-security.c:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "Динамички ВЕП (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Лични ВПА & ВПА2"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Пословни ВПА & ВПА2"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Не могу да учитам безбедносно корисничко сучеље за бежичну мрежу; недостају "
 "подешавања бежичне мреже."
 
-#: ../src/connection-editor/page-wifi-security.c:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Бежична безбедност"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Не могу да учитам безбедносно корисничко сучеље за бежичну мрежу."
 
-#: ../src/connection-editor/page-wifi-security.c:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "недостаје ССИД"
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Безбедност није сагласна са ад-хок режимом"
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Не могу да увезем ВПН везу"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3060,30 +3001,29 @@ msgstr ""
 "\n"
 "Грешка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
-#| msgid "Unknown error"
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "непозната грешка"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Већ постоји датотека „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Замени"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Да ли желите да замените %s ВПН везом пре чувања?"
 
-#: ../src/connection-editor/vpn-helpers.c:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Не могу да извезем ВПН везу"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3094,11 +3034,11 @@ msgstr ""
 "\n"
 "Грешка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Извези ВПН везу..."
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3122,32 +3062,32 @@ msgstr "Подаци о вези"
 msgid "Active Network Connections"
 msgstr "Активне везе мреже"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../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:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../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:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3160,28 +3100,28 @@ msgstr ""
 "повежете на мрежу, проверите поново унета подешавања.  За измену подешавања, "
 "изаберите „Везе са мрежом“ из изборника Систем >> Поставке."
 
-#: ../src/libnma/nma-mobile-wizard.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Неизлистано"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../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:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3194,83 +3134,83 @@ msgstr ""
 "Уколико нисте сигурни за начин плаћања затражите АПН план од издавача "
 "Интернет услуге."
 
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../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.c:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Достављач"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Издавач:"
 
-#: ../src/libnma/nma-mobile-wizard.c:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../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:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../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:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Инсталиран ГСМ уређај"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Инсталиран ЦДМС уређај"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3278,90 +3218,84 @@ msgstr ""
 "Овај чаробњак ће вам помоћи да лако подесите мобилну широкопојасну вези са "
 "3Г мрежом."
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Потребни су вам следећи подаци:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Име издавача широкопојасне услуге"
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../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.c:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(у неким случајевима) ваш план широкопојасне наплате за АПН (Назив тачке "
 "приступа)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Направи везу за _овај мобилни, широкопојасни уређај:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../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.c:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Нова мобилна, широкопојасна веза"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../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:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../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:55 ../src/libnm-gtk/nm-ui-utils.c:620
-#| msgid "As_k for this password every time"
+#: ../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:56 ../src/libnm-gtk/nm-ui-utils.c:621
-#| msgid "A password is required to connect to '%s'."
+#: ../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:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
-#| msgid "_Password:"
+#: ../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.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
-#| msgid "_Password:"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "_Трећа лозинка:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
-#| msgid "Sho_w passwords"
+#: ../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:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
-#| msgid "Disconnect"
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Притисните да се повежете"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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"
@@ -3369,55 +3303,55 @@ msgstr ""
 "Или недостаје лозинка или је веза неисправна. У сваком случају, прво ћете "
 "морати да уредите везу у уређивачу веза"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Нова..."
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ништа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Направи"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Потребне су лозинке или кључеви шифровања за приступ бежичној мрежи „%s“."
 
-#: ../src/libnma/nma-wifi-dialog.c:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Потребно је потврђивање идентитета за бежичну мрежу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Бежична мрежа захтева потврђивање идентитета"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Направи нову бежичну мрежу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Нова бежична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Унесите назив за нову бежичну мрежу."
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Повежи се на скривену бежичну мрежу"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Скривена бежична мрежа"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3437,23 +3371,23 @@ msgstr "_Веза:"
 msgid "Wi-Fi _adapter:"
 msgstr "Бежични _уређај:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../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:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "ОЛПЦ мрежица"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "АДСЛ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "ПЦИ"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "УСБ"
 
@@ -3463,17 +3397,17 @@ msgstr "УСБ"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Употреба:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3481,7 +3415,7 @@ msgstr ""
 "Овај програм је део Управника мреже (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3489,152 +3423,151 @@ msgstr ""
 "Овај програм није намењен за рад у линији наредби, већ је део Гномовог "
 "радног окружења."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "ЕВДО"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "ГПРС"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "ЕДГЕ"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "УМТС"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "ХСДПА"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "ХСУПА"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "ХСПА"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "ХСПА+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "ЛТЕ"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "није омогућено"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "није регистрован"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Кућна мрежа (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Кућна мрежа"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "претражујем"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "регистрација је одбијена"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роминг)"
 
-#: ../src/mb-menu-item.c:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Мрежа у ромингу (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Мрежа у ромингу"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "ПИН код за СИМ картицу „%s“ на „%s“"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Потребан је ПИН кôд"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Потребан је ПИН код за повезивање мобилног широкопојасног уређаја"
 
-#: ../src/mobile-helpers.c:610
+#: ../src/mobile-helpers.c:619
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Повезани сте на мобилну широкопојасну везу „%s“: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "пребацивање"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s веза"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr "непозната грешка у 802.1x безбедности (впа-еап)"
 
-#: ../src/wireless-security/eap-method.c:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "непозната грешка проверавања датотеке еап-начина"
 
-#: ../src/wireless-security/eap-method.c:455
-#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "ДЕР, ПЕМ, или ПКЦС#12 лични кључеви (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "ДЕР или ПЕМ уверења (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "недостаје ЕАП-ФАСТ ПАЦ датотека"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "ГТЦ"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Изабери ПАЦ датотеку..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "ПАЦ датотеке (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Све датотеке"
 
@@ -3671,32 +3604,32 @@ msgstr "_Унутрашња пријава:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дозволи самостално ПАЦ _резервисање"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr "недостаје ЕАП-ЛЕАП корисничко име"
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "недостаје ЕАП-ЛЕАП лозинка"
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "неисправно ЕАП-ПЕАП уверење издавача уверења: %s"
 
-#: ../src/wireless-security/eap-method-peap.c:69
+#: ../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:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "МД5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Изаберите уверење издавача уверења..."
 
@@ -3717,7 +3650,6 @@ msgstr "_Уверење ИУ:"
 #: ../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
-#| msgid "Ignore CA certificate"
 msgid "No CA certificate is _required"
 msgstr "Није потребно _уверење"
 
@@ -3725,47 +3657,46 @@ msgstr "Није потребно _уверење"
 msgid "PEAP _version:"
 msgstr "ПЕАП _издање:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "недостаје ЕАП корисничко име"
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "недостаје ЕАП лозинка"
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "недостаје ЕАП-ТЛС идентитет"
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
-#| msgid "C_A certificate:"
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "неисправно ЕАП-ТЛС уверење издавача уверења: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "неисправно ЕАП-ТЛС уверење издавача уверења: уверење није наведено"
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "неисправна ЕАП-ТЛС лозинка: недостаје"
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "неисправан ЕАП-ТЛС лични кључ: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "неисправно ЕАП-ТЛС корисничко уверење: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Нешифровани приватни кључеви нису сигурни"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3779,11 +3710,11 @@ msgstr ""
 "\n"
 "(Можете заштитити приватне кључеве користећи „openssl“)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Изаберите лично уверење..."
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Изаберите лични кључ..."
 
@@ -3803,36 +3734,36 @@ msgstr "Приватни _кључ:"
 msgid "_Private key password:"
 msgstr "Л_озинка приватног кључа:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "неисправно ЕАП-ТТЛС уверење издавача уверења: %s"
 
-#: ../src/wireless-security/eap-method-ttls.c:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "неисправно ЕАП-ТТЛС уверење издавача уверења: уверење није наведено"
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1x security"
 msgstr "Непозната грешка проверавања 802.1x безбедности"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "ТЛС"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "ЛЗНК"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "ФАСТ"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "ТЛС кроз тунел"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Заштићени ЕАП (ПЕАП)"
 
@@ -3842,11 +3773,11 @@ msgstr "Заштићени ЕАП (ПЕАП)"
 msgid "Au_thentication:"
 msgstr "По_тврђивање идентитета:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "недостаје леап корисничко име"
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "недостаје леап лозинка"
 
@@ -3871,8 +3802,8 @@ msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
-"неисправан веп кључ: погрешна дужина кључа %zu. Кључ мора бити или дужине 5/"
-"13 (аскри) или 10/26 (хекс)"
+"неисправан веп кључ: погрешна дужина кључа %zu. Кључ мора бити или дужине "
+"5/13 (аскри) или 10/26 (хекс)"
 
 #: ../src/wireless-security/ws-wep-key.c:131
 msgid "invalid wep-key: passphrase must be non-empty"
@@ -3906,7 +3837,7 @@ msgstr "П_рикажи кључ"
 msgid "WEP inde_x:"
 msgstr "ВЕП _индекс:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3915,7 +3846,7 @@ msgstr ""
 "неисправна впа лозинка: неисправна дужина кључа %zu. Мора бити [8,63] бајта "
 "или 64 хекса-броја"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr ""
 "неисправна впа лозинка: не могу да растумачим кључ од 64 бајта као "
@@ -3925,6 +3856,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Врста:"
 
+#~ msgid "_Help"
+#~ msgstr "По_моћ"
+
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Омогу_ћи ВиМАХ Мобилну широкопојасну"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index cefc55ca..228473f6 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,27 +1,30 @@
 # Serbian translation of network-manager-applet
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2004 — 2016.
 # This file is distributed under the same license as the totem package.
+#
+# Translators: 
 # Filip Miletic
 # Miloš Popović <gpopac@gmail.com>, 2010.
 # Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2016.
+# Marko M. Kostić <marko.m.kostic@gmail.com>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\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-01-04 01:59+0000\n"
-"PO-Revision-Date: 2016-01-05 10:42+0200\n"
-"Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
+"PO-Revision-Date: 2016-03-29 18:34+0200\n"
+"Last-Translator: Marko M. Kostić <marko.m.kostic@gmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\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"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3258
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Mreža"
 
@@ -95,7 +98,8 @@ msgstr "Onemogući obrazovanje bežične mreže"
 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
 msgid "Show the applet in notification area"
@@ -115,24 +119,22 @@ 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
 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."
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
-#| msgid "NetworkManager Applet"
 msgid "NetworkManager"
 msgstr "Upravnik mreže"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-#| msgid "NetworkManager Applet"
 msgid "NetworkManager for GNOME"
 msgstr "Upravnik mreže za Gnom"
 
@@ -141,8 +143,8 @@ 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."
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
 msgid ""
@@ -152,7 +154,7 @@ msgstr ""
 "Program um-uređivač-veza radi sa Upravnikom mreže da bi napravio i uredio "
 "postojeće profile veze za Upravnika mreže."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Potvrđivanje identiteta za 802.1X vezu"
 
@@ -167,7 +169,6 @@ msgid "_Cancel"
 msgstr "_Otkaži"
 
 #: ../src/8021x.ui.h:3
-#| msgid "Connected"
 msgid "C_onnect"
 msgstr "_Poveži"
 
@@ -175,46 +176,45 @@ msgstr "_Poveži"
 msgid "_Network name:"
 msgstr "_Ime mreže:"
 
-#: ../src/ap-menu-item.c:87
-#| msgid "Ad-hoc"
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hok"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "obezbedi."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Nisam uspeo da dodam/aktiviram vezu"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Neuspelo povezivanje"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Neuspelo prekidanje veze uređaja"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Neuspelo prekidanje veze"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Neuspelo aktiviranje veze"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Ne prikazuj više ovu poruku"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -224,16 +224,17 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zbog prekida veze u mreži."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, 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:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -244,7 +245,7 @@ msgstr ""
 "Ne mogu da uspostavim VPN vezu „%s“ jer je VPN servis poslao neodgovarajuća "
 "podešavanja."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -253,7 +254,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer je isteklo vreme za povezivanje."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -262,7 +263,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer VPN servis nije pokrenut na vreme."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -271,7 +272,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zato što ne mogu da pokrenem VPN servis."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -280,7 +281,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ jer ne postoje ispravne VPN lozinke."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -289,7 +290,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“ zbog neispravnih VPN lozinki."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -298,7 +299,7 @@ msgstr ""
 "\n"
 "Ne mogu da uspostavim VPN vezu „%s“."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -308,7 +309,7 @@ msgstr ""
 "\n"
 "Prekinuta je VPN veza „%s“ zbog prekida veze u mreži."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -317,7 +318,7 @@ msgstr ""
 "\n"
 "Prekinuta je VPN veza „%s“ zbog isključivanja VPN servisa."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -326,7 +327,7 @@ msgstr ""
 "\n"
 "VPN veza „%s“ je prekinuta."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -337,19 +338,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN veza je uspešno uspostavljena.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Poruka za VPN prijavu"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Nije uspelo povezivanje na VPN"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -363,7 +364,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -376,311 +377,305 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "uređaj nije spreman (nedostaje firmver)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "uređaj nije spreman"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "veza je prekinuta"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Prekini vezu"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "ne mogu da upravljam uređajem"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Nije pronađen nijedan mrežni uređaj"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN veze"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "Po_desi VPN..."
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Prekini VPN vezu"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Upravljač mrežom nije pokrenut..."
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Umrežavanje isključeno"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Uključi _mrežne usluge"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Uključi _bežično mreženje"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Omogući _mobilne veze"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "_Prikaži obaveštenja"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Poda_ci o vezi"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Uredi veze..."
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "Po_moć"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Povezani ste na „%s“."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Mrežna veza je prekinuta."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Pripremam mrežnu vezu „%s“..."
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Potrebna je prijava korisnika za uspostavljanje veze „%s“..."
 
-#: ../src/applet.c:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Zahtevam mrežnu adresu za „%s“..."
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Povezani ste preko veze „%s“"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Uspostavljam VPN vezu „%s“..."
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Potrebna je prijava korisnika za uspostavljanje VPN veze „%s“..."
 
-#: ../src/applet.c:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Zahtevam VPN mrežnu adresu za „%s“..."
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Povezani ste preko VPN veze „%s“"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Nema mrežne veze"
 
-#: ../src/applet.c:3384
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Programče upravnika mreže"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Pogrešan PUK kod, kontaktirajte vašeg provajdera."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 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:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Šaljem kod za otključavanje..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilna veza (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobilna"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Dostupno"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Nova mobilna, širokopojasna veza..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Veza uspostavljena"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Povezani ste mobilnom širokopojasnom mrežom."
 
-#: ../src/applet-device-broadband.c:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobilna širokopojasna mreža."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Sada ste registrovani na kućnu mrežu."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Sada ste registrovani na mrežu prebacivanja."
 
-#: ../src/applet-device-bt.c:93
+#: ../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:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Pripremam mobilnu, širokopojasnu vezu „%s“..."
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Podešavam mobilnu, širokopojasnu vezu „%s“..."
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Povezani ste preko mobilne širokopojasne veze „%s“"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatska žičana veza"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Žičane mreže (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Žičana mreža (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Žičane mreže"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Žičana mreža"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../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:163
+#: ../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:166
+#: ../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:169
+#: ../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:172
+#: ../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:176
+#: ../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:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Potvrđivanje identiteta DSL-a"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Poveži se na _skrivenu bežičnu mrežu..."
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Napravi _novu bežičnu mrežu..."
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ništa)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Bežične mreže (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Bežična mreža (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Bežična mreža"
@@ -688,243 +683,238 @@ msgstr[1] "Bežične mreže"
 msgstr[2] "Bežične mreže"
 msgstr[3] "Žičana mreža"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Bežična mreža je isključena"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 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:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Još mreža"
 
 # bug: no plural forms
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Dostupne su bežične mreže"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 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:1237
+#: ../src/applet-device-wifi.c:1364
 #, 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:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Pripremam bežičnu mrežnu vezu „%s“..."
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, 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:1275
+#: ../src/applet-device-wifi.c:1405
 #, 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:1278
+#: ../src/applet-device-wifi.c:1408
 #, 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:1289
+#: ../src/applet-device-wifi.c:1419
 #, 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:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Povezani ste preko bežične veze „%s“"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Nisam uspeo da aktiviram vezu"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Nisam uspeo da dodam novu vezu"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Greška pri prikazivanju podataka o vezi:"
 
-#: ../src/applet-dialogs.c:75 ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dinamički VEP"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "VPA/VPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
-#| msgid "Addresses"
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Još adresa"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "VEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (osnovno)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Nepoznato"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Nepoznata"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "IP adresa:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Adresa za emitovanje:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Nepoznata"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Mrežna maska:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Žičana mreža (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 bežična (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Opšte"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Uređaj:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Hardverska adresa:"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Drajver:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Brzina:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Bezbednost:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Podrazumevana ruta:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Zanemareno"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN vrsta:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN mrežni prolaz:"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN korisničko ime:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN baner:"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Veza osnove:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Nepoznato"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Nema ispravnih, pokrenutih veza!"
 
-#: ../src/applet-dialogs.c:977
-#| msgid ""
-#| "Copyright © 2004-2011 Red Hat, Inc.\n"
-#| "Copyright © 2005-2008 Novell, Inc.\n"
-#| "and many other community contributors and translators"
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -934,42 +924,42 @@ msgstr ""
 "Autorska prava © 2005-2008 Novel, Doo.\n"
 "i mnogi drugi saradnici zajednice i prevodioci"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 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:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Veb stranica Upravnika mrežom"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Nedostaju resursi"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Lozinka mobilne širokopojasne mreže"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Potrebna je lozinka za povezivanje na „%s“."
 
-#: ../src/applet-dialogs.c:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Potrebno je otključati SIM PIN"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 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:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -977,25 +967,25 @@ msgid ""
 msgstr "Mobilni širokopojasni uređaj „%s“ zahteva SIM PIN kod."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN kôd:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Prikaži PIN kôd"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Potrebno je otključati SIM PUK"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 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:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1003,22 +993,22 @@ msgid ""
 msgstr "Mobilni širokopojasni uređaj „%s“ zahteva SIM PUK kôd."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK kôd:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Novi PIN kôd:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Ponovo unesite PIN kôd:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Prikaži PIN/PUK kôdove"
 
@@ -1059,7 +1049,7 @@ msgstr "_Dodaj"
 #: ../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:697
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Obriši"
 
@@ -1079,7 +1069,8 @@ 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."
 
 # bug: translatable, really?
 #: ../src/connection-editor/ce-new-connection.ui.h:1 ../src/libnma/wifi.ui.h:1
@@ -1160,7 +1151,7 @@ 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:5
-#: ../src/connection-editor/nm-connection-list.c:681
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "_Uređivanje"
 
@@ -1203,7 +1194,6 @@ msgid "Link _down delay:"
 msgstr "Zastoj _razvezivanja:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:23
-#| msgid "Primary DNS:"
 msgid "_Primary:"
 msgstr "_Primarni:"
 
@@ -1212,8 +1202,8 @@ 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."
+"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
@@ -1263,7 +1253,6 @@ msgid "s"
 msgstr "s"
 
 #: ../src/connection-editor/ce-page-bridge.ui.h:10
-#| msgid "Enable _Networking"
 msgid "Enable I_GMP snooping"
 msgstr "Uključi I_GMP njuškanje"
 
@@ -1279,65 +1268,61 @@ msgstr "_Najveće vreme:"
 msgid "_Aging time:"
 msgstr "Vreme _starenja:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatski"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "osnovno"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "nepoznata greška"
 
-#: ../src/connection-editor/ce-page.c:247
-#| msgid "Address"
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "MAC adresa"
 
-#: ../src/connection-editor/ce-page.c:247
-#| msgid "Address"
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "HV adresa"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "neispravno %s za %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:486
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "neispravno %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "neispravan naziv sučelja za %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "neispravan naziv sučelja (%s)"
 
-#: ../src/connection-editor/ce-page.c:487
-#| msgid "Any device"
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "uređaj"
 
-#: ../src/connection-editor/ce-page.c:593
+#: ../src/connection-editor/ce-page.c:591
 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
-#| msgid "Use 802.1_X security for this connection"
 msgid "Use Data Center Bridging (DCB) for this connection"
 msgstr "Koristi premošćavanje centra podataka (DCB) za ovu vezu"
 
@@ -1362,7 +1347,6 @@ msgid "Feature"
 msgstr "Funkcija"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:7
-#| msgid "Enable _Wi-Fi"
 msgid "Enable"
 msgstr "Uključi"
 
@@ -1375,7 +1359,6 @@ msgid "Willing"
 msgstr "Pripravan"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:10
-#| msgid "_Priority:"
 msgid "Priority"
 msgstr "Važnost"
 
@@ -1384,7 +1367,6 @@ msgid "Options..."
 msgstr "Opcije..."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:12
-#| msgid "_Priority:"
 msgid "Priority Groups"
 msgstr "Grupe važnosti"
 
@@ -1441,7 +1423,6 @@ msgstr ""
 "Uključite ili isključite važnost pauze prenosa za svaku korisničku važnost."
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:28
-#| msgid "_Priority:"
 msgid "Priority:"
 msgstr "Važnost:"
 
@@ -1454,17 +1435,14 @@ msgid "1:"
 msgstr "1:"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:31
-#| msgid "2"
 msgid "2:"
 msgstr "2:"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:32
-#| msgid "3"
 msgid "3:"
 msgstr "3:"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:33
-#| msgid "4"
 msgid "4:"
 msgstr "4:"
 
@@ -1489,7 +1467,6 @@ msgid "Strict Bandwidth:"
 msgstr "Izričita pojasna širina:"
 
 #: ../src/connection-editor/ce-page-dcb.ui.h:39
-#| msgid "_Priority:"
 msgid "Priority Bandwidth:"
 msgstr "Pojasna širina važnosti:"
 
@@ -1557,8 +1534,8 @@ 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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1570,8 +1547,8 @@ msgstr "_Lozinka:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Samostalno"
@@ -1627,7 +1604,6 @@ msgstr "_Samougovaranje"
 #: ../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
-#| msgid "_Service:"
 msgid "_Device:"
 msgstr "_Uređaj:"
 
@@ -1651,41 +1627,42 @@ msgid "Wake on LAN:"
 msgstr "Probudi na LAN-u:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:20
-#| msgid "Default"
 msgid "De_fault"
 msgstr "_Osnovno"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr "_Zanemari"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Fizički"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "Za _jednu"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Za _više"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
-#| msgid "Broadcast"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "Za _sve"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_PRA"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "_Magično"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
-#| msgid "_Private key password:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "_Probudi sa LAN lozinkom:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 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."
@@ -1727,8 +1704,8 @@ msgstr "Automatski sa ručnim DNS podešavanjem"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Ručno"
 
@@ -1739,8 +1716,8 @@ 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:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Podeljeno sa ostalim računarima"
 
@@ -1779,15 +1756,15 @@ msgstr "_IB DHCP klijenta:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "Domeni _pretrage:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS serveri:"
 
@@ -1808,8 +1785,8 @@ 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:19
 #: ../src/connection-editor/ce-page-ip6.ui.h:21
@@ -1817,7 +1794,7 @@ msgid "_Routes…"
 msgstr "_Rute…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Isključeno"
 
@@ -1830,9 +1807,6 @@ msgid "Enabled (prefer temporary address)"
 msgstr "Uključeno (prvenstvo privremenoj adresi)"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:17
-#| msgid ""
-#| "IP addresses of domain name servers used to resolve host names. Use "
-#| "commas to separate multiple domain name server addresses."
 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 "
@@ -1855,8 +1829,8 @@ 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-mobile.ui.h:1
 msgid "Basic"
@@ -1948,17 +1922,14 @@ msgid "_JSON config:"
 msgstr "_JSON podešavanje:"
 
 #: ../src/connection-editor/ce-page-team-port.ui.h:2
-#| msgid "Import a saved VPN configuration..."
 msgid "_Import team configuration from a file..."
 msgstr "_Uvezi timsko podešavanje iz datoteke..."
 
 #: ../src/connection-editor/ce-page-team.ui.h:1
-#| msgid "Bonded _connections:"
 msgid "_Teamed connections:"
 msgstr "_Timske veze:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-#| msgid "Import a saved VPN configuration..."
 msgid "Im_port team configuration from a file..."
 msgstr "Uvezi timsko _podešavanje iz datoteke..."
 
@@ -1967,12 +1938,10 @@ msgid "_Parent interface:"
 msgstr "_Roditeljski uređaj:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-#| msgid "VLAN interface _name:"
 msgid "VLAN inter_face name:"
 msgstr "Naziv _VLAN uređaja:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#| msgid "_Cloned MAC address:"
 msgid "Cloned MAC _address:"
 msgstr "_Klonirana MAK adresa:"
 
@@ -2068,7 +2037,7 @@ msgstr "_Opseg:"
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Nema ovlašćenja polkita za obavljanje radnje"
 
@@ -2123,195 +2092,193 @@ 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:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Žičana veza"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Bežična"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:126
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Blutut"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "Infini band"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Veza"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Tim"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Most"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:597 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtuelno"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Uvezi sačuvna VPN podešavanja..."
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 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:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Ne mogu da napravim novu vezu"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Ne mogu da obrišem vezu"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Mrežna maska"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Mrežni prolaz"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrički"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefiks"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Uređujem %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Uređujem neimenovanu vezu"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
-#| msgid "Connection _name:"
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Nedostaje naziv veze"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
-#| msgid "Error initializing editor"
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Pokretanje uređivača..."
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
-#| msgid "Connection add failed"
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "Veza ne može biti izmenjena"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Neispravno podešavanje %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 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:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Sačuvaj"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Sačuvaj sve promene u ovoj vezi."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Ne mogu da napravim vezu"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Ne mogu da uredim vezu"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 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:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Greška u pokretanju uređivača"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Nije uspelo dodavanje veze"
 
@@ -2327,17 +2294,17 @@ msgstr "Ime _veze:"
 msgid "_Export..."
 msgstr "_Izvezi..."
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "nikad"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "sada"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -2346,7 +2313,7 @@ msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 msgstr[3] "pre %d minut"
 
-#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -2355,7 +2322,7 @@ msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 msgstr[3] "pre %d sat"
 
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -2364,7 +2331,7 @@ msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 msgstr[3] "pre %d dan"
 
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -2373,7 +2340,7 @@ msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 msgstr[3] "pre %d mesec"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
@@ -2382,123 +2349,116 @@ msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 msgstr[3] "pre %d godine"
 
-#: ../src/connection-editor/nm-connection-list.c:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Naziv"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Upotrbljena"
 
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Uređuje podatke za izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Prijavite se kako bi izmenili izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Briše izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Prijavite se kako bi obrisali izabranu vezu"
 
-#: ../src/connection-editor/nm-connection-list.c:924
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Nisu instalirani VPN priključci."
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:928
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Greška prilikom stvaranja veze"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Greška prilikom uređivanja veze"
 
-#: ../src/connection-editor/nm-connection-list.c:951
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Bezbednost 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 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:128
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Koristi 802.1_X bezbednost za ovu vezu"
 
-#: ../src/connection-editor/page-bluetooth.c:61
+#: ../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:128
-#| msgid "Could not load ethernet user interface."
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Ne mogu da učitam korisničko sučelje blututa."
 
-#: ../src/connection-editor/page-bluetooth.c:178
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "neispravan blutut uređaj (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:261
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
-#| msgid "Bond connection %d"
 msgid "Bluetooth connection %d"
 msgstr "Blutut veza „%d“"
 
-#: ../src/connection-editor/page-bluetooth.c:305
-#| msgid "Bluetooth"
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Vrsta blututa"
 
-#: ../src/connection-editor/page-bluetooth.c:323
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Izaberite vrstu profila blutut veze."
 
-#: ../src/connection-editor/page-bluetooth.c:328
-#| msgid "Ethernet Network"
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "Mreža _ličnog domena"
 
-#: ../src/connection-editor/page-bluetooth.c:333
-#| msgid "Wi-Fi Network"
-#| msgid_plural "Wi-Fi Networks"
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "Mreža _dvojne parice"
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 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
-#| msgid "Primary DNS:"
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "primarni"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Veza sveze %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Ne mogu da učitam korisničko sučelje mosta."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Veza mosta %d"
@@ -2506,96 +2466,90 @@ 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:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Priključnik mosta"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 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:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
-#| msgid "Could not load DSL user interface."
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Ne mogu da učitam DCB korisničko sučelje."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 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:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL veza „%d“"
 
-#: ../src/connection-editor/page-ethernet.c:77
-#| msgid ""
-#| "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:74
 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 ""
 "Ova opcija dodeljuje ovu vezu mrežnom uređaju koji je određen ili svojim "
-"nazivom ili trajnom MAK adresom ili sa oba.  Npr: „em1“, „3C:97:0E:42:1A:19“"
-", „em1 (3C:97:0E:42:1A:19)“"
+"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:320
+#: ../src/connection-editor/page-ethernet.c:328
 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:447
-#| msgid "Ethernet"
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Uređaj žičane veze"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:744
-#: ../src/connection-editor/page-wifi.c:583
-#| msgid "C_loned MAC address:"
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "kloniran MAK"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Probudi sa LAN lozinkom"
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:55
-#: ../src/libnma/nma-mobile-providers.c:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Podrazumevana"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "Demon mrežne barijere nije pokrenut."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 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:60
+#: ../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\", "
@@ -2603,183 +2557,183 @@ msgid ""
 "(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)\""
 msgstr ""
 "Ova opcija dodeljuje ovu vezu mrežnom uređaju koji je određen ili svojim "
-"nazivom ili trajnom MAK adresom ili sa oba.  Npr: „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)“"
+"nazivom ili trajnom MAK adresom ili sa oba.  Npr: „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:156
+#: ../src/connection-editor/page-infiniband.c:153
 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:219
+#: ../src/connection-editor/page-infiniband.c:216
 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-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Samostalno (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Samo samostalne (VPN) adrese"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automatski, samo adrese"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Samostalno (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Samo samostalne (PPPoE) adrese"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Samostalno (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Samo samostalne (DHCP) adrese"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Samo veži-lokalno"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Dodatni _DNS serveri:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Dodatni domeni _pretrage:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Uređujem IPv4 rute za %s"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 podešavanja"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Ne mogu da učitam IPv4 korisničko sučelje."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "IPv4 adresa „%s“ je neispravna"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "IPv4 mrežna maska adrese „%s“ je neispravna"
 
-#: ../src/connection-editor/page-ip4.c:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "IPv4 mrežni prolaz „%s“ je neispravan"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "IPv4 DNS server „%s“ je neispravan"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Zanemari"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatski, samo DHCP"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Uređujem IPv6 rute za %s"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 podešavanja"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Ne mogu da učitam IPv6 korisničko sučelje."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "IPv6 adresa „%s“ je neispravna"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "IPv4 prefiks „%s“ je neispravan"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "IPv6 mrežni prolaz „%s“ je neispravan"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "IPv5 DNS server „%s“ je neispravan"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Umnoži podređene"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, 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:262
+#: ../src/connection-editor/page-master.c:260
 #, 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:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s podređuje %d"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 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:330
+#: ../src/connection-editor/page-mobile.c:327
 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:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Izaberite vrstu mobilnog širokopojasnog izdavača"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2787,146 +2741,141 @@ msgstr ""
 "Izaberite tehnologiju koju koristi vaš izdavač mobilnih širokopojasnih "
 "usluga.  Ukoliko niste sigurni, pitajte izdavača."
 
-#: ../src/connection-editor/page-mobile.c:564
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "Moj izdavač koristi _GSM tehnologije (npr. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 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:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ništa"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../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:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP podešavanja"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Ne mogu da učitam PPP korisničko sučelje."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "Izaberite datoteku za uvoz"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Greška: datoteka ne sadrži ispravno JSON podešavanje"
 
-#: ../src/connection-editor/page-team.c:272
-#| msgid "Could not load vlan user interface."
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Ne mogu da učitam timsko korisničko sučelje."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
-#| msgid "DSL connection %d"
 msgid "Team connection %d"
 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:154
-#| msgid "Bridge Port"
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Timski priključnik"
 
-#: ../src/connection-editor/page-team-port.c:156
-#| msgid "Could not load bridge port user interface."
+#: ../src/connection-editor/page-team-port.c:153
 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:417
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (putem „%s“)"
 
-#: ../src/connection-editor/page-vlan.c:429
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
-#| msgid "No network connection"
 msgid "New connection..."
 msgstr "Nova veza..."
 
-#: ../src/connection-editor/page-vlan.c:599
+#: ../src/connection-editor/page-vlan.c:596
 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:737
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr "vlan nadređeni"
 
-#: ../src/connection-editor/page-vlan.c:800
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN veza %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Ne mogu da učitam VPN korisničko sučelje."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Ne mogu da nađem uslugu VPN priključka za „%s“."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN veza %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2936,11 +2885,11 @@ msgstr ""
 "\n"
 "Greška: nije izabrana vrsta VPN servisa."
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Izbor vrste VPN veze"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2950,7 +2899,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:80
+#: ../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"
@@ -2958,10 +2907,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:91
-#| msgid ""
-#| "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:88
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"wlan0\", "
@@ -2971,83 +2917,82 @@ 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:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 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:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:579
-#| msgid "Any device"
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Bežični uređaj"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Bežična veza %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "VEP 40/128-bitni ključ"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "Dinamički VEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "Lični VPA & VPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "Poslovni VPA & VPA2"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 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:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Bežična bezbednost"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 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:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "nedostaje SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Bezbednost nije saglasna sa ad-hok režimom"
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Ne mogu da uvezem VPN vezu"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3060,30 +3005,29 @@ msgstr ""
 "\n"
 "Greška: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
-#| msgid "Unknown error"
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "nepoznata greška"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Već postoji datoteka „%s“."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Zameni"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Ne mogu da izvezem VPN vezu"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3094,11 +3038,11 @@ msgstr ""
 "\n"
 "Greška: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Izvezi VPN vezu..."
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3122,32 +3066,32 @@ msgstr "Podaci o vezi"
 msgid "Active Network Connections"
 msgstr "Aktivne veze mreže"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../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:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../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:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3157,31 +3101,31 @@ msgid ""
 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."
+"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:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Neizlistano"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../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:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3194,83 +3138,83 @@ msgstr ""
 "Ukoliko niste sigurni za način plaćanja zatražite APN plan od izdavača "
 "Internet usluge."
 
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../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:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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 iz _spiska:"
 
-#: ../src/libnma/nma-mobile-wizard.c:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Dostavljač"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../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:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../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:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../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:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Instaliran GSM uređaj"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Instaliran CDMS uređaj"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3278,90 +3222,84 @@ msgstr ""
 "Ovaj čarobnjak će vam pomoći da lako podesite mobilnu širokopojasnu vezi sa "
 "3G mrežom."
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../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:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 ""
 "(u nekim slučajevima) vaš plan širokopojasne naplate za APN (Naziv tačke "
 "pristupa)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Napravi vezu za _ovaj mobilni, širokopojasni uređaj:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Nova mobilna, širokopojasna veza"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../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:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../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:55 ../src/libnm-gtk/nm-ui-utils.c:620
-#| msgid "As_k for this password every time"
+#: ../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:56 ../src/libnm-gtk/nm-ui-utils.c:621
-#| msgid "A password is required to connect to '%s'."
+#: ../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:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
-#| msgid "_Password:"
+#: ../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.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
-#| msgid "_Password:"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "_Treća lozinka:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
-#| msgid "Sho_w passwords"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
 msgid "Sh_ow passwords"
 msgstr "Prikaži _lozinke"
 
-#: ../src/libnma/nma-wifi-dialog.c:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
-#| msgid "Disconnect"
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Pritisnite da se povežete"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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"
@@ -3369,55 +3307,55 @@ 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:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Nova..."
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, 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:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Potrebno je potvrđivanje identiteta za bežičnu mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Bežična mreža zahteva potvrđivanje identiteta"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Napravi novu bežičnu mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nova bežična mreža"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Poveži se na skrivenu bežičnu mrežu"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Skrivena bežična mreža"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3437,23 +3375,23 @@ msgstr "_Veza:"
 msgid "Wi-Fi _adapter:"
 msgstr "Bežični _uređaj:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../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:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC mrežica"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3463,17 +3401,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Upotreba:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3481,7 +3419,7 @@ msgstr ""
 "Ovaj program je deo Upravnika mreže (https://wiki.gnome.org/Projects/"
 "NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3489,152 +3427,151 @@ msgstr ""
 "Ovaj program nije namenjen za rad u liniji naredbi, već je deo Gnomovog "
 "radnog okruženja."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "nije omogućeno"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "nije registrovan"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Kućna mreža (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Kućna mreža"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "pretražujem"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registracija je odbijena"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Mreža u romingu (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Mreža u romingu"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "PIN kod za SIM karticu „%s“ na „%s“"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Potreban je PIN kôd"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 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:610
+#: ../src/mobile-helpers.c:619
 #, 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:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "prebacivanje"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s veza"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 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:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "nepoznata greška proveravanja datoteke eap-načina"
 
-#: ../src/wireless-security/eap-method.c:455
-#| msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
 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:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ili PEM uverenja (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "nedostaje EAP-FAST PAC datoteka"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Izaberi PAC datoteku..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC datoteke (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Sve datoteke"
 
@@ -3671,32 +3608,32 @@ msgstr "_Unutrašnja prijava:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Dozvoli samostalno PAC _rezervisanje"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr "nedostaje EAP-LEAP korisničko ime"
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "nedostaje EAP-LEAP lozinka"
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "neispravno EAP-PEAP uverenje izdavača uverenja: %s"
 
-#: ../src/wireless-security/eap-method-peap.c:69
+#: ../src/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "neispravno EAP-PEAP uverenje izdavača uverenja: uverenje nije navedeno"
 
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Izaberite uverenje izdavača uverenja..."
 
@@ -3717,7 +3654,6 @@ msgstr "_Uverenje IU:"
 #: ../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
-#| msgid "Ignore CA certificate"
 msgid "No CA certificate is _required"
 msgstr "Nije potrebno _uverenje"
 
@@ -3725,47 +3661,46 @@ msgstr "Nije potrebno _uverenje"
 msgid "PEAP _version:"
 msgstr "PEAP _izdanje:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "nedostaje EAP korisničko ime"
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "nedostaje EAP lozinka"
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "nedostaje EAP-TLS identitet"
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
-#| msgid "C_A certificate:"
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "neispravno EAP-TLS uverenje izdavača uverenja: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "neispravno EAP-TLS uverenje izdavača uverenja: uverenje nije navedeno"
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "neispravna EAP-TLS lozinka: nedostaje"
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "neispravan EAP-TLS lični ključ: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "neispravno EAP-TLS korisničko uverenje: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Nešifrovani privatni ključevi nisu sigurni"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3773,17 +3708,17 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"Izgleda da izabrani privatni ključ nije zaštićen lozinkom.  Ovo može ugroziti "
-"vaše sigurnosne podatke.  Izaberite privatni ključ koji ze zaštićen "
+"Izgleda da izabrani privatni ključ nije zaštićen lozinkom.  Ovo može "
+"ugroziti vaše sigurnosne podatke.  Izaberite privatni ključ koji ze zaštićen "
 "lozinkom.\n"
 "\n"
 "(Možete zaštititi privatne ključeve koristeći „openssl“)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Izaberite lično uverenje..."
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Izaberite lični ključ..."
 
@@ -3803,36 +3738,36 @@ msgstr "Privatni _ključ:"
 msgid "_Private key password:"
 msgstr "L_ozinka privatnog ključa:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "neispravno EAP-TTLS uverenje izdavača uverenja: %s"
 
-#: ../src/wireless-security/eap-method-ttls.c:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "neispravno EAP-TTLS uverenje izdavača uverenja: uverenje nije navedeno"
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../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:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "LZNK"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "TLS kroz tunel"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Zaštićeni EAP (PEAP)"
 
@@ -3842,11 +3777,11 @@ msgstr "Zaštićeni EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Po_tvrđivanje identiteta:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "nedostaje leap korisničko ime"
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "nedostaje leap lozinka"
 
@@ -3857,13 +3792,15 @@ msgstr "nedostaje vep ključ"
 #: ../src/wireless-security/ws-wep-key.c:113
 #, 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:120
 #, 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:125
 #, c-format
@@ -3871,8 +3808,8 @@ msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
 "(ascii) or 10/26 (hex)"
 msgstr ""
-"neispravan vep ključ: pogrešna dužina ključa %zu. Ključ mora biti ili dužine 5/"
-"13 (askri) ili 10/26 (heks)"
+"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:131
 msgid "invalid wep-key: passphrase must be non-empty"
@@ -3906,7 +3843,7 @@ msgstr "P_rikaži ključ"
 msgid "WEP inde_x:"
 msgstr "VEP _indeks:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3915,7 +3852,7 @@ 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:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 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 "
@@ -3925,6 +3862,9 @@ msgstr ""
 msgid "_Type:"
 msgstr "_Vrsta:"
 
+#~ msgid "_Help"
+#~ msgstr "Po_moć"
+
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "Omogu_ći ViMAH Mobilnu širokopojasnu"
 
@@ -4053,8 +3993,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 8707df44..b65c162d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,20 +10,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManagerApplet\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-02-21 14:00+0000\n"
-"PO-Revision-Date: 2016-02-21 21:23+0100\n"
-"Last-Translator: Josef Andersson <josef.andersson@fripost.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
+"PO-Revision-Date: 2016-03-29 17:59+0200\n"
+"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3132
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Nätverk"
 
@@ -159,7 +158,7 @@ msgstr ""
 "Programmet nm-connection-editor arbetar med Nätverkshanteraren för att skapa "
 "och redigera befintliga profiler för Nätverkshanteraren."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X-autentisering"
 
@@ -181,11 +180,11 @@ msgstr "_Anslut"
 msgid "_Network name:"
 msgstr "_Nätverksnamn:"
 
-#: ../src/ap-menu-item.c:87
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "säker."
 
@@ -194,12 +193,12 @@ msgid "Failed to add/activate connection"
 msgstr "Misslyckades med att lägga till/aktivera anslutningen"
 
 #: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Anslutningsfel"
 
@@ -215,11 +214,11 @@ msgstr "Fel vid frånkoppling"
 msgid "Connection activation failed"
 msgstr "Aktivering av anslutning misslyckades"
 
-#: ../src/applet.c:758 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Visa inte detta meddelandet igen"
 
-#: ../src/applet.c:845
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -230,7 +229,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att nätverksanslutningen "
 "avbröts."
 
-#: ../src/applet.c:848
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -240,7 +239,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att VPN-tjänsten oväntat "
 "stoppades."
 
-#: ../src/applet.c:851
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -251,7 +250,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att VPN-tjänsten svarade med "
 "ogiltig konfiguration."
 
-#: ../src/applet.c:854
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -261,7 +260,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att tidsgränsen för "
 "anslutningsförsöket överstegs."
 
-#: ../src/applet.c:857
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -271,7 +270,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att VPN-tjänsten inte "
 "startade i tid."
 
-#: ../src/applet.c:860
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -281,7 +280,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att VPN-tjänsten misslyckades "
 "med att starta."
 
-#: ../src/applet.c:863
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -291,7 +290,7 @@ msgstr ""
 "VPN-anslutningen ”%s” misslyckades på grund av att det inte fanns några "
 "giltiga VPN-hemligheter."
 
-#: ../src/applet.c:866
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -300,7 +299,7 @@ msgstr ""
 "\n"
 "VPN-anslutningen ”%s” misslyckades på grund av ogiltiga VPN-hemligheter."
 
-#: ../src/applet.c:873
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -309,7 +308,7 @@ msgstr ""
 "\n"
 "VPN-anslutningen ”%s” misslyckades."
 
-#: ../src/applet.c:889
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -320,7 +319,7 @@ msgstr ""
 "VPN-anslutningen ”%s” kopplades från på grund av att nätverksanslutningen "
 "avbröts."
 
-#: ../src/applet.c:892
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -329,7 +328,7 @@ msgstr ""
 "\n"
 "VPN-anslutningen ”%s” kopplades från på grund av att VPN-tjänsten stoppades."
 
-#: ../src/applet.c:898
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -338,7 +337,7 @@ msgstr ""
 "\n"
 "VPN-anslutningen ”%s” kopplades från."
 
-#: ../src/applet.c:928
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -349,19 +348,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:930
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN-anslutningen etablerades.\n"
 
-#: ../src/applet.c:932
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN-inloggningsmeddelande"
 
-#: ../src/applet.c:938 ../src/applet.c:946 ../src/applet.c:987
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN-anslutningen misslyckades"
 
-#: ../src/applet.c:994
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -375,7 +374,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:997
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -388,547 +387,541 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1286
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "enheten är inte redo (fast programvara saknas)"
 
-#: ../src/applet.c:1288
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "enheten är inte redo"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1298 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "frånkopplad"
 
-#: ../src/applet.c:1314
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Koppla från"
 
-#: ../src/applet.c:1328
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "enheten hanteras inte"
 
-#: ../src/applet.c:1398
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Inga nätverksenheter finns tillgängliga"
 
-#: ../src/applet.c:1452
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN-anslutningar"
 
-#: ../src/applet.c:1506
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Konfigurera VPN…"
 
-#: ../src/applet.c:1511
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "Koppla _från VPN"
 
-#: ../src/applet.c:1621
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Nätverkshanteraren är inte igång…"
 
-#: ../src/applet.c:1626 ../src/applet.c:2623
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Nätverk inaktiverat"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1835
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Aktivera _nätverk"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1844
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "A_ktivera trådlöst nätverk"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1853
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Aktivera _mobilt bredband"
 
 #. Toggle notifications item
-#: ../src/applet.c:1865
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Aktivera a_viseringar"
 
 #. 'Connection Information' item
-#: ../src/applet.c:1877
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Anslutnings_information"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:1887
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Redigera anslutningar…"
 
-#. Help item
-#: ../src/applet.c:1902
-msgid "_Help"
-msgstr "_Hjälp"
-
-#. About item
-#: ../src/applet.c:1911
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/applet.c:2192
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Du är nu ansluten till ”%s”."
 
-#: ../src/applet.c:2235
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: ../src/applet.c:2236
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Nätverksanslutningen har kopplats från."
 
-#: ../src/applet.c:2491
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Förbereder nätverksanslutningen ”%s”…"
 
-#: ../src/applet.c:2494
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Användarautentisering krävs för nätverksanslutningen ”%s”…"
 
-#: ../src/applet.c:2497 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:603
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Begär en nätverksadress för ”%s”…"
 
-#: ../src/applet.c:2500
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Nätverksanslutningen ”%s” är aktiv"
 
-#: ../src/applet.c:2574
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Startar VPN-anslutningen ”%s”…"
 
-#: ../src/applet.c:2577
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Användarautentisering krävs för VPN-anslutningen ”%s”…"
 
-#: ../src/applet.c:2580
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Begär en VPN-adress för ”%s”…"
 
-#: ../src/applet.c:2583
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN-anslutningen ”%s” är aktiv"
 
-#: ../src/applet.c:2627
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Ingen nätverksanslutning"
 
-#: ../src/applet.c:3237
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Miniprogram för nätverkshantering"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Felaktig PUK-kod; kontakta din leverantör."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 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:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Skickar upplåsningskod…"
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:511
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobilt bredband (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:104
-#: ../src/connection-editor/page-mobile.c:313
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobilt bredband"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Tillgängliga"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Ny mobil bredbandsanslutning…"
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Anslutning etablerad"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 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:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobilt bredbandsnätverk."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Du är nu registrerad på hemmanätverket."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Du är nu registrerad på ett roaming-nätverk."
 
-#: ../src/applet-device-bt.c:93
+#: ../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:118 ../src/mobile-helpers.c:594
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Förbereder mobila bredbandsanslutningen ”%s”…"
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:597
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Konfigurerar mobila bredbandsanslutningen ”%s”…"
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:600
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:131 ../src/mobile-helpers.c:619
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobila bredbandsanslutningen ”%s” är aktiv"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Automatiskt trådbundet"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Trådbundna nätverk (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Trådbundet nätverk (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Trådbundna nätverk"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Trådbundet nätverk"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../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:163
+#: ../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:166
+#: ../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:169
+#: ../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:172
+#: ../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:176
+#: ../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:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL-autentisering"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Anslut till dolt trådlöst nätverk…"
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Skapa _nytt trådlöst nätverk…"
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Trådlösa nätverk (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Trådlöst nätverk (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 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:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Trådlöst är inaktiverat"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Trådlöst är inaktiverat av hårdvaruväxel"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Fler nätverk"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Trådlösa nätverk tillgängliga"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 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:1237
+#: ../src/applet-device-wifi.c:1364
 #, 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:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Förbereder trådlös nätverksanslutning ”%s”…"
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Konfigurerar trådlös nätverksanslutning ”%s”…"
 
-#: ../src/applet-device-wifi.c:1275
+#: ../src/applet-device-wifi.c:1405
 #, 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:1278
+#: ../src/applet-device-wifi.c:1408
 #, 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:1289
+#: ../src/applet-device-wifi.c:1419
 #, 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:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Trådlös nätverksanslutning ”%s” är aktiv"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Misslyckades med att aktivera anslutningen"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Misslyckades med att lägga till nya anslutningen"
 
-#: ../src/applet-dialogs.c:46
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Fel vid visning av anslutningsinformation:"
 
-#: ../src/applet-dialogs.c:77 ../src/connection-editor/page-wifi-security.c:337
-#: ../src/libnma/nma-wifi-dialog.c:937 ../src/libnm-gtk/nm-wifi-dialog.c:953
-#: ../src/wireless-security/wireless-security.c:454
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:79
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dynamisk WEP"
 
-#: ../src/applet-dialogs.c:81 ../src/applet-dialogs.c:233
-#: ../src/applet-dialogs.c:235
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:156
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Fler adresser"
 
-#: ../src/applet-dialogs.c:231
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:239 ../src/applet-dialogs.c:248
-#: ../src/connection-editor/page-wifi-security.c:288
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/applet-dialogs.c:265
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (standard)"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:336 ../src/applet-dialogs.c:587
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Okänd"
 
 #. Address
-#: ../src/applet-dialogs.c:351 ../src/applet-dialogs.c:373
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../src/applet-dialogs.c:352 ../src/applet-dialogs.c:425
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "IP-adress:"
 
-#: ../src/applet-dialogs.c:374
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Broadcast-adress:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:386
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../src/applet-dialogs.c:387
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Subnätsmask:"
 
-#: ../src/applet-dialogs.c:497
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:500
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:509
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:517 ../src/applet-dialogs.c:804
-#: ../src/connection-editor/page-general.c:353
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Allmänt"
 
-#: ../src/applet-dialogs.c:521
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Gränssnitt:"
 
-#: ../src/applet-dialogs.c:541
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Hårdvaruadress:"
 
 #. Driver
-#: ../src/applet-dialogs.c:555
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Drivrutin:"
 
-#: ../src/applet-dialogs.c:590
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../src/applet-dialogs.c:605
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Säkerhet:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:623 ../src/applet-dialogs.c:845
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:637 ../src/applet-dialogs.c:683
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Standardväg:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:657 ../src/applet-dialogs.c:867
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:666 ../src/applet-dialogs.c:876
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Ignorera"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN-typ:"
 
-#: ../src/applet-dialogs.c:816
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN-gateway:"
 
-#: ../src/applet-dialogs.c:822
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN-användarnamn:"
 
-#: ../src/applet-dialogs.c:828
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN-banner:"
 
-#: ../src/applet-dialogs.c:834
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Basanslutning:"
 
-#: ../src/applet-dialogs.c:836 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Okänd"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:951
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Inga giltiga aktiva anslutningar hittades!"
 
-#: ../src/applet-dialogs.c:979
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -938,44 +931,44 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "och många andra bidragsgivare och översättare"
 
-#: ../src/applet-dialogs.c:982
+#: ../src/applet-dialogs.c:988
 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:984
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Webbplats för Nätverkshanterare"
 
-#: ../src/applet-dialogs.c:999
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Saknar resurser"
 
-#: ../src/applet-dialogs.c:1024
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Nätverkslösenord för mobilt bredband"
 
-#: ../src/applet-dialogs.c:1033
+#: ../src/applet-dialogs.c:1039
 #, 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:1048
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/applet-dialogs.c:1330
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN-upplåsning krävs"
 
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1337
 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:1333
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -984,25 +977,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:1335
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN-kod:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Visa PIN-kod"
 
-#: ../src/applet-dialogs.c:1341
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK-upplåsning krävs"
 
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1348
 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:1344
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1011,22 +1004,22 @@ msgstr ""
 "Mobila bredbandsenheten ”%s” kräver en SIM PUK-kod innan den kan användas."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK-kod:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Ny PIN-kod:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1351
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Ange ny PIN-kod igen:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1356
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Visa PIN/PUK-koder"
 
@@ -1067,7 +1060,7 @@ msgstr "_Lägg till"
 #: ../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:704
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Ta bort"
 
@@ -1168,7 +1161,7 @@ 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:5
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "R_edigera"
 
@@ -1285,58 +1278,58 @@ msgstr "_Maxålder:"
 msgid "_Aging time:"
 msgstr "_Åldringstid:"
 
-#: ../src/connection-editor/ce-page.c:82
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "automatisk"
 
-#: ../src/connection-editor/ce-page.c:90
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:173
-#: ../src/connection-editor/page-wifi.c:177
-#: ../src/connection-editor/page-wifi.c:198
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "standard"
 
-#: ../src/connection-editor/ce-page.c:136
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "ospecificerat fel"
 
-#: ../src/connection-editor/ce-page.c:249
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "MAC-adress"
 
 # placeras i meningen "ogiltig %s...", så liten bokstav
-#: ../src/connection-editor/ce-page.c:249
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "hårdvaruadress"
 
-#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "ogiltig %s för %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:256
-#: ../src/connection-editor/ce-page.c:488
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "ogiltig %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:272
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "ogiltigt gränssnittsnamn för %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:276
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "ogiltigt gränssnittsnamn (%s)"
 
-#: ../src/connection-editor/ce-page.c:489
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "enhet"
 
-#: ../src/connection-editor/ce-page.c:595
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Misslyckades med att uppdatera anslutningens hemligheter på grund av ett "
@@ -1554,8 +1547,8 @@ msgstr "Vi_sa lösenord"
 
 #: ../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:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../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
@@ -1567,8 +1560,8 @@ msgstr "_Lösenord:"
 #: ../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:135
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Automatiskt"
@@ -1652,34 +1645,38 @@ msgid "De_fault"
 msgstr "Stan_dard"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr "_Ignorera"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Fys"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Unicast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "Mul_ticast"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Utsändning"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "_Wake-on-LAN-lösenord"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1723,8 +1720,8 @@ msgstr "Automatisk med manuella DNS-inställningar"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:172
-#: ../src/connection-editor/page-ip6.c:190
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Manuell"
 
@@ -1735,8 +1732,8 @@ 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:192
-#: ../src/connection-editor/page-ip6.c:210
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Delade med andra datorer"
 
@@ -1775,15 +1772,15 @@ msgstr "D_HCP-klient-ID:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:314
-#: ../src/connection-editor/page-ip6.c:312
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "Sökd_omäner:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:305
-#: ../src/connection-editor/page-ip6.c:303
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS-servrar:"
 
@@ -1814,7 +1811,7 @@ msgid "_Routes…"
 msgstr "_Rutter…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:202
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Inaktiverad"
 
@@ -2057,7 +2054,7 @@ msgstr "Ban_d:"
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:79
+#: ../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"
 
@@ -2114,78 +2111,78 @@ msgstr ""
 "autentiseringsmetoder.  Om anslutningar misslyckas så kan du prova att "
 "inaktivera stöd för vissa metoder."
 
-#: ../src/connection-editor/connection-helpers.c:101
-#: ../src/connection-editor/page-ethernet.c:320
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Trådbundet"
 
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-wifi.c:452 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Trådlöst"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-bluetooth.c:128
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-infiniband.c:155
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bond.c:448 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Kombinerad"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-team.c:271 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Grupp"
 
-#: ../src/connection-editor/connection-helpers.c:115
-#: ../src/connection-editor/page-bridge.c:214
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Brygga"
 
-#: ../src/connection-editor/connection-helpers.c:116
-#: ../src/connection-editor/page-vlan.c:599 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:120
-#: ../src/connection-editor/connection-helpers.c:258
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:200
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Hårdvara"
 
-#: ../src/connection-editor/connection-helpers.c:227
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Virtuell"
 
-#: ../src/connection-editor/connection-helpers.c:296
-#: ../src/connection-editor/connection-helpers.c:298
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Importera en sparad VPN-konfiguration…"
 
-#: ../src/connection-editor/connection-helpers.c:327
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2193,76 +2190,76 @@ msgstr ""
 "Anslutningsredigerarens dialogruta kunde inte initieras på grund av ett "
 "okänt fel."
 
-#: ../src/connection-editor/connection-helpers.c:336
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Kunde inte skapa ny anslutning"
 
-#: ../src/connection-editor/connection-helpers.c:473
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Misslyckades med att ta bort anslutning"
 
-#: ../src/connection-editor/connection-helpers.c:521
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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/ip4-routes-dialog.c:807
-#: ../src/connection-editor/ip6-routes-dialog.c:749
-#: ../src/connection-editor/page-ip4.c:1074
-#: ../src/connection-editor/page-ip6.c:1072
+#: ../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
 msgid "Address"
 msgstr "Adress"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:826
-#: ../src/connection-editor/page-ip4.c:1093
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Nätmask"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:845
-#: ../src/connection-editor/ip6-routes-dialog.c:787
-#: ../src/connection-editor/page-ip4.c:1112
-#: ../src/connection-editor/page-ip6.c:1110
+#: ../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
 msgid "Gateway"
 msgstr "Gateway"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:864
-#: ../src/connection-editor/ip6-routes-dialog.c:806
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metric"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:768
-#: ../src/connection-editor/page-ip6.c:1091
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/nm-connection-editor.c:105
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Redigerar %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:109
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Redigerar namnlös anslutning"
 
-#: ../src/connection-editor/nm-connection-editor.c:129
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Saknar anslutningsnamn"
 
-#: ../src/connection-editor/nm-connection-editor.c:192
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Redigerare initieras…"
 
-#: ../src/connection-editor/nm-connection-editor.c:199
-#: ../src/connection-editor/nm-connection-list.c:402
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "Anslutning kan inte ändras"
 
-#: ../src/connection-editor/nm-connection-editor.c:212
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Ogiltig inställning %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:288
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2270,36 +2267,36 @@ msgstr ""
 "Anslutningsredigeraren kunde inte hitta en del nödvändiga resurser (.ui-"
 "filen hittades inte)."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Spara"
 
-#: ../src/connection-editor/nm-connection-editor.c:425
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Spara alla ändringar gjorda för denna anslutning."
 
-#: ../src/connection-editor/nm-connection-editor.c:426
+#: ../src/connection-editor/nm-connection-editor.c:421
 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:442
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Kunde inte skapa anslutning"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Kunde inte redigera anslutningen"
 
-#: ../src/connection-editor/nm-connection-editor.c:444
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Okänt fel vid skapande av anslutningsredigeringsdialog."
 
-#: ../src/connection-editor/nm-connection-editor.c:586
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Fel vid initiering av redigerare"
 
-#: ../src/connection-editor/nm-connection-editor.c:926
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Misslyckades med att lägga till anslutning"
 
@@ -2315,161 +2312,161 @@ msgstr "Anslutnings_namn:"
 msgid "_Export..."
 msgstr "_Exportera…"
 
-#: ../src/connection-editor/nm-connection-list.c:132
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "aldrig"
 
-#: ../src/connection-editor/nm-connection-list.c:143
-#: ../src/connection-editor/nm-connection-list.c:154
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "nu"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:161
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:165
+#: ../src/connection-editor/nm-connection-list.c:160
 #, 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:177
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:183
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:187
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:628
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/connection-editor/nm-connection-list.c:641
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Senast använd"
 
-#: ../src/connection-editor/nm-connection-list.c:689
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Redigera den markerade anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:690
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Autentisera för att redigera den markerade anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Ta bort den markerade anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:706
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Autentisera för att ta bort den markerade anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:934
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Inga VPN-insticksmoduler är installerade."
 
-#: ../src/connection-editor/nm-connection-list.c:936
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:938
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Fel vid skapande av anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:960
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Fel vid redigering av anslutningen"
 
-#: ../src/connection-editor/nm-connection-list.c:961
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "Kunde inte hitta en anslutning med UUID ”%s”"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x-säkerhet"
 
-#: ../src/connection-editor/page-8021x-security.c:116
+#: ../src/connection-editor/page-8021x-security.c:111
 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:130
+#: ../src/connection-editor/page-8021x-security.c:125
 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:63
+#: ../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:130
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Kunde inte läsa in Bluetooth-användargränssnitt."
 
-#: ../src/connection-editor/page-bluetooth.c:180
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
 msgid "invalid Bluetooth device (%s)"
 msgstr "ogiltig Bluetoothenhet (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:263
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth-anslutning %d"
 
-#: ../src/connection-editor/page-bluetooth.c:307
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Bluetooth-typ"
 
-#: ../src/connection-editor/page-bluetooth.c:325
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Välj typen av anslutningsprofil för Bluetooth."
 
-#: ../src/connection-editor/page-bluetooth.c:330
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "_Personal Area Network"
 
-#: ../src/connection-editor/page-bluetooth.c:335
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "_Uppringt nätverk"
 
-#: ../src/connection-editor/page-bond.c:451
+#: ../src/connection-editor/page-bond.c:447
 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:570
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "primär"
 
-#: ../src/connection-editor/page-bond.c:620
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Kombinerad anslutning %d"
 
-#: ../src/connection-editor/page-bridge.c:217
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Kunde inte läsa in brygganvändargränssnitt."
 
-#: ../src/connection-editor/page-bridge.c:314
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Brygganslutning %d"
@@ -2477,32 +2474,32 @@ msgstr "Brygganslutning %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Bryggport"
 
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Kunde inte läsa in bryggportanvändargränssnitt."
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:610
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "Kunde inte läsa in DCB-användargränssnitt."
 
-#: ../src/connection-editor/page-dsl.c:134
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Kunde inte läsa in DSL-användargränssnitt."
 
-#: ../src/connection-editor/page-dsl.c:219
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL-anslutning %d"
 
-#: ../src/connection-editor/page-ethernet.c:79
+#: ../src/connection-editor/page-ethernet.c:74
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"em1\", "
@@ -2512,39 +2509,37 @@ 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:322
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Kunde inte läsa in trådbundet användargränssnitt."
 
-#: ../src/connection-editor/page-ethernet.c:449
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Trådbunden enhet"
 
-#: ../src/connection-editor/page-ethernet.c:453
-#: ../src/connection-editor/page-vlan.c:746
-#: ../src/connection-editor/page-wifi.c:585
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "klonad MAC"
 
-#: ../src/connection-editor/page-ethernet.c:457
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Wake-on-LAN-lösenord"
 
-#: ../src/connection-editor/page-ethernet.c:492
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Trådbunden anslutning %d"
 
 #. TRANSLATORS: Default zone set for firewall, when no zone is selected
-#. Check access method name, APN and type
-#: ../src/connection-editor/page-general.c:57
-#: ../src/libnma/nma-mobile-providers.c:810
-#: ../src/libnm-gtk/nm-mobile-providers.c:810
-#: ../src/libnm-gtk/tests/test-mobile-providers.c:326
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/connection-editor/page-general.c:58
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2554,15 +2549,15 @@ 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:59
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD är inte igång."
 
-#: ../src/connection-editor/page-general.c:356
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Kunde inte läsa in allmänt användargränssnitt."
 
-#: ../src/connection-editor/page-infiniband.c:62
+#: ../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\", "
@@ -2574,152 +2569,152 @@ 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:158
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Kunde inte läsa in InfiniBand-användargränssnitt."
 
-#: ../src/connection-editor/page-infiniband.c:221
+#: ../src/connection-editor/page-infiniband.c:216
 msgid "infiniband device"
 msgstr "infiniband-enhet"
 
-#: ../src/connection-editor/page-infiniband.c:256
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand-anslutning %d"
 
-#: ../src/connection-editor/page-ip4.c:131
-#: ../src/connection-editor/page-ip6.c:135
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Automatisk (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:132
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Endast automatiska (VPN) adresser"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Automatiskt, endast adresser"
 
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:138
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Automatisk (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:139
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Endast automatiska (PPPoE) adresser"
 
-#: ../src/connection-editor/page-ip4.c:141
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Automatisk (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:142
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Endast automatiska (DHCP) adresser"
 
-#: ../src/connection-editor/page-ip4.c:185
-#: ../src/connection-editor/page-ip6.c:203
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Endast lokal länk"
 
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Ytterligare DNS-ser_vrar:"
 
-#: ../src/connection-editor/page-ip4.c:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Ytterligare sökdomän_er:"
 
-#: ../src/connection-editor/page-ip4.c:971
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Redigerar IPv4-rutter för %s"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Inställningar för IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1166
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Kunde inte läsa in IPv4-användargränssnitt."
 
-#: ../src/connection-editor/page-ip4.c:1259
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "IPv4-adressen ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip4.c:1267
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "IPv4-adressnätmasken ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip4.c:1276
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "IPv4-gateway ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip4.c:1319
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "IPv4-DNS-servern ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip6.c:154
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: ../src/connection-editor/page-ip6.c:178
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Automatisk, endast DHCP"
 
-#: ../src/connection-editor/page-ip6.c:970
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Redigerar IPv6-rutter för %s"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Inställningar för IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1163
+#: ../src/connection-editor/page-ip6.c:1157
 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:1254
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "IPv6-adressen ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip6.c:1262
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "IPv6-prefixet ”%s” är ogiltigt"
 
-#: ../src/connection-editor/page-ip6.c:1271
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "IPv4-gateway ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-ip6.c:1313
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "IPv4-DNS-servern ”%s” är ogiltig"
 
-#: ../src/connection-editor/page-master.c:252
-#: ../src/connection-editor/page-master.c:263
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Duplikatslavar"
 
-#: ../src/connection-editor/page-master.c:253
+#: ../src/connection-editor/page-master.c:249
 #, 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:264
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2728,25 +2723,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:389
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slav %d"
 
-#: ../src/connection-editor/page-mobile.c:315
+#: ../src/connection-editor/page-mobile.c:310
 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:332
+#: ../src/connection-editor/page-mobile.c:327
 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:534
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Välj typ av mobil bredbandsleverantör"
 
-#: ../src/connection-editor/page-mobile.c:561
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2754,85 +2749,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:566
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:573
+#: ../src/connection-editor/page-mobile.c:568
 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:583 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:281
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:586 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:279
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:135
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:261
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:306
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-fast.c:283
-#: ../src/wireless-security/eap-method-peap.c:275
-#: ../src/wireless-security/eap-method-ttls.c:291
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:276
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:142
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ingen"
 
-#: ../src/connection-editor/page-ppp.c:202
+#: ../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:285
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Inställningar för PPP"
 
-#: ../src/connection-editor/page-ppp.c:287
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Kunde inte läsa in PPP-användargränssnitt."
 
-#: ../src/connection-editor/page-team.c:102
-#: ../src/connection-editor/page-team-port.c:76
-#: ../src/connection-editor/vpn-helpers.c:170
+#: ../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 "Välj fil att importera"
 
-#: ../src/connection-editor/page-team.c:122
-#: ../src/connection-editor/page-team-port.c:96
+#: ../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"
 msgstr "Fel: fil innehåller inte en giltig JSON-konfiguration"
 
-#: ../src/connection-editor/page-team.c:274
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Kunde inte läsa in gruppanvändargränssnitt."
 
-#: ../src/connection-editor/page-team.c:381
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Gruppanslutning %d"
@@ -2840,56 +2835,56 @@ msgstr "Gruppanslutning %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Grupport"
 
-#: ../src/connection-editor/page-team-port.c:158
+#: ../src/connection-editor/page-team-port.c:153
 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:419
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (via ”%s”)"
 
-#: ../src/connection-editor/page-vlan.c:431
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
 msgid "New connection..."
 msgstr "Ny anslutning…"
 
-#: ../src/connection-editor/page-vlan.c:601
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Kunde inte läsa in vlan-användargränssnitt."
 
-#: ../src/connection-editor/page-vlan.c:739
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr "överordnad vlan"
 
-#: ../src/connection-editor/page-vlan.c:802
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN-anslutning %d"
 
-#: ../src/connection-editor/page-vpn.c:109
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Kunde inte läsa in VPN-användargränssnitt."
 
-#: ../src/connection-editor/page-vpn.c:124
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Kunde inte hitta VPN-insticksmodultjänst för ”%s”."
 
-#: ../src/connection-editor/page-vpn.c:211
-#: ../src/connection-editor/page-vpn.c:306
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN-anslutning %d"
 
-#: ../src/connection-editor/page-vpn.c:235
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2899,11 +2894,11 @@ msgstr ""
 "\n"
 "Fel: ingen VPN-tjänstetyp."
 
-#: ../src/connection-editor/page-vpn.c:260
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Välj en VPN-anslutningstyp"
 
-#: ../src/connection-editor/page-vpn.c:261
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2913,7 +2908,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:82
+#: ../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"
@@ -2922,7 +2917,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:93
+#: ../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\", "
@@ -2932,82 +2927,82 @@ 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:202
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:454
+#: ../src/connection-editor/page-wifi.c:450
 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:575
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:581
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Trådlös enhet"
 
-#: ../src/connection-editor/page-wifi.c:623
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Trådlös anslutning %d"
 
-#: ../src/connection-editor/page-wifi-security.c:314
-#: ../src/libnma/nma-wifi-dialog.c:911 ../src/libnm-gtk/nm-wifi-dialog.c:927
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:324
-#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:936
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:350
-#: ../src/libnma/nma-wifi-dialog.c:950 ../src/libnm-gtk/nm-wifi-dialog.c:966
+#: ../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)"
 msgstr "Dynamisk WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:363
-#: ../src/libnma/nma-wifi-dialog.c:964 ../src/libnm-gtk/nm-wifi-dialog.c:980
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA och WPA2 Personal"
 
-#: ../src/connection-editor/page-wifi-security.c:376
-#: ../src/libnma/nma-wifi-dialog.c:978 ../src/libnm-gtk/nm-wifi-dialog.c:994
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA och WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:418
+#: ../src/connection-editor/page-wifi-security.c:413
 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:429
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Trådlös säkerhet"
 
-#: ../src/connection-editor/page-wifi-security.c:431
+#: ../src/connection-editor/page-wifi-security.c:426
 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:511
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "saknat SSID"
 
-#: ../src/connection-editor/page-wifi-security.c:517
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Säkerhet inte kompatibel med Ad-Hoc-läge"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Kan inte importera VPN-anslutning"
 
-#: ../src/connection-editor/vpn-helpers.c:145
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3020,29 +3015,29 @@ msgstr ""
 "\n"
 "Fel: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:146
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "okänt fel"
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "En fil med namnet ”%s” finns redan."
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: ../src/connection-editor/vpn-helpers.c:224
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:260
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Kan inte exportera VPN-anslutning"
 
-#: ../src/connection-editor/vpn-helpers.c:262
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3053,11 +3048,11 @@ msgstr ""
 "\n"
 "Fel: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:297
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Exportera VPN-anslutning…"
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3081,33 +3076,33 @@ msgstr "Anslutningsinformation"
 msgid "Active Network Connections"
 msgstr "Aktiva nätverksanslutningar"
 
-#: ../src/libnma/nma-mobile-wizard.c:205
-#: ../src/libnm-gtk/nm-mobile-wizard.c:206
+#: ../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 mobila bredbandsanslutning är konfigurerad med följande inställningar:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.c:212
-#: ../src/libnm-gtk/nm-mobile-wizard.c:213
+#: ../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:223
-#: ../src/libnm-gtk/nm-mobile-wizard.c:224
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Din leverantör:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:234
-#: ../src/libnm-gtk/nm-mobile-wizard.c:235
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Din betalningstyp:"
 
-#: ../src/libnma/nma-mobile-wizard.c:255
-#: ../src/libnm-gtk/nm-mobile-wizard.c:256
+#: ../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 "
@@ -3121,28 +3116,28 @@ 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.c:268
-#: ../src/libnm-gtk/nm-mobile-wizard.c:269
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../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-mobile-wizard.c:332
-#: ../src/libnm-gtk/nm-mobile-wizard.c:333
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Inte listad"
 
-#: ../src/libnma/nma-mobile-wizard.c:463
-#: ../src/libnm-gtk/nm-mobile-wizard.c:464
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Välj din betalningstyp:"
 
-#: ../src/libnma/nma-mobile-wizard.c:487
-#: ../src/libnm-gtk/nm-mobile-wizard.c:488
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../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.c:507
-#: ../src/libnm-gtk/nm-mobile-wizard.c:508
+#: ../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"
@@ -3155,83 +3150,83 @@ 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.c:515
-#: ../src/libnm-gtk/nm-mobile-wizard.c:516
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Välj din betalningstyp"
 
-#: ../src/libnma/nma-mobile-wizard.c:564
-#: ../src/libnm-gtk/nm-mobile-wizard.c:565
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../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:717
-#: ../src/libnm-gtk/nm-mobile-wizard.c:718
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../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.c:730
-#: ../src/libnm-gtk/nm-mobile-wizard.c:731
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Leverantör"
 
-#: ../src/libnma/nma-mobile-wizard.c:755
-#: ../src/libnm-gtk/nm-mobile-wizard.c:756
+#: ../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 "Jag kan inte hitta min leverantör och vill ange den _manuellt:"
 
-#: ../src/libnma/nma-mobile-wizard.c:768
-#: ../src/libnm-gtk/nm-mobile-wizard.c:769
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Leverantör:"
 
-#: ../src/libnma/nma-mobile-wizard.c:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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 leverantör använder GSM-tekniken (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:787
-#: ../src/libnm-gtk/nm-mobile-wizard.c:788
+#: ../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 leverantör använder CDMA-tekniken (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.c:798
-#: ../src/libnm-gtk/nm-mobile-wizard.c:799
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Välj din leverantör"
 
-#: ../src/libnma/nma-mobile-wizard.c:1060
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1061
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../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.c:1073
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1074
+#: ../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:1083
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1084
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../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:1133
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1134
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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.c:1190
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1191
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Installerad GSM-enhet"
 
-#: ../src/libnma/nma-mobile-wizard.c:1193
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1194
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Installerad CDMA-enhet"
 
-#: ../src/libnma/nma-mobile-wizard.c:1361
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1362
+#: ../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."
@@ -3239,82 +3234,82 @@ msgstr ""
 "Denna guide hjälper dig att enkelt konfigurera en mobil bredbandsanslutning "
 "till ett mobilt (3G) nätverk."
 
-#: ../src/libnma/nma-mobile-wizard.c:1367
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1368
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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.c:1378
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1379
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../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.c:1384
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1385
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../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.c:1390
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1391
+#: ../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 "(i vissa fall) APN för din betalningstyp (Access Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1419
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1420
+#: ../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 "Skapa en anslutning för _denna mobila bredbandsenhet:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1434
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1435
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Valfri enhet"
 
-#: ../src/libnma/nma-mobile-wizard.c:1447
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1448
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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.c:1620
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1621
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Ny mobil bredbandsanslutning"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
+#: ../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:54 ../src/libnm-gtk/nm-ui-utils.c:619
+#: ../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:55 ../src/libnm-gtk/nm-ui-utils.c:620
+#: ../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:56 ../src/libnm-gtk/nm-ui-utils.c:621
+#: ../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.c:104
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:104
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_Sekundärt lösenord:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:107
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:107
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "_Tertiärt lösenord:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:252
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:252
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
 msgid "Sh_ow passwords"
 msgstr "Visa _lösenord"
 
-#: ../src/libnma/nma-wifi-dialog.c:137 ../src/libnm-gtk/nm-wifi-dialog.c:146
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Klicka för att ansluta"
 
-#: ../src/libnma/nma-wifi-dialog.c:138 ../src/libnm-gtk/nm-wifi-dialog.c:147
+#: ../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"
@@ -3322,20 +3317,20 @@ 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:460 ../src/libnm-gtk/nm-wifi-dialog.c:470
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Ny…"
 
-#: ../src/libnma/nma-wifi-dialog.c:894 ../src/libnm-gtk/nm-wifi-dialog.c:910
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/libnma/nma-wifi-dialog.c:1062 ../src/libnm-gtk/nm-wifi-dialog.c:1080
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "S_kapa"
 
-#: ../src/libnma/nma-wifi-dialog.c:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3343,35 +3338,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:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Autentisering krävs för det trådlösa nätverket"
 
-#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 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:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Skapa nytt trådlöst nätverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Nytt trådlöst nätverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Anslut till dolt trådlöst nätverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1164 ../src/libnm-gtk/nm-wifi-dialog.c:1182
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Dolt trådlöst nätverk"
 
-#: ../src/libnma/nma-wifi-dialog.c:1165 ../src/libnm-gtk/nm-wifi-dialog.c:1183
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3391,23 +3386,23 @@ msgstr "Ans_lutning:"
 msgid "Wi-Fi _adapter:"
 msgstr "Trådlös _adapter:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../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:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC-nätverk"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3417,17 +3412,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:45
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Användning:"
 
-#: ../src/main.c:47
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3435,7 +3430,7 @@ msgstr ""
 "Detta program är en komponent i NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 
-#: ../src/main.c:48
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3443,151 +3438,151 @@ 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:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "inte aktiverad"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "inte registrerad"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Hemnätverk (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Hemnätverk"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "söker"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "registrering nekad"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Roaming-nätverk (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Roaming-nätverk"
 
-#: ../src/mobile-helpers.c:329
+#: ../src/mobile-helpers.c:331
 #, 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:462
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN-kod krävs"
 
-#: ../src/mobile-helpers.c:470
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "PIN-kod behövs för den mobila bredbandsenheten"
 
-#: ../src/mobile-helpers.c:614
+#: ../src/mobile-helpers.c:619
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Mobila bredbandsanslutningen ”%s” är aktiv: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:617
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "roaming"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:184
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s-anslutning"
 
-#: ../src/wireless-security/eap-method.c:61
+#: ../src/wireless-security/eap-method.c:56
 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:260
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "ospecificerat fel vid validering av eap-metodfil"
 
-#: ../src/wireless-security/eap-method.c:457
+#: ../src/wireless-security/eap-method.c:452
 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:460
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER eller PEM-certifikat (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:73
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "saknar PAC-fil för EAP-FAST"
 
-#: ../src/wireless-security/eap-method-fast.c:268
-#: ../src/wireless-security/eap-method-peap.c:305
-#: ../src/wireless-security/eap-method-ttls.c:336
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Välj en PAC-fil…"
 
-#: ../src/wireless-security/eap-method-fast.c:413
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC-filer (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:417
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Alla filer"
 
@@ -3623,32 +3618,32 @@ msgstr "_Inre autentisering:"
 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:63
 msgid "missing EAP-LEAP username"
 msgstr "saknar EAP-LEAP-användarnamn"
 
-#: ../src/wireless-security/eap-method-leap.c:72
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "saknar EAP-LEAP-lösenord"
 
-#: ../src/wireless-security/eap-method-peap.c:66
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "ogiltigt CA-certifikat för EAP-PEAP: %s"
 
-#: ../src/wireless-security/eap-method-peap.c:71
+#: ../src/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "ogiltigt CA-certifikat för EAP-PEAP: inget certifikat angivet"
 
-#: ../src/wireless-security/eap-method-peap.c:290
-#: ../src/wireless-security/eap-method-ttls.c:321
-#: ../src/wireless-security/wireless-security.c:430
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:384
-#: ../src/wireless-security/eap-method-tls.c:484
-#: ../src/wireless-security/eap-method-ttls.c:415
+#: ../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 "Välj ett Certificate Authority-certifikat…"
 
@@ -3676,46 +3671,46 @@ msgstr "Inget CA-certifikat k_rävs"
 msgid "PEAP _version:"
 msgstr "PEAP-_version:"
 
-#: ../src/wireless-security/eap-method-simple.c:75
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "saknar EAP-användarnamn"
 
-#: ../src/wireless-security/eap-method-simple.c:85
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "saknar EAP-lösenord"
 
-#: ../src/wireless-security/eap-method-tls.c:69
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "saknar EAP-TLS-identitet"
 
-#: ../src/wireless-security/eap-method-tls.c:74
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "ogiltigt CA-certifikat för EAP-TLS: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:79
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "ogiltigt CA-certifikat för EAP-TLS: inget certifikat angivet"
 
-#: ../src/wireless-security/eap-method-tls.c:87
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "ogiltigt EAP-TLS-lösenord: saknas"
 
-#: ../src/wireless-security/eap-method-tls.c:97
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "ogiltig privat nyckel för EAP-TLS: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:104
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "ogiltigt EAP-TLS-användarcertifikat: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:299
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Okrypterade privata nycklar är inte säkra"
 
-#: ../src/wireless-security/eap-method-tls.c:302
+#: ../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 "
@@ -3729,11 +3724,11 @@ msgstr ""
 "\n"
 "(Du kan lösenordsskydda din privata nyckel med openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:478
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Välj ditt personliga certifikat…"
 
-#: ../src/wireless-security/eap-method-tls.c:490
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Välj din privata nyckel…"
 
@@ -3753,36 +3748,36 @@ msgstr "Privat _nyckel:"
 msgid "_Private key password:"
 msgstr "Lösenord för _privat nyckel:"
 
-#: ../src/wireless-security/eap-method-ttls.c:66
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "ogiltigt CA-certifikat för EAP-TTLS: %s"
 
-#: ../src/wireless-security/eap-method-ttls.c:71
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "ogiltigt CA-certifikat för EAP-TTLS: inget certifikat angivet"
 
-#: ../src/wireless-security/wireless-security.c:78
+#: ../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:442
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:466
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:477
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:488
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunnlad TLS"
 
-#: ../src/wireless-security/wireless-security.c:499
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Protected EAP (PEAP)"
 
@@ -3792,26 +3787,26 @@ msgstr "Protected EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Au_tentisering:"
 
-#: ../src/wireless-security/ws-leap.c:64
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "saknar leap-användarnamn"
 
-#: ../src/wireless-security/ws-leap.c:72
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "saknar leap-lösenord"
 
-#: ../src/wireless-security/ws-wep-key.c:109
+#: ../src/wireless-security/ws-wep-key.c:105
 msgid "missing wep-key"
 msgstr "saknar wep-nyckel"
 
-#: ../src/wireless-security/ws-wep-key.c:117
+#: ../src/wireless-security/ws-wep-key.c:113
 #, 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:124
+#: ../src/wireless-security/ws-wep-key.c:120
 #, c-format
 msgid ""
 "invalid wep-key: key with a length of %zu must contain only ascii characters"
@@ -3819,7 +3814,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:129
+#: ../src/wireless-security/ws-wep-key.c:125
 #, c-format
 msgid ""
 "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 "
@@ -3828,11 +3823,11 @@ 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:135
+#: ../src/wireless-security/ws-wep-key.c:131
 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:137
+#: ../src/wireless-security/ws-wep-key.c:133
 msgid "invalid wep-key: passphrase must be shorter than 64 characters"
 msgstr "ogiltig wep-nyckel: lösenfras måste vara kortare än 64 tecken"
 
@@ -3860,7 +3855,7 @@ msgstr "Vis_a nyckel"
 msgid "WEP inde_x:"
 msgstr "WEP-inde_x:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:72
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3869,7 +3864,7 @@ 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:80
+#: ../src/wireless-security/ws-wpa-psk.c:77
 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"
 
@@ -3877,6 +3872,9 @@ msgstr "ogiltig wpa-psk: kan inte tolka nyckel med 64 byte som hexadecimal"
 msgid "_Type:"
 msgstr "_Typ:"
 
+#~ msgid "_Help"
+#~ msgstr "_Hjälp"
+
 #~ msgid "bdaddr"
 #~ msgstr "bdaddr"
 
diff --git a/po/ta.po b/po/ta.po
index c0bd2a2c..b16c34d0 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet.master.ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-27 12:15+0530\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -19,8 +19,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\\n"
-"\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\\n\n"
 "\n"
 "\n"
 "\n"
@@ -30,652 +29,919 @@ msgstr ""
 "\n"
 "X-Generator: Lokalize 1.1\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+msgid "Network"
+msgstr "பிணையம்"
+
+#: ../nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr "உங்களது பிணையத்தின் இணைப்புகளை மேலாண்மை செய்க"
 
-#: ../nm-applet.desktop.in.h:2
-msgid "Network"
-msgstr "பிணையம்"
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "பிணைய இணைப்புகள்"
 
-#: ../nm-applet.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr "செயல்நீக்க WiFiஐ உருவாக்கு"
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "உங்களின் பிணைய இணைப்பு அமைவுகளை மேலாண்மை மற்றும் மாற்றவும்"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "செயல்படுத்தாத இணைக்கப்பட்ட அறிவிப்புகள்"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, 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
 msgid "Disable disconnected notifications"
 msgstr "செயல்படுத்தாத இணைக்கப்படாத அறிவிப்புகள்"
 
-#: ../nm-applet.schemas.in.h:4
-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:4
+#, 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."
 
-#: ../nm-applet.schemas.in.h:5
-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
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "செயல்படுத்தாத இணைக்கப்பட்ட அறிவிப்புகள்"
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"Set this to TRUE to disable notifications when disconnecting from a network."
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "கிடைக்கக்கூடிய அறிவிப்புகளின் பிணையத்தை குறைக்கிறது"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Set this to TRUE to disable notifications when wireless networks are "
 "available."
 
-#: ../nm-applet.schemas.in.h:7
-msgid "Set to TRUE to disable creation of adhoc networks when using the applet."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr "முத்திரை"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+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 WiFi Create"
+msgstr "செயல்நீக்க WiFiஐ உருவாக்கு"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "அப்லெட்டைப் பயன்படுத்தும் போது சரி என்பதற்கு செயல்நீக்க உருவாக்கமான  adhoc பிணையங்களை "
 "அமைக்கவும்."
 
-#: ../nm-applet.schemas.in.h:8
-msgid "Stamp"
-msgstr "முத்திரை"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
-msgstr "கிடைக்கக்கூடிய அறிவிப்புகளின் பிணையத்தை குறைக்கிறது"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
 
-#: ../nm-applet.schemas.in.h:10
-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:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "CA சான்றிதழை தேர்ந்தெடுக்கவும்"
 
-#: ../nm-connection-editor.desktop.in.h:1
-msgid "Manage and change your network connection settings"
-msgstr "உங்களின் பிணைய இணைப்பு அமைவுகளை மேலாண்மை மற்றும் மாற்றவும்"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-msgid "Network Connections"
-msgstr "பிணைய இணைப்புகள்"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:875 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "கிடைக்கக்கூடி"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "பிணைய மேலாளர்"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "பிணைய மேலாளர்"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "இணை (_o)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "பிணைய பெயர் (_N):"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "தற்காலிக"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "பான் (PAN) இணைப்பை உருவாக்க முடியவில்லை: %s"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "தெரியாத"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "இணைப்பை சேர்க்க முடியவில்லை"
+
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "துணைடிக்கப்பட்டது"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "துண்டிக்கபட்டது"
+
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "இணைப்பை சேர்க்க முடியவில்லை"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "இந்த செய்தியை மீண்டும் காட்டாதே"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "நீங்கள் இப்போது '%s'உடன் இணைப்படுகிறார்கள்."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் பிணைய இணைப்பு தடங்கல் செய்கிறது."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1278 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "இணைப்பு ஸ்தாபிக்கப்படுகிறது"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் VPN சேவை எதிர்பாரமல் நிறுத்தப்பட்டது."
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "இப்போது மொபைல் ப்ராட்பேண்ட் பிணையத்தோடு இணைக்கப்படுகிறது."
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "Preparing mobile broadband connection '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "கட்டமைக்கப்பட்ட மொபைல் பிராட்பேண்டுஇணைப்பு '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் VPN சேவை நேரத்திற்கு துவக்கவில்லை."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "'%s'ன் மொபைல் பிராட்பேண்டு இணைப்புக்கு பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் VPN சேவை துவக்கவில்லை."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2479
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "ஒரு பிணைய முகவரி '%s'காக தேவைப்படுகிறது..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் அங்கே சரியான VPNரகசியங்கள் இல்லை.."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "மொபைல் பிராட்பேண்டு இணைப்பு '%s' செயல்பாட்டிலுள்ளது"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் தவறான VPN ரகசியங்கள்."
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s' தோல்வியுற்றது."
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
-#: ../src/applet-dialogs.c:430
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "மொபைல் பிராட்பேண்டு (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s' துண்டிக்கப்பட்டது ஏனெனில் பிணைய இணைப்பில் தடங்கல் ஏற்பட்டது."
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-#: ../src/connection-editor/nm-connection-list.c:1511
-msgid "Mobile Broadband"
-msgstr "மொபைல் பிராட்பேண்டு"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s' VPN சேவை நிறுத்தப்பட்டதால் துண்டிக்கப்பட்டது."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "புதிய மொபைல் பிராட்பேண்டு (CDMA) இணைப்பு..."
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s' துண்டிக்கப்படுட்டது."
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "இப்போது நீங்கள் CDMA பிணையத்தோடு இணைக்கப்பட்டுள்ளீர்கள்."
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "VPN உட்புகும் செய்தி"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "VPN இணைப்பு தோல்வியுற்றது"
+
+#: ../src/applet.c:990
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "மொபைல் பிராட்பேண்டு இணைப்பு '%s' செயல்பாட்டிலுள்ளது : (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் VPN சேவை துவங்குவதில் தோல்வி.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "ரோமிங் "
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN இணைப்பு '%s'ஐ துவக்க முடியவில்லை.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-msgid "CDMA network."
-msgstr "சிடிஎம்ஏ வலைப்பின்னல்"
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "சாதனம் தயாராக இல்லை (தளநிரல் இல்லை)"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
-msgid "You are now registered on the home network."
-msgstr "இப்போது நீங்கள் வீட்டு வலைப்பின்னலுடன் பதிவு செய்யப்படுகிறீர்கள்"
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "சாதனம் தயாராக இல்லை"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
-msgid "You are now registered on a roaming network."
-msgstr "இப்போது நீங்கள்  அலையும் வலைப்பின்னலுடன் பதிவு செய்யப்படுகிறீர்கள்."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "துணைடிக்கப்பட்டது"
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "ஜிஎஸ்எம்(GSM)"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "துண்டி"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:459
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "புதிய மொபைல் பிராட்பேண்டு (GSM) இணைப்பு..."
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "சாதனம் மேலாண்மை செய்யப்படவில்லை"
 
-#: ../src/applet-device-gsm.c:493
-msgid "You are now connected to the GSM network."
-msgstr "இப்போது நீங்கள் GSM பிணையத்தோடு இணைக்கப்படுகிறது."
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "பிணைய சாதனம் கிடைக்கப்பெறவில்லை"
 
-#: ../src/applet-device-gsm.c:654
-msgid "PIN code required"
-msgstr "PIN குறியீடு தேவைப்படுகிறது"
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "_VPN இணைப்புகள்"
 
-#: ../src/applet-device-gsm.c:662
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "PIN குறியீடு மொபைல் பிராட்பேண்டு சாதனத்திற்கு தேவைப்படுகிறது"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr " VPNஐ கட்டமைக்கவும் (_C)..."
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "VPNஐ துணைடிக்கவும் (_D)"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "பிணைய மேலாளர் இயக்கத்தில் இல்லை..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "பிணைய செயல்நீக்கப்பட்டது"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "பிணையம் செயல்படுகிறது (_N)"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "ஒயர்லெஸ் செயல்படுகிறது (_W)"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "மொபைல் பிராட்பேண்டை செயற்படுத்தவும் (_M)"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "அறிவிப்புகளை செயற்படுத்தவும் (_o)"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "இணைப்பு தகவல் (_I)"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "இணைப்புகளை திருத்தவும்..."
 
-#: ../src/applet-device-gsm.c:783
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "பற்றி (_A)"
+
+#: ../src/applet.c:2179
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "சிம் கார்ட் '%s' ( '%s' இல்) க்கு PIN கோட்"
+msgid "You are now connected to '%s'."
+msgstr "நீங்கள் இப்போது '%s'உடன் இணைப்படுகிறார்கள்."
 
-#: ../src/applet-device-gsm.c:875
-msgid "Wrong PIN code; please contact your provider."
-msgstr "தவறான PIN குறியீடு; உங்கள் வழங்கியை தொடர்பு கொள்ளவும்."
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "துண்டிக்கபட்டது"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "பிணைய இணைப்பு துண்டிக்கப்படும்."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "பிணைய இணைப்பு '%s' தயாராகிறது..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "பிணைய இணைப்பு '%s'காக பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "ஒரு பிணைய முகவரி '%s'காக தேவைப்படுகிறது..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "பிணைய இணைப்பு '%s' செயல்படுகிறது"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "VPN இணைப்பு '%s'துவங்குகிறது..."
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN இணைப்பு '%s'காக பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "'%s'காக ஒரு VPN முகவரி தேவைப்படுகிறது..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN இணைப்பு '%s' செயல்படுகிறது"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "பிணைய இணைப்பு இல்லை"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "பிணைய மேலாளர் அப்லெட்"
+
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "தவறான PUK குறியீடு; உங்கள் வழங்கியை தொடர்பு கொள்ளவும்."
 
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "தவறான PIN குறியீடு; உங்கள் வழங்கியை தொடர்பு கொள்ளவும்."
+
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:925
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "பூட்டுநீக்கிய குறியீட்டை அனுப்புகிறது..."
 
-#: ../src/applet-device-gsm.c:988
-msgid "SIM PIN unlock required"
-msgstr "SIM PIN பூட்டைநீக்க தேவைப்படுகிறது"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "மொபைல் பிராட்பேண்டு (%s)"
 
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN Unlock Required"
-msgstr "SIM PIN பூட்டைநீக்க தேவைப்படுகிறது"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "மொபைல் பிராட்பேண்டு"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"பயன்படுத்தும் முன் மொபைல் ப்ராட்பாண்ட் சாதனம் '%s'க்கு ஒரு SIM PIN குறியீடு "
-"தேவைப்படுகிறது."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "கிடைக்கக்கூடி"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
-msgid "PIN code:"
-msgstr "PIN குறியீடு:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "புதிய மொபைல் பிராட்பேண்டு இணைப்பு"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
-msgid "Show PIN code"
-msgstr "PIN குறியீடு காட்டவும்:"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "இணைப்பு ஸ்தாபிக்கப்படுகிறது"
 
-#: ../src/applet-device-gsm.c:1000
-msgid "SIM PUK unlock required"
-msgstr "SIM PUK பூட்டைநீக்க தேவைப்படுகிறது"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "இப்போது மொபைல் ப்ராட்பேண்ட் பிணையத்தோடு இணைக்கப்படுகிறது."
 
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK Unlock Required"
-msgstr "SIM PUK பூட்டுநீக்க தேவைப்படுகிறது"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "மொபைல் பிராட்பேண்டு பிணையத்தின் கடவுச்சொல்"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"பயன்படுத்தும் முன் மொபைல் ப்ராட்பாண்ட் சாதனம் '%s'க்கு ஒரு SIM PUK குறியீடு "
-"தேவைப்படுகிறது."
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "இப்போது நீங்கள் வீட்டு வலைப்பின்னலுடன் பதிவு செய்யப்படுகிறீர்கள்"
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
-msgid "PUK code:"
-msgstr "PUK குறியீடு:"
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "இப்போது நீங்கள்  அலையும் வலைப்பின்னலுடன் பதிவு செய்யப்படுகிறீர்கள்."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "New PIN code:"
-msgstr "புதிய PIN குறியீடு:"
+#: ../src/applet-device-bt.c:88
+msgid "You are now connected to the mobile broadband network."
+msgstr "இப்போது மொபைல் ப்ராட்பேண்ட் பிணையத்தோடு இணைக்கப்படுகிறது."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
-msgid "Re-enter new PIN code:"
-msgstr "புதிய PIN குறியீட்டை மீண்டும்-உள்ளிடவும்:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "Preparing mobile broadband connection '%s'..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
-msgid "Show PIN/PUK codes"
-msgstr "PIN /PUK குறியீடு காட்டவும்:"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "கட்டமைக்கப்பட்ட மொபைல் பிராட்பேண்டுஇணைப்பு '%s'..."
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
-msgid "GSM network."
-msgstr "ஜிஎஸ்எம் வலைப்பின்னல்"
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "'%s'ன் மொபைல் பிராட்பேண்டு இணைப்புக்கு பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "மொபைல் பிராட்பேண்டு இணைப்பு '%s' செயல்பாட்டிலுள்ளது"
+
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "தானியக்கி ஈதர்நெட்"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "ஒயர்டு பிணையங்கள் (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "ஒயர்டு பிணையம் (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "ஒயர்டு பிணையங்கள்"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "ஒயர்டு பிணையம்"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1485
-msgid "disconnected"
-msgstr "துணைடிக்கப்பட்டது"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "இப்போது ஒயர்டு பிணையத்தோடு இணைக்கப்படுகிறது."
 
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "ஒயர்டு பிணைய இணைப்பிற்கு '%s' தயாராகிறது..."
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "கட்டமைக்கப்பட்ட ஒயர்டு பிணைய இணைப்பு '%s'..."
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "'%s'ன் ஒயர்டு பிணைய இணைப்புக்கு பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
 
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s'காக ஒரு ஒயர்டு பிணைய முகவரி தேவைப்படுகிறது..."
 
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "ஒயர்டு பிணைய இணைப்பு '%s' செயலிபடுகிறது"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL அங்கீகாரம்"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்துடன் இணைக்கவும் (_C)..."
 
-#: ../src/applet-device-wifi.c:150
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "புதிய ஒயர்லெஸ்பிணையத்தை உருவாக்கவும் (_N)..."
 
-#: ../src/applet-device-wifi.c:294
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ஒன்றுமில்லை)"
 
-#: ../src/applet-device-wifi.c:803
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "ஒயர்லெஸ் பிணையங்கள் (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "ஒயர்டு பிணையங்கள் (%s)"
 
-#: ../src/applet-device-wifi.c:805
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "ஒயர்லெஸ் பிணையங்கள் (%s)"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "ஒயர்டு பிணையம் (%s)"
 
-#: ../src/applet-device-wifi.c:807
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "ஒயர்லெஸ் பிணையங்கள்ஒயர்லெஸ் பிணையங்கள்ஒயர்லெஸ் பிணையங்கள்"
-msgstr[1] "ஒயர்லெஸ் பிணையம்"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "ஒயர்டு பிணையம்"
+msgstr[1] "ஒயர்டு பிணையம்"
 
-#: ../src/applet-device-wifi.c:840
-msgid "wireless is disabled"
-msgstr "ஒயர்லெஸை செயல்நீக்கு"
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "வைமாக்ஸ்  ஐ செயல்நீக்கு"
 
-#: ../src/applet-device-wifi.c:841
-msgid "wireless is disabled by hardware switch"
-msgstr "ஒயர்லெஸ் வன்பொருள் மாற்றியால் செயல்நீக்கப்பட்டது"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "வன்பொருள் மாற்றியால் வைமாக்ஸ் செயல்நீக்கப்பட்டது"
 
-#: ../src/applet-device-wifi.c:902
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "நிறைய பிணையங்கள்"
 
-#: ../src/applet-device-wifi.c:1081
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "ஒயர்லெஸ் பிணையங்கள் இருக்கிறது"
 
-#: ../src/applet-device-wifi.c:1082
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ஒரு ஒயர்லெஸ் பிணையத்தை இணைப்பதற்கு இந்த பிணைய பட்டியை பயன்படுத்துக"
 
-#: ../src/applet-device-wifi.c:1085 ../src/applet.c:901
-msgid "Don't show this message again"
-msgstr "இந்த செய்தியை மீண்டும் காட்டாதே"
-
-#: ../src/applet-device-wifi.c:1277
+#: ../src/applet-device-wifi.c:1364
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "'%s' ஒயர்லெஸ் பிணையத்தோடு இப்போது நீங்கள் இணைக்கப்படுகிறீர்கள்."
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "இப்போது நீங்கள் Wi-Fi பிணையம் '%s' உடன் இணைக்கப்பட்டுள்ளீர்கள்."
 
-#: ../src/applet-device-wifi.c:1308
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "'%s'காக ஒயர்லெஸ் பிணையம் தயாராகிறதுடுகிறது..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "பிணைய இணைப்பு '%s' தயாராகிறது..."
 
-#: ../src/applet-device-wifi.c:1311
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "'%s' ஒயர்லெஸ் பிணைய இணைப்பு கட்டமைக்கிறது..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "கட்டமைக்கப்பட்ட ஒயர்டு பிணைய இணைப்பு '%s'..."
 
-#: ../src/applet-device-wifi.c:1314
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "'%s'ன் ஒயர்லெஸ் பிணைய இணைப்புக்கு பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
 
-#: ../src/applet-device-wifi.c:1317
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "'%s'காக ஒரு ஒயர்லெஸ் பிணைய முகவரி தேவைப்படுகிறது..."
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "ஒரு பிணைய முகவரி '%s'காக தேவைப்படுகிறது..."
 
-#: ../src/applet-device-wifi.c:1338
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "ஒயர்லெஸ் பிணைய இணைப்பு '%s' செயல்படுகிறது: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1343
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "ஒயர்லெஸ் பிணைய இணைப்பு '%s' செயல்படுகிறது"
-
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "வைமாக்ஸ் மொபைல் அகலப்பட்டை(%s)"
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr "வைமாக்ஸ் மொபைல் அகலப்பட்டை"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "வைமாக்ஸ்  ஐ செயல்நீக்கு"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "ஒயர்டு பிணைய இணைப்பு '%s' செயலிபடுகிறது"
 
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "வன்பொருள் மாற்றியால் வைமாக்ஸ் செயல்நீக்கப்பட்டது"
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "பான் (PAN) இணைப்பை உருவாக்க முடியவில்லை: %s"
 
-#: ../src/applet-device-wimax.c:428
-msgid "You are now connected to the WiMAX network."
-msgstr "இப்போது நீங்கள் வைமாக்ஸ்  பிணையத்தோடு இணைக்கப்பட்டுள்ளீர்கள்."
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "புதிய இணைப்பை திருத்த முடியவில்லை"
 
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "பிழை காட்டும் இணைப்பு தகவல்:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:285
-#: ../src/libnm-gtk/nm-wireless-dialog.c:949
-#: ../src/wireless-security/wireless-security.c:397
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "மாறும்           WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:246
-#: ../src/applet-dialogs.c:248
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:244
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "முகவரிகள்"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:252 ../src/applet-dialogs.c:261
-#: ../src/connection-editor/page-wireless-security.c:239
-#: ../src/libnm-gtk/nm-wireless-dialog.c:906
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ஒன்றுமில்லை"
 
-#: ../src/applet-dialogs.c:352 ../src/applet-dialogs.c:490
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "1 (முன்னிருப்பு)"
+
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:354 ../src/applet-dialogs.c:492
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: ../src/applet-dialogs.c:367
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "தெரியாத"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP முகவரி:"
 
 #: ../src/applet-dialogs.c:369
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "தெரியாத"
+msgid "Broadcast Address:"
+msgstr "ஒளிப்பரப்பு முகவரி:"
 
+#. Prefix
 #: ../src/applet-dialogs.c:381
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
+msgctxt "Subnet Mask"
+msgid "Unknown"
 msgstr "தெரியாத"
 
-#: ../src/applet-dialogs.c:416
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "துணை இணைய மறைப்பு:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ஈதர்நெட் (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:426
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:428
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:432
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "வைமாக்ஸ் (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:438 ../src/applet-dialogs.c:797
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "பொதுவான"
 
-#: ../src/applet-dialogs.c:442
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "முகப்பு:"
 
-#: ../src/applet-dialogs.c:458
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "வன்பொருள் முகவரி:"
 
 #. Driver
-#: ../src/applet-dialogs.c:466
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "இயக்கி:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "வேகம்:"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "பாதுகாப்பு:"
 
-#: ../src/applet-dialogs.c:518
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:531
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:548
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "ஐபிவி4"
 
-#. Address
-#: ../src/applet-dialogs.c:559 ../src/applet-dialogs.c:666
-msgid "IP Address:"
-msgstr "IP முகவரி:"
-
-#: ../src/applet-dialogs.c:561 ../src/applet-dialogs.c:577
-msgctxt "Address"
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#: ../src/applet-dialogs.c:575
-msgid "Broadcast Address:"
-msgstr "ஒளிப்பரப்பு முகவரி:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:584
-msgid "Subnet Mask:"
-msgstr "துணை இணைய மறைப்பு:"
-
-#: ../src/applet-dialogs.c:586
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#: ../src/applet-dialogs.c:594 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "முன்னிருப்பு வழி:"
 
-#: ../src/applet-dialogs.c:606
-msgid "Primary DNS:"
-msgstr "முதன்மை DNS:"
-
-#: ../src/applet-dialogs.c:615
-msgid "Secondary DNS:"
-msgstr "இரண்டாவது DNS:"
-
-#: ../src/applet-dialogs.c:625
-msgid "Ternary DNS:"
-msgstr "மூன்றாவது DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "ஐபிவி 6"
 
-#: ../src/applet-dialogs.c:649
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "உதாசீனம் செய்யப்பட்டது"
 
-#: ../src/applet-dialogs.c:802
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "விபிஎன் வகை:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "விபிஎன் நுழைவாயில்:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "விபிஎன் பயனர் பெயர்:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "விபிஎன் அறிவிப்பு பலகை:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "அடிப்படை இணைப்பு:"
 
-#: ../src/applet-dialogs.c:829
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "தெரியாத"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:892
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "சரியான செயல்பாட்டிலுள்ள இணைப்புகள் காணப்படுவில்லை!"
 
-#: ../src/applet-dialogs.c:945
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -683,475 +949,828 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "மேலும் பல சமுதாய பங்களிப்பாளர்கள் மொழி பெயர்ப்பாளர்கள்"
 
-#: ../src/applet-dialogs.c:948
-msgid "Notification area applet for managing your network devices and connections."
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
 msgstr "உங்கள் பிணைய சாதனங்கள் மற்றும் இணைப்புகளை நிர்வகிக்கும் அறிவிப்பு பகுதி ஆப்லெட்"
 
-#: ../src/applet-dialogs.c:950
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "பிணைய மேலாளர் இணையத்தளம்"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "விடிபட்ட மூலங்கள்"
 
-#: ../src/applet-dialogs.c:990
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "மொபைல் பிராட்பேண்டு பிணையத்தின் கடவுச்சொல்"
 
-#: ../src/applet-dialogs.c:999
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s'ஐ இணைப்பதற்கு ஒரு கடவுச்சொல் தேவைப்படுகிறது."
 
-#: ../src/applet-dialogs.c:1018
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "கடவுச்சொல்:"
 
-#: ../src/applet.c:990
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "SIM PIN பூட்டைநீக்க தேவைப்படுகிறது"
+
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "SIM PIN பூட்டைநீக்க தேவைப்படுகிறது"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் பிணைய இணைப்பு தடங்கல் செய்கிறது."
+"பயன்படுத்தும் முன் மொபைல் ப்ராட்பாண்ட் சாதனம் '%s'க்கு ஒரு SIM PIN குறியீடு "
+"தேவைப்படுகிறது."
 
-#: ../src/applet.c:993
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "PIN குறியீடு:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "PIN குறியீடு காட்டவும்:"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "SIM PUK பூட்டைநீக்க தேவைப்படுகிறது"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "SIM PUK பூட்டுநீக்க தேவைப்படுகிறது"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் VPN சேவை எதிர்பாரமல் நிறுத்தப்பட்டது."
+"பயன்படுத்தும் முன் மொபைல் ப்ராட்பாண்ட் சாதனம் '%s'க்கு ஒரு SIM PUK குறியீடு "
+"தேவைப்படுகிறது."
 
-#: ../src/applet.c:996
-#, c-format
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "PUK குறியீடு:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "புதிய PIN குறியீடு:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "புதிய PIN குறியீட்டை மீண்டும்-உள்ளிடவும்:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
+
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"IP பிணையத்தில் உங்களது கணினி முகவரிகள் அடையாளம்.  \"Add\" பட்டனுடன் சேர்த்துஒரு IP "
+"முகவரியை கிளிக் செய்யவும்."
 
-#: ../src/applet.c:999
-#, c-format
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_D அழி"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"பெறமுடிந்தால், முன்னிருப்பு பிணைய இணைப்புக்கு இந்த இணைப்பை ஒருபோதும்  பயன்படுத்த "
+"முடியாது."
 
-#: ../src/applet.c:1002
-#, c-format
+#: ../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…"
+msgstr "உருவாக்கு..."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "VPN இணைப்பு வகை ஒன்றை தேர்ந்தெடுக்கவும்"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"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."
 msgstr ""
-"\n"
-"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் VPN சேவை நேரத்திற்கு துவக்கவில்லை."
+"புதிய இணைப்புக்கு நீங்கள் விரும்பும் VPN இணைப்பு வகை ஒன்றை தேர்ந்தெடுக்கவும்.  நீங்கள் "
+"உருவாக்க விரும்பும் VPN இணைப்பு வகை பட்டியலில் தெரியவில்லை எனில், நீங்கள் சரியான VPN "
+"சொருகியை நிறுவவில்லை."
 
-#: ../src/applet.c:1005
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr "ரவுன்ட்-ராபின்"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr "செயல்மிகு மறுபிரதி"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr "XOR"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr "ஒளிப்பரப்பு"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr "802.3ad"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr "சரிசெய்துகொள்ளும் பரப்பல் சுமை சமநிலைப்படுத்தல்"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr "சரிசெய்துகொள்ளும் சுமை சமநிலைப்படுத்தல்"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr "MII (பரிந்துரைக்கப்படுவது)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr "ARP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+msgid "Bonded _connections:"
+msgstr "பிணைப்பு இணைப்புகள் (_c):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_E திருத்து"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr "கண்காணிப்பு இடைவேளை (_f):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:"
+msgstr "இடைமுகப் பெயர் (_I):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr "இணைப்பு கண்காணிப்பு (_L):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr "ARP இலக்குகள் (_t):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் VPN சேவை துவக்கவில்லை."
+"இணைப்பு நிலையைச் சோதிக்கும் போது தேடிப்பார்க்க வேண்டிய ஒரு IP முகவரி அல்லது "
+"காற்புள்ளிகளால் பிரித்த IP முகவரிகளின் பட்டியல்."
 
-#: ../src/applet.c:1008
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr "இணைப்பு செயல்நிலை தாமதம் (_u):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr "இணைப்பு செயலிலா நிலை தாமதம் (_d):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "முதன்மை DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
 msgstr ""
-"\n"
-"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் அங்கே சரியான VPNரகசியங்கள் இல்லை.."
 
-#: ../src/applet.c:1011
+#: ../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:"
+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
+msgid "bytes"
+msgstr "பைட்டுகள்"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "_e பாதுகாப்பு:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "அடிப்படை இணைப்பு:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "பிணையம் செயல்படுகிறது (_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "தானாக"
+
+#: ../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
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+msgid "default"
+msgstr "முன்னிருப்பு"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"\n"
-"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் தவறான VPN ரகசியங்கள்."
 
-#: ../src/applet.c:1018
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "முகவரி"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "முகவரி"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+msgid "invalid %s for %s (%s)"
 msgstr ""
-"\n"
-"VPN இணைப்பு '%s' தோல்வியுற்றது."
 
-#: ../src/applet.c:1036
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+msgid "invalid %s (%s)"
 msgstr ""
-"\n"
-"VPN இணைப்பு '%s' துண்டிக்கப்பட்டது ஏனெனில் பிணைய இணைப்பில் தடங்கல் ஏற்பட்டது."
 
-#: ../src/applet.c:1039
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+msgid "invalid interface-name for %s (%s)"
 msgstr ""
-"\n"
-"VPN இணைப்பு '%s' VPN சேவை நிறுத்தப்பட்டதால் துண்டிக்கப்பட்டது."
 
-#: ../src/applet.c:1045
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+msgid "invalid interface-name (%s)"
 msgstr ""
-"\n"
-"VPN இணைப்பு '%s' துண்டிக்கப்படுட்டது."
 
-#: ../src/applet.c:1079
-msgid "VPN Login Message"
-msgstr "VPN உட்புகும் செய்தி"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "ஏதாவது சாதனம்"
 
-#: ../src/applet.c:1085 ../src/applet.c:1093 ../src/applet.c:1143
-msgid "VPN Connection Failed"
-msgstr "VPN இணைப்பு தோல்வியுற்றது"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "தெரியாத பிழையால் இணைப்பு ரகசியங்களை மேம்படுத்த முடியவில்லை."
 
-#: ../src/applet.c:1150
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
-msgstr ""
-"\n"
-"VPN இணைப்பு '%s' தோல்வியுற்றது ஏனெனில் VPN சேவை துவங்குவதில் தோல்வி.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "இந்த இணைப்புக்காக 802.1_X பாதுகாப்பை பயன்படுத்துக"
 
-#: ../src/applet.c:1153
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
 msgstr ""
-"\n"
-"VPN இணைப்பு '%s'ஐ துவக்க முடியவில்லை.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1473
-msgid "device not ready (firmware missing)"
-msgstr "சாதனம் தயாராக இல்லை (தளநிரல் இல்லை)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/applet.c:1475
-msgid "device not ready"
-msgstr "சாதனம் தயாராக இல்லை"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1501
-msgid "Disconnect"
-msgstr "துண்டி"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1515
-msgid "device not managed"
-msgstr "சாதனம் மேலாண்மை செய்யப்படவில்லை"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.c:1559
-msgid "No network devices available"
-msgstr "பிணைய சாதனம் கிடைக்கப்பெறவில்லை"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.c:1647
-msgid "_VPN Connections"
-msgstr "_VPN இணைப்புகள்"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.c:1704
-msgid "_Configure VPN..."
-msgstr " VPNஐ கட்டமைக்கவும் (_C)..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.c:1708
-msgid "_Disconnect VPN"
-msgstr "VPNஐ துணைடிக்கவும் (_D)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.c:1806
-msgid "NetworkManager is not running..."
-msgstr "பிணைய மேலாளர் இயக்கத்தில் இல்லை..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.c:1811 ../src/applet.c:2604
-msgid "Networking disabled"
-msgstr "பிணைய செயல்நீக்கப்பட்டது"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2032
-msgid "Enable _Networking"
-msgstr "பிணையம் செயல்படுகிறது (_N)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2041
-msgid "Enable _Wireless"
-msgstr "ஒயர்லெஸ் செயல்படுகிறது (_W)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2050
-msgid "Enable _Mobile Broadband"
-msgstr "மொபைல் பிராட்பேண்டை செயற்படுத்தவும் (_M)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2059
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "_X வைமாக்ஸ் மொபைல் பிராட்பேண்டை செயற்படுத்தவும் "
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#. Toggle notifications item
-#: ../src/applet.c:2070
-msgid "Enable N_otifications"
-msgstr "அறிவிப்புகளை செயற்படுத்தவும் (_o)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2081
-msgid "Connection _Information"
-msgstr "இணைப்பு தகவல் (_I)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2091
-msgid "Edit Connections..."
-msgstr "இணைப்புகளை திருத்தவும்..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2105
-msgid "_Help"
-msgstr "உதவி (_H)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2114
-msgid "_About"
-msgstr "பற்றி (_A)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.c:2291
-msgid "Disconnected"
-msgstr "துண்டிக்கபட்டது"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2292
-msgid "The network connection has been disconnected."
-msgstr "பிணைய இணைப்பு துண்டிக்கப்படும்."
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2473
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "பிணைய இணைப்பு '%s' தயாராகிறது..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2476
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "பிணைய இணைப்பு '%s'காக பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:2482
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "பிணைய இணைப்பு '%s' செயல்படுகிறது"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:2560
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "VPN இணைப்பு '%s'துவங்குகிறது..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.c:2563
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN இணைப்பு '%s'காக பயனர் அங்கீகாரம் தேவைப்படுகிறது..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
 
-#: ../src/applet.c:2566
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "'%s'காக ஒரு VPN முகவரி தேவைப்படுகிறது..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
 
-#: ../src/applet.c:2569
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN இணைப்பு '%s' செயல்படுகிறது"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
 
-#: ../src/applet.c:2608
-msgid "No network connection"
-msgstr "பிணைய இணைப்பு இல்லை"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.c:3258
-msgid "NetworkManager Applet"
-msgstr "பிணைய மேலாளர் அப்லெட்"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "தானியங்கியாக இந்த சாதனத்தை பூட்டு திறக்கவும்"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "பூட்டுநீக்கு (_U)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Active Network Connections"
-msgstr "செயலிலுள்ள பிணைய இணைப்புகள்"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Connection Information"
-msgstr "இணைப்பு தகவல்"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "ஒயர்டு 802.1X அங்கீகாரம்"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:4
-msgid "_Network name:"
-msgstr "பிணைய பெயர் (_N):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "தானாக"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:310
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "தெரியாத பிழையால் இணைப்பு ரகசியங்களை மேம்படுத்த முடியவில்லை."
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:5
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 msgstr ""
-"IP பிணையத்தில் உங்களது கணினி முகவரிகள் அடையாளம்.  \"Add\" பட்டனுடன் சேர்த்துஒரு IP "
-"முகவரியை கிளிக் செய்யவும்."
 
-#: ../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:46
 msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+"Enter the percentage of priority group bandwidth each user priority may use."
 msgstr ""
-"பெறமுடிந்தால், முன்னிருப்பு பிணைய இணைப்புக்கு இந்த இணைப்பை ஒருபோதும்  பயன்படுத்த "
-"முடியாது."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "Ig_nore automatically obtained routes"
-msgstr "தானாக ஏற்படும் வழிகளிலிருந்து புறக்கணிக்கவும் (_n)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid "_Use this connection only for resources on its network"
-msgstr "_U மூலங்களின் பிணையத்திற்கு மட்டும் இந்த இணைப்பை பயன்படுத்தவும் "
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:2
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-simple.ui.h:1
 #: ../src/wireless-security/ws-leap.ui.h:1
-#: ../src/wireless-security/ws-wpa-psk.ui.h:1
-msgid "Sho_w password"
-msgstr "கடவுச்சொல்லைக் காட்டு (_w)"
+msgid "_Username:"
+msgstr "பயனர் பெயர் (_U) "
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:2
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/eap-method-leap.ui.h:2
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-#: ../src/wireless-security/ws-leap.ui.h:2
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Password:"
-msgstr "கடவுச்சொல் (_P):"
-
-#: ../src/connection-editor/ce-page-dsl.ui.h:3
 msgid "_Service:"
 msgstr "சேவை (_S):"
 
-#: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../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:4
+#: ../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
-msgid "_Username:"
-msgstr "பயனர் பெயர் (_U) "
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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
-msgid "Addresses"
-msgstr "முகவரிகள்"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:2
-#: ../src/connection-editor/ce-page-ip6.ui.h:2
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
-#: ../src/connection-editor/page-ip6.c:142
-#: ../src/wireless-security/eap-method-peap.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:1
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
+#: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "தானாக"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:3
-#: ../src/connection-editor/ce-page-ip6.ui.h:3
-msgid "Automatic with manual DNS settings"
-msgstr "தானியங்கி கைமுறை டிஎன்எஸ் அமைப்புகளுடன் "
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "திருப்பிய ஜோடி (டிபி)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:4
-msgid "D_HCP client ID:"
-msgstr "D_HCP கிளையன்ட் குறியீடு:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "இணைப்பு பொருள் இடைமுகம் (AUI)"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:5
-#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "பிஎன்சி (BNC)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "ஊடக சார்பில்லா இடைமுகம் (எம்ஐஐ)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "துறை (_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "வேகம் (_S):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "முழு இரட்டை (_x)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "தானாக மாற்றக்கூடிய (_o)"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "சேவை (_S):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+msgid "C_loned MAC address:"
+msgstr "_l நகல் மேக்(MAC) முகவரி:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid ""
-"Domains used when resolving host names. Use commas to separate multiple "
-"domains."
+"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 ""
-"புரவலன் பெயர்களை தீர்க்கும் போது பயன்படுத்தப்பட்ட டொமைன்கள். பல டொமைன்களை அரைப்புள்ளியால் "
-"பிரிக்கவும்."
+"இங்கு உள்ளிட்ட மாக் முகவரி இந்த வலை சாதனத்துக்கு முகவரியாக இந்த செயல்படும் இணைப்பில் "
+"பயன்படுத்தப்படும். இந்த நடத்தை மாக் க்ளொனிங் அல்லது ஸ்பூஃபிங் எனபப்டும். எ-கா: "
+"00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "முன்னிருப்பு"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "தவிர்"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "ஒளிப்பரப்பு முகவரி:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "தனிப்பட்ட விசை கடவுச்சொல் (_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
-"IP addresses of domain name servers used to resolve host names. Use commas "
-"to separate multiple domain name server addresses."
+"Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
-"புரவலன் பெயர்களை தீர்க்க ஐபி முகவரிகள் பயன்படுத்தப்பட்டுள்ளது. பல டொமைன்களின் பெயர் சேவையக "
-"முகவரிகளை அரைப்புள்ளியால் பிரிக்கவும்."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
-msgid "Link-Local"
-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-ip4.ui.h:9
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
-#: ../src/connection-editor/page-ip4.c:169
-#: ../src/connection-editor/page-ip6.c:191
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr "தரவுப்படம்"
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+msgid "Connected"
+msgstr "இணைக்கப்பட்டது"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr "தானியங்கி கைமுறை டிஎன்எஸ் அமைப்புகளுடன் "
+
+#: ../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 "கைமுறை"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-msgid "Require IPv_4 addressing for this connection to complete"
-msgstr "இந்த இணைப்பை முழுமையாக்க IPv4 முகவரி தேவை"
-
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
-#: ../src/connection-editor/ce-page-ip6.ui.h:10
-msgid "S_earch domains:"
-msgstr "_e செயற்களத்தை தேடவும்"
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+msgid "Link-Local"
+msgstr "இணைப்பு-உள்ளமை "
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:12
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
-#: ../src/connection-editor/page-ip4.c:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../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
 msgid "Shared to other computers"
 msgstr "மற்ற கணினிகள்ளுடன் பகிரப்பட்டது"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
+#: ../src/connection-editor/ce-page-ip4.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
+msgid "_Method:"
+msgstr "முறை (_M):"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Addresses"
+msgstr "முகவரிகள்"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1160,34 +1779,90 @@ msgstr ""
 "இந்த DHCP கிளையன் அடையாளப்படுத்தி ஒரு பிணைய நிர்வாகியை தனிபயனாக்க அனுமதிக்கிறது. "
 "நீங்கள் ஒரு DHCP கிளையன் அடையாளப்படுத்தியை இங்கே உள்ளிட பயன்படுத்தவும்."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
-"When connecting to IPv6-capable networks, allows the connection to complete "
-"if IPv4 configuration fails but IPv6 configuration succeeds."
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
 msgstr ""
-"IPv4 கட்டமைப்பு தோல்வியடைந்து ஆனால் IPv6 வெற்றியடைந்தால், IPv6-திறன் நெட்வொர்க்குடன் "
-"இணைக்கும் போது இணைப்பை முடிக்க அனுமதிக்கிறது."
+"புரவலன் பெயர்களை தீர்க்கும் போது பயன்படுத்தப்பட்ட டொமைன்கள். பல டொமைன்களை அரைப்புள்ளியால் "
+"பிரிக்கவும்."
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr "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
+msgid "S_earch domains:"
+msgstr "_e செயற்களத்தை தேடவும்"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../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:"
 msgstr "_DNS சேவையகங்கள்:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:16
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
-msgid "_Method:"
-msgstr "முறை (_M):"
+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:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr "இந்த இணைப்பை முழுமையாக்க IPv4 முகவரி தேவை"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+msgid ""
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
+msgstr ""
+"IPv4 கட்டமைப்பு தோல்வியடைந்து ஆனால் IPv6 வெற்றியடைந்தால், IPv6-திறன் நெட்வொர்க்குடன் "
+"இணைக்கும் போது இணைப்பை முடிக்க அனுமதிக்கிறது."
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "வழிகள் (_R)…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "செயல்நீக்கப்பட்டது"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "இந்த இணைப்பை முழுமையாக்க IPv6 முகவரி தேவை"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1196,274 +1871,259 @@ msgstr ""
 "நெட்வொர்க்குடன் இணைக்கும் போது, இணைப்பை முடிக்க அனுமதிக்கிறது."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "2G (GPRS/EDGE)"
-msgstr "2 ஜி (ஜிபிஆர்எஸ்/எட்ஜ்)"
+msgid "Basic"
+msgstr "அடிப்படை"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3ஜி (யூஎம்டிஎஸ்/ஹெச்எஸ்பிஏ)"
+msgid "Nu_mber:"
+msgstr "எண் (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "மேம்பட்ட"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Allow _roaming if home network is not available"
-msgstr "_r இல்ல பிணையம் கிடைக்கவில்லையெனில் ரோமிங்கை அனுமதிக்கவும்"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Any"
-msgstr "ஏதாவது"
-
 #: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Basic"
-msgstr "அடிப்படை"
+msgid "_APN:"
+msgstr "_APN:"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Change..."
-msgstr "மாற்று..."
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "N_etwork ID:"
 msgstr "பிணையம் ID (_e) :"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
-msgid "Nu_mber:"
-msgstr "எண் (_m):"
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr "மாற்று..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2 ஜி (ஜிபிஆர்எஸ்/எட்ஜ்) ஐ விரும்புகிறேன்"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3ஜி (யூஎம்டிஎஸ்/ஹெச்எஸ்பிஏ) ஐ விரும்புகிறேன்"
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
+msgstr "_r இல்ல பிணையம் கிடைக்கவில்லையெனில் ரோமிங்கை அனுமதிக்கவும்"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
-msgid "_APN:"
-msgstr "_APN:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
-#: ../src/wireless-security/ws-wpa-psk.ui.h:3
-msgid "_Type:"
-msgstr "வகை (_T):"
-
 #: ../src/connection-editor/ce-page-ppp.ui.h:1
-msgid "Allow _BSD data compression"
-msgstr "_BSD தரவு அழுத்தம் அனுமதிக்கிறது"
+msgid "Authentication"
+msgstr "அங்கீகாரம்"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:2
-msgid "Allow _Deflate data compression"
-msgstr "_Deflate தரவு குறுக்கத்தை அனுமதி"
-
-#: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Allowed methods:"
 msgstr "அனுமதிக்கப்பட்ட முறைகள்:"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:4
-msgid "Authentication"
-msgstr "அங்கீகாரம்"
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
+msgstr "முறைகள் கட்டமைக்கப்பட்டது (_M)…"
 
-#: ../src/connection-editor/ce-page-ppp.ui.h:5
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
 msgid "Compression"
 msgstr "சுருக்கம்"
 
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr "பாயிண்ட் டு பாயிண்ட் மறைகுறியாக்கத்தை பயன்படுத்து (_U) (MPPE)"
+
 #: ../src/connection-editor/ce-page-ppp.ui.h:6
-msgid "Configure _Methods…"
-msgstr "முறைகள் கட்டமைக்கப்பட்டது (_M)…"
+msgid "_Require 128-bit encryption"
+msgstr "128-பிட் மறைகுறியாக்கம் தேவைப்படுகிறது (_R)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:7
-msgid "Echo"
-msgstr "எதிரொலி"
+msgid "Use _stateful MPPE"
+msgstr "நிலையான MPPE பயன்படுத்தவும் (_s)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:8
-msgid "Send PPP _echo packets"
-msgstr "PPP எகோ பாக்கெட்டுகளை அனுப்பு (_e)"
+msgid "Allow _BSD data compression"
+msgstr "_BSD தரவு அழுத்தம் அனுமதிக்கிறது"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:9
-msgid "Use TCP _header compression"
-msgstr "TCP தலைப்பு அழுத்தத்தை பயன்படுத்து (_h)"
+msgid "Allow _Deflate data compression"
+msgstr "_Deflate தரவு குறுக்கத்தை அனுமதி"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:10
-msgid "Use _stateful MPPE"
-msgstr "நிலையான MPPE பயன்படுத்தவும் (_s)"
+msgid "Use TCP _header compression"
+msgstr "TCP தலைப்பு அழுத்தத்தை பயன்படுத்து (_h)"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:11
-msgid "_Require 128-bit encryption"
-msgstr "128-பிட் மறைகுறியாக்கம் தேவைப்படுகிறது (_R)"
+msgid "Echo"
+msgstr "எதிரொலி"
 
 #: ../src/connection-editor/ce-page-ppp.ui.h:12
-msgid "_Use point-to-point encryption (MPPE)"
-msgstr "பாயிண்ட் டு பாயிண்ட் மறைகுறியாக்கத்தை பயன்படுத்து (_U) (MPPE)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:1
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+msgid "Send PPP _echo packets"
+msgstr "PPP எகோ பாக்கெட்டுகளை அனுப்பு (_e)"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "அடிப்படை இணைப்பு:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Attachment Unit Interface (AUI)"
-msgstr "இணைப்பு பொருள் இடைமுகம் (AUI)"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "Aut_onegotiate"
-msgstr "தானாக மாற்றக்கூடிய (_o)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+msgid "_Parent interface:"
+msgstr "தாய் இடைமுகம் (_P):"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "BNC"
-msgstr "பிஎன்சி (BNC)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "C_loned MAC address:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "_l நகல் மேக்(MAC) முகவரி:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "Full duple_x"
-msgstr "முழு இரட்டை (_x)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr "VLAN _id:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "Media Independent Interface (MII)"
-msgstr "ஊடக சார்பில்லா இடைமுகம் (எம்ஐஐ)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
-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"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
 msgstr ""
-"இங்கு உள்ளிட்ட மாக் முகவரி இந்த வலை சாதனத்துக்கு முகவரியாக இந்த செயல்படும் இணைப்பில் "
-"பயன்படுத்தப்படும். இந்த நடத்தை மாக் க்ளொனிங் அல்லது ஸ்பூஃபிங் எனபப்டும். எ-கா: "
-"00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Twisted Pair (TP)"
-msgstr "திருப்பிய ஜோடி (டிபி)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
-msgid "_Device MAC address:"
-msgstr "_D சாதன MAC முகவரி:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-msgid "_Port:"
-msgstr "துறை (_P):"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
+msgstr "சாதன பெயர் + எண்"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-msgid "_Speed:"
-msgstr "வேகம் (_S):"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr "\"vlan\" + எண்"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "bytes"
-msgstr "பைட்டுகள்"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr "_e பாதுகாப்பு:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
-msgid "Ad-hoc"
-msgstr "தற்காலிக"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
-msgid "Ban_d:"
-msgstr "பிணைப்பு (_d):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "C_hannel:"
-msgstr "சேனல் (_h):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr "தற்காலிக"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "Infrastructure"
-msgstr "கட்டுமானம்"
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-msgid "M_ode:"
-msgstr "முறைமை (_o):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr "மாற்றப்படும் பவர் (_w):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
-msgid "SS_ID:"
-msgstr "SS_ID:"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"இந்த விருப்பம் இந்த இணைப்பை வயர்லெஸ் அணுகல் புள்ளி (AP) இங்கே உள்ளிடப்பட்ட BSSIDயுடன்  "
-"பூட்டுகிறது.  எடுத்துக்காட்டு: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
-msgid "Transmission po_wer:"
-msgstr "மாற்றப்படும் பவர் (_w):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr "விகிதம்: (_R)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
-msgid "_Rate:"
-msgstr "விகிதம்: (_R)"
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr "சேனல் (_h):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
-msgid "mW"
-msgstr "mW"
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr "பிணைப்பு (_d):"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "S_ecurity:"
-msgstr "_e பாதுகாப்பு:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "அனுமதிக்கப்பட்டஅங்கீகார முறைகள் "
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr "_EAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr "Extensible Authentication Protocol"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr "_PAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr "கடவுச்சொல் அங்கீகார நெறிமுறை"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
-msgid "Extensible Authentication Protocol"
-msgstr "Extensible Authentication Protocol"
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "Microsoft Challenge Handshake Authentication Protocol"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "Microsoft Challenge Handshake Authentication Protocol version 2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1471,205 +2131,643 @@ msgstr ""
 "பல சமயங்களில், வழங்குபவர் PPP சேவையகங்கள் எல்லா அங்கீகார முறைகளுக்கும் துணைபுரியும்.  "
 "இணைப்பு தோல்வியுற்றால், சில முறைகளுக்காவது துணையை நீக்கி முயற்சிக்கவும்."
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
-
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "Microsoft Challenge Handshake Authentication Protocol"
+#: ../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 "தானியக்கி ஈதர்நெட்"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "Microsoft Challenge Handshake Authentication Protocol version 2"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
-msgid "Password Authentication Protocol"
-msgstr "கடவுச்சொல் அங்கீகார நெறிமுறை"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
-msgid "_EAP"
-msgstr "_EAP"
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "DSL"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+msgid "Team"
+msgstr ""
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
-msgid "_PAP"
-msgstr "_PAP"
+#: ../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
+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"
+msgstr "VLAN"
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
 
-#: ../src/connection-editor/ce-vpn-wizard.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/connection-helpers.c:196
+msgid "Hardware"
+msgstr "வன்பொருள்"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "VPN இணைப்பு வகை ஒன்றை தேர்ந்தெடுக்கவும்"
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr "மெய்நிகர்"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-msgid "Create…"
-msgstr "உருவாக்கு..."
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+msgid "Import a saved VPN configuration..."
+msgstr "சேமிக்கப்பட்ட ஒரு VPN அமைவாக்கத்தை இறக்கு..."
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
+#: ../src/connection-editor/connection-helpers.c:323
 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 "
-"சொருகியை நிறுவவில்லை."
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "தெரியாத பிழையால் இணைப்பு எடிட்டர் உரையாடலை நிறுவ முடியவில்லை."
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "புதிய இணைப்பை உருவாக்க முடியவில்லை"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "இணைப்பை அழிக்க முடியவில்லை"
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr " %s இணைப்பை அழிக்க நீங்கள் விரும்புகிறீர்களா?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:900
-#: ../src/connection-editor/page-ip6.c:866
+#: ../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
 msgid "Address"
 msgstr "முகவரி"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:917
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "நெட்மாஸ்க்"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:934
-#: ../src/connection-editor/page-ip6.c:900
+#: ../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
 msgid "Gateway"
 msgstr "நுழைவாயில்"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "மெட்ரிக்"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:883
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "முன்பொருத்தம்"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "%sஐ திருத்துகிறது"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "பெயரிடப்படாத இணைப்பை திருத்துகிறது"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "இணைப்பு பெயர் (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "பிழையை நிறுவும் எடிட்டர்"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "இணைப்பை சேர்க்க முடியவில்லை"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+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:419
+msgid "_Save"
+msgstr "_S சேமிக்கவும்:"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "இந்த இணைப்புக்கு செய்த மாற்றங்களை சேமிக்கவும்."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "இந்த கணினியில் அனைத்து பயனர்கள் இணைப்பையும் சேமிக்க அங்கீகரிக்கவும்."
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not create connection"
+msgstr "இணைப்பை உருவாக்க முடியவில்லை"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "இணைப்பை திருத்த முடியவில்லை"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr "இணைப்புத் திருத்தி உரையாடலை உருவாக்குவதில் அறியாத பிழை ஏற்பட்டது."
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "பிழையை நிறுவும் எடிட்டர்"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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-list.c:1519
-msgid "DSL"
-msgstr "DSL"
+msgid "Connection _name:"
+msgstr "இணைப்பு பெயர் (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
+msgstr "ஏற்றுமதி... (_E)"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "இல்லை"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "இப்போது"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d வருடத்திற்கு முன்"
+msgstr[1] "%d வருடங்களுக்கு முன்"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "பெயர்"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "கடைசியில் பயன்படுத்தப்பட்டது"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை திருத்தவும்"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை திருத்த அங்கீகாரம்"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை அழிக்கவும்"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை அழிக்க அங்கீகாரம்"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "'%s' இணைப்பை உருவாக்குவது எப்படி என்று தெரியவில்லை"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "இணைப்பை உருவாக்குவதில் பிழை."
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr "இணைப்பை திருத்தும்போது பிழை"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr " UUID '%s' உடன் இணைப்பை காணவில்லை."
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "802.1x பாதுகாப்பு"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "WiFi பாதுகாப்பு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr "இந்த இணைப்புக்காக 802.1_X பாதுகாப்பை பயன்படுத்துக"
+
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "ஃப்ளூடூத் சாதனத்தை தேட முடியவில்லை."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "ஒயர்டு இணைப்பு %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "பிணையம் செயல்படுகிறது (_N)"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "ஒயர்லெஸ் பிணையங்கள்ஒயர்லெஸ் பிணையங்கள்ஒயர்லெஸ் பிணையங்கள்"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
+msgstr "பிணைப்பு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "முதன்மை DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, c-format
+msgid "Bond connection %d"
+msgstr "பிணைப்பு இணைப்பு %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "ஒயர்டு இணைப்பு %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "DSL பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL இணைப்பு %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"இந்த விருப்பம் இந்த இணைப்பை பிணைய சாதனத்துடன் இங்கே உள்ளிடப்பட்ட நிரந்தர MAC முகவரியுடன்  "
+"பூட்டுகிறது.  எடுத்துக்காட்டு: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "ஈதர்நெட் (%s)"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_l நகல் மேக்(MAC) முகவரி:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "முன்னிருப்பு"
+
+#: ../src/connection-editor/page-general.c:52
+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 "பிணைய மேலாளர் இயக்கத்தில் இல்லை..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr "இன்ஃபினிபேன்ட் பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "இன்ஃபினிபேன்ட் இணைப்பு %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "தானாக (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "தானியக்கி (VPN) முகவரிகள் மட்டுமே"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "தானாக (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "தானியக்கி (PPP) முகவரிகள் மட்டுமே"
+msgid "Automatic, addresses only"
+msgstr "தானியக்கி முகவரிகள் மட்டுமே"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "தானாக (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "தானியக்கி (PPPoE) முகவரிகள் மட்டுமே"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "தானாக (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "தானியக்கி (DHCP) முகவரிகள் மட்டுமே "
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "இணைப்பு-உள்ளமை மட்டும்"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "செயல்நீக்கப்பட்டது"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "_DNS சேவையகங்கள்:"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "_e செயற்களத்தை தேடவும்"
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "IPv4 வழிகள் %sகாக திருத்துகிறது"
 
-#: ../src/connection-editor/page-ip4.c:981
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 அமைவுகள்"
 
-#: ../src/connection-editor/page-ip4.c:983
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "தானியக்கி முகவரிகள் மட்டுமே"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:285
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "தவிர்"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "தானாக, (DHCP) மட்டும்"
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "IPv6 வழிகள் %sகாக திருத்துகிறது"
 
-#: ../src/connection-editor/page-ip6.c:945
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 அமைவுகள்"
 
-#: ../src/connection-editor/page-ip6.c:947
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr "%s ஸ்லேவ் %d"
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "மொபைல் பிராட்பேண்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "துணைபுரியாத மொபைல் பிராட்பேண்டை இணைப்பு வகை. முடியவில்லை."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:639
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "மொபைல் பிராட்பேண்டு வழங்குபவர் வகையை தேர்ந்தெடுக்கவும்"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1677,422 +2775,268 @@ msgstr ""
 "உங்கள் வழங்குபவர் பயன்படுத்தும் டெக்னாலஜியை உங்களது பிராட்பேண்டு மொபைலுக்கு "
 "தேர்ந்தெடுக்கவும்.உங்களுக்கு தெரியவில்லை என்றால், அவரைக் கேட்டவும்."
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "எனது வழங்குபவர் _GSM-தொடர்புடைய டெக்னாலஜியைப் பயன்படுத்துகிறார் (எ.கா. GPRS, EDGE, "
 "UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr "எனது வழங்குபவர் C_DMA-தொடர்புடைய டெக்னாலஜியைப் பயன்படுத்துகிறார் (எ.கா. 1xRTT, EVDO)"
+msgstr ""
+"எனது வழங்குபவர் C_DMA-தொடர்புடைய டெக்னாலஜியைப் பயன்படுத்துகிறார் (எ.கா. 1xRTT, EVDO)"
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "ஜிஎஸ்எம்(GSM)"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ஒன்றுமில்லை"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:282
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP அமைவுகள்"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1515
-msgid "VPN"
-msgstr "VPN"
+#: ../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 "இறக்க கோப்பை தேர்ந்தெடுக்கவும்"
+
+#: ../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"
+msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "ஒயர்டு இணைப்பு %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "பிணைய இணைப்பு இல்லை"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "IPv4 பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN இணைப்பு %d"
+
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "VPN கூடுதல் இணைப்பு சேவை '%s'காக தேட முடியவில்லை."
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:900
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN இணைப்பு %d"
 
-#: ../src/connection-editor/page-wired.c:89
-#: ../src/connection-editor/page-wireless.c:94
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 msgstr ""
-"இந்த விருப்பம் இந்த இணைப்பை பிணைய சாதனத்துடன் இங்கே உள்ளிடப்பட்ட நிரந்தர MAC முகவரியுடன்  "
-"பூட்டுகிறது.  எடுத்துக்காட்டு: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/page-wired.c:272
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-#: ../src/connection-editor/nm-connection-list.c:1503
-msgid "Wired"
-msgstr "ஒயர்டு"
-
-#: ../src/connection-editor/page-wired.c:274
-msgid "Could not load wired user interface."
-msgstr "ஒயர்டு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
-
-#: ../src/connection-editor/page-wired.c:449
-#, c-format
-msgid "Wired connection %d"
-msgstr "ஒயர்டு இணைப்பு %d"
+"VPN கூடுதல் இணைப்பை சரியாக VPN இணைப்பை இறக்க முடியவில்லை\n"
+"\n"
+"பிழை: VPN சேவை வகை இல்லை."
 
-#: ../src/connection-editor/page-wired-security.c:116
-msgid "802.1x Security"
-msgstr "802.1x பாதுகாப்பு"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "VPN இணைப்பு வகை ஒன்றை தேர்ந்தெடுக்கவும்"
 
-#: ../src/connection-editor/page-wired-security.c:118
-msgid "Could not load Wired Security security user interface."
-msgstr "கம்பியுள்ள பாதுகாப்பு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+#: ../src/connection-editor/page-vpn.c:255
+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 "
+"சொருகியை நிறுவவில்லை."
 
-#: ../src/connection-editor/page-wired-security.c:136
-msgid "Use 802.1_X security for this connection"
-msgstr "இந்த இணைப்புக்காக 802.1_X பாதுகாப்பை பயன்படுத்துக"
+#: ../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 ""
+"இந்த விருப்பம் இந்த இணைப்பை வயர்லெஸ் அணுகல் புள்ளி (AP) இங்கே உள்ளிடப்பட்ட BSSIDயுடன்  "
+"பூட்டுகிறது.  எடுத்துக்காட்டு: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
-#, c-format
-msgid "default"
-msgstr "முன்னிருப்பு"
+#: ../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)\""
+msgstr ""
+"இந்த விருப்பம் இந்த இணைப்பை பிணைய சாதனத்துடன் இங்கே உள்ளிடப்பட்ட நிரந்தர MAC முகவரியுடன்  "
+"பூட்டுகிறது.  எடுத்துக்காட்டு: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:457
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-#: ../src/connection-editor/nm-connection-list.c:1507
-msgid "Wireless"
-msgstr "கம்பியில்லா"
-
-#: ../src/connection-editor/page-wireless.c:459
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "WiFi பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/page-wireless.c:663
-#, c-format
-msgid "Wireless connection %d"
-msgstr "ஒயர்லெஸ் இணைப்பு %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless-security.c:263
-#: ../src/libnm-gtk/nm-wireless-dialog.c:923
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "ஏதாவது சாதனம்"
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "ஒயர்டு இணைப்பு %d"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:272
-#: ../src/libnm-gtk/nm-wireless-dialog.c:932
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-பிட் கடவுச்சொல்"
 
-#: ../src/connection-editor/page-wireless-security.c:298
-#: ../src/libnm-gtk/nm-wireless-dialog.c:962
+#: ../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)"
 msgstr "மாறும் WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:312
-#: ../src/libnm-gtk/nm-wireless-dialog.c:976
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 தனிப்பட்ட"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:990
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 கடவுச்சொல்"
 
-#: ../src/connection-editor/page-wireless-security.c:360
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "WiFi பாதுகாப்பு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை; விடுபட்ட WiFi அமைவுகள்."
 
-#: ../src/connection-editor/page-wireless-security.c:370
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "ஒயர்லெஸ் பாதுகாப்பு"
 
-#: ../src/connection-editor/page-wireless-security.c:372
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
 msgstr "WiFi பாதுகாப்பு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Editing %s"
-msgstr "%sஐ திருத்துகிறது"
-
-#: ../src/connection-editor/nm-connection-editor.c:105
-msgid "Editing un-named connection"
-msgstr "பெயரிடப்படாத இணைப்பை திருத்துகிறது"
-
-#: ../src/connection-editor/nm-connection-editor.c:288
-msgid ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
+msgid "missing SSID"
 msgstr ""
-"இணைப்பு எடிட்டர் தேவையான மூலங்களை கண்டுபிடிக்க முடியவில்லை (.ui கோப்பு காணப்படவில்லை)."
-
-#: ../src/connection-editor/nm-connection-editor.c:391
-msgid "Error creating connection editor dialog."
-msgstr "எடிட்டர் உரையாடல் இணைப்பை உருவாக்குவதில் பிழை."
-
-#: ../src/connection-editor/nm-connection-editor.c:403
-msgid "_Save"
-msgstr "_S சேமிக்கவும்:"
 
-#: ../src/connection-editor/nm-connection-editor.c:404
-msgid "Save any changes made to this connection."
-msgstr "இந்த இணைப்புக்கு செய்த மாற்றங்களை சேமிக்கவும்."
-
-#: ../src/connection-editor/nm-connection-editor.c:405
-msgid "_Save..."
-msgstr "_S சேமிக்கவும்..."
-
-#: ../src/connection-editor/nm-connection-editor.c:406
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "இந்த கணினியில் அனைத்து பயனர்கள் இணைப்பையும் சேமிக்க அங்கீகரிக்கவும்."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "A_vailable to all users"
-msgstr "அனைத்து பயனர்களுக்கும் கிடைக்கப் பெறும"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-msgid "Connect _automatically"
-msgstr "தானாக இணைக்கவும் (_a)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-msgid "Connection _name:"
-msgstr "இணைப்பு பெயர் (_n):"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "E_xport"
-msgstr "ஏற்றுமதி (_x)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "_Import"
-msgstr "இறக்குமதி (_I)"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "இல்லை"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "இப்போது"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d நிமிடம் முன்"
-msgstr[1] "%d நிமிடங்களுக்கு முன்"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d மணி முன்"
-msgstr[1] "%d மணி முன்"
-
-#: ../src/connection-editor/nm-connection-list.c:261
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d நாள் முன்"
-msgstr[1] "%d நாள் முன்"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d மாதம் முன்"
-msgstr[1] "%d மாதம் முன்"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d வருடத்திற்கு முன்"
-msgstr[1] "%d வருடங்களுக்கு முன்"
-
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "இணைப்பை சேர்க்க முடியவில்லை"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "இணைப்பு சேமிக்கும் போது பிழை"
-
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "பண்பு '%s' / '%s' செல்லுபடியாகாதது: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-msgstr "ஒரு தெரியாத பிழை ஏற்பட்டுவிட்டது."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-msgstr "பிழையை நிறுவும் எடிட்டர்"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:719
-#: ../src/connection-editor/nm-connection-list.c:886
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
-msgstr "தெரியாத பிழையால் இணைப்பு எடிட்டர் உரையாடலை நிறுவ முடியவில்லை."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "புதிய இணைப்பை உருவாக்க முடியவில்லை"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "புதிய இணைப்பை திருத்த முடியவில்லை"
-
-#: ../src/connection-editor/nm-connection-list.c:733
-msgid "Could not edit connection"
-msgstr "இணைப்பை திருத்த முடியவில்லை"
-
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "இணைப்பை அழிக்க முடியவில்லை"
-
-#: ../src/connection-editor/nm-connection-list.c:795
-#, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr " %s இணைப்பை அழிக்க நீங்கள் விரும்புகிறீர்களா?"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:930
-#: ../src/connection-editor/vpn-helpers.c:227
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN இணைப்பை இறக்க முடியவில்லை"
 
-#: ../src/connection-editor/nm-connection-list.c:932
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"VPN கூடுதல் இணைப்பை சரியாக VPN இணைப்பை இறக்க முடியவில்லை\n"
-"\n"
-"பிழை: VPN சேவை வகை இல்லை."
-
-#: ../src/connection-editor/nm-connection-list.c:945
-msgid "Could not edit imported connection"
-msgstr "இறக்கப்பட்ட இணைப்பை திருத்த முடியவில்லை"
-
-#: ../src/connection-editor/nm-connection-list.c:1126
-msgid "Name"
-msgstr "பெயர்"
-
-#: ../src/connection-editor/nm-connection-list.c:1138
-msgid "Last Used"
-msgstr "கடைசியில் பயன்படுத்தப்பட்டது"
-
-#: ../src/connection-editor/nm-connection-list.c:1264
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr "விபிஎன் சொருகி ஏதும் கிடைக்கவில்லை. ஒன்றை இந்த பொத்தானை செயலாக்க  நிறுவவும்."
-
-#: ../src/connection-editor/nm-connection-list.c:1275
-msgid "_Edit"
-msgstr "_E திருத்து"
-
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "Edit the selected connection"
-msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை திருத்தவும்"
-
-#: ../src/connection-editor/nm-connection-list.c:1277
-msgid "_Edit..."
-msgstr "_E திருத்து..."
-
-#: ../src/connection-editor/nm-connection-list.c:1278
-msgid "Authenticate to edit the selected connection"
-msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை திருத்த அங்கீகாரம்"
-
-#: ../src/connection-editor/nm-connection-list.c:1293
-msgid "_Delete"
-msgstr "_D அழி"
-
-#: ../src/connection-editor/nm-connection-list.c:1294
-msgid "Delete the selected connection"
-msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை அழிக்கவும்"
-
-#: ../src/connection-editor/nm-connection-list.c:1295
-msgid "_Delete..."
-msgstr "_D அழி..."
-
-#: ../src/connection-editor/nm-connection-list.c:1296
-msgid "Authenticate to delete the selected connection"
-msgstr "தேர்ந்தெடுக்கப்பட்ட இணைப்பை அழிக்க அங்கீகாரம்"
-
-#: ../src/connection-editor/nm-connection-list.c:1575
-msgid "Error creating connection"
-msgstr "இணைப்பை உருவாக்குவதில் பிழை."
-
-#: ../src/connection-editor/nm-connection-list.c:1576
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "'%s' இணைப்பை உருவாக்குவது எப்படி என்று தெரியவில்லை"
-
-#: ../src/connection-editor/nm-connection-list.c:1631
-#: ../src/connection-editor/nm-connection-list.c:1643
-msgid "Error editing connection"
-msgstr "இணைப்பை திருத்தும்போது பிழை"
-
-#: ../src/connection-editor/nm-connection-list.c:1632
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "'%s' இணைப்பை திருத்துவது எப்படி என்று தெரியவில்லை"
-
-#: ../src/connection-editor/nm-connection-list.c:1644
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr " UUID '%s' உடன் இணைப்பை காணவில்லை."
-
-#: ../src/connection-editor/vpn-helpers.c:229
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2105,29 +3049,30 @@ msgstr ""
 "\n"
 "பிழை: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:262
-msgid "Select file to import"
-msgstr "இறக்க கோப்பை தேர்ந்தெடுக்கவும்"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "தெரியாத"
 
-#: ../src/connection-editor/vpn-helpers.c:313
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" என பெயரிடப்பட்ட கோப்பு ஏற்கனவே உள்ளது."
 
-#: ../src/connection-editor/vpn-helpers.c:315
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "மாற்று (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:317
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:353
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN இணைப்பை ஏற்ற முடியவல்லை"
 
-#: ../src/connection-editor/vpn-helpers.c:355
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2138,114 +3083,60 @@ msgstr ""
 "\n"
 "பிழை: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:390
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN இணைப்பை ஏற்றவும்..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "பான் (PAN) இணைப்பை உருவாக்க முடியவில்லை: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "உங்கள் ஃபோன் இப்போது பயன்படுத்துவதற்கு தயாராக உள்ளது!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:249
-#, c-format
-msgid "%s Network"
-msgstr "%s பிணையம்"
-
-#: ../src/gnome-bluetooth/bt-widget.c:375
-#, c-format
-msgid "Error: %s"
-msgstr "பிழை: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:488
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "டன் (DUN) இணைப்பை உருவாக்க முடியவில்லை: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:511
-msgid "Mobile wizard was canceled"
-msgstr "மொபைல் பார்வை ரத்துசெய்யப்பட்டது"
-
-#: ../src/gnome-bluetooth/bt-widget.c:520
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "தெரியாத ஃபோன் சாதன வகை ( GSM இல்லை அல்லது CDMA)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
-msgid "failed to connect to the phone."
-msgstr "ஃபோனுக்கு இணைக்க முடியவில்லை."
-
-#: ../src/gnome-bluetooth/bt-widget.c:753
-msgid "unexpectedly disconnected from the phone."
-msgstr "எதிர்பாராமல் ஃபோனிலிருந்து துண்டிக்கப்பட்டது."
-
-#: ../src/gnome-bluetooth/bt-widget.c:762
-msgid "timed out detecting phone details."
-msgstr "ஃபோன் விவரங்களை தேடுவதற்கு நேரம் முடிந்தது."
-
-#: ../src/gnome-bluetooth/bt-widget.c:774
-msgid "Detecting phone configuration..."
-msgstr "ஃபோன் கட்டமைப்பை தேடுகிறது..."
-
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "ஃப்ளூடூத் சாதனத்தை தேட முடியவில்லை."
-
-#: ../src/gnome-bluetooth/bt-widget.c:980
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"டயல்-அப்-பிணைய இணைப்பு அமைவிற்கு முன் முன்னிருப்பு ஃப்ளூடூத் அடாப்படர் செயல்படுதப்பட "
-"வேண்டும்."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1012
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "ப்ளூடூத் கட்டமைப்பு சாத்தியமில்லை (D-Busஉடன் இணைக்க முடியவில்லை: %s)."
+"பிணைய மேலாளர் அப்லெட் தேவையான மூலங்களைக் கண்டு பிடிக்க முடியவில்லை. (.ui கோப்பு "
+"காணப்படவில்லை)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "ப்ளூடூத் கட்டமைப்பு சாத்தியமில்லை (D-Bus ப்ராக்ஸியை உருவாக்க முடியவில்லை)."
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "பூட்டுநீக்கு (_U)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1031
-#, c-format
-msgid "Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "ப்ளூடூத் கட்டமைப்பு சாத்தியமில்லை (NetworkManagerஐ கண்டுபிடிப்பதில் பிழை: %s)."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "தானியங்கியாக இந்த சாதனத்தை பூட்டு திறக்கவும்"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1098
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "ஒரு பிணைய சாதனமாக உங்கள் மொபைல் ஃபோனை பயன்படுத்தவும் (PAN/NAP)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "இணைப்பு தகவல்"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1107
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "உங்களது மொபைல் போனுக்கு பயன்படுத்துகிற இணையத்தை அணுகுகிறது (DUN)"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "செயலிலுள்ள பிணைய இணைப்புகள்"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
-msgid "Your mobile broadband connection is configured with the following settings:"
+#: ../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/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "உங்கள் சாதனம்:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "உங்கள் வழங்குபவர்:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "உங்கள் திட்டம்:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
+#: ../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 "
@@ -2259,23 +3150,28 @@ msgstr ""
 "connection settings, choose \"Network Connections\" from the System >> "
 "Preferences menu."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:264
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "மொபைல் பிராட்பேண்டு அமைவுகளை உறுதி செய்யவும்"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "பட்டியலிடப்படாத"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "உங்கள் திட்டத்தை தேர்ந்தெடுக்கவும் (_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../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/libnm-gtk/nm-mobile-wizard.c:528
+#: ../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"
@@ -2288,67 +3184,84 @@ msgstr ""
 "உங்கள் திட்டத்தை பற்றி எதுவும் தெரியவில்லையெனில் உங்கள் திட்டத்தின் APNஐ வழங்குநரிடம் "
 "கேட்கவும்."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "பில்லிங் திட்டத்தை தேர்ந்தெடுக்கவும்"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "எனது திட்டம் பட்டியலிடப்படவில்லை..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../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/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "வழங்குபவர்"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../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):"
+msgstr ""
+"எனது வழங்குபவரை தேட முடியவில்லை மற்றும் கைமுறையாக அதை உள்ளிட விரும்புகிறேன் (_m):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:789
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "வழங்குபவர்:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../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/libnm-gtk/nm-mobile-wizard.c:819
+#: ../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/libnm-gtk/nm-mobile-wizard.c:830
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "உங்கள் வழங்குபவரை தேர்ந்தெடுக்கவும்"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1081
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "நாடு அல்லது மாநிலப் பட்டியல்:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1093
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "நாடு அல்லது மாநிலம் "
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "எனது நாடு பட்டியலிடப்படவில்லை"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1146
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1200
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "GSM சாதனம் நிறுவப்பட்டது"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1203
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "CDMA சாதனம் நிறுவபட்டது"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1375
+#: ../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."
@@ -2356,114 +3269,218 @@ msgstr ""
 "ஒரு செல்லுலார் (3G) பிணையத்துடன் மொபைல் பிராட்பேண்டு இணைப்பைஅமைக்க உங்களுக்கு உதவியாளர் "
 "உதவிபுரிவார்."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1380
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "பின்வரும் தகவல் உங்களுக்கு தேவை:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1395
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "உங்கள் பிராட்பேண்டு வழங்குபவர்கள் பெயர்"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1401
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "உங்கள் பிராட்பேண்டு பில்லிங் திட்டப் பெயர்"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../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)"
+msgstr ""
+"(ஒரு சில சமயங்களில்) உங்களது பிராட்பேண்டுபில்லிங் திட்டம் APN (Access Point Name)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../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 "இந்த மொபைல் பிராட்பேண்டு சாதன இணைப்பை உருவாக்கவும் (_t):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1449
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "ஏதாவது சாதனம்"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "மொபைல் பிராட்பேண்டு இணைப்பை அமைக்கவும்"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1626
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "புதிய மொபைல் பிராட்பேண்டு இணைப்பு"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "கடவுச்சொல் (_P):"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "கடவுச்சொல் (_P):"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "கடவுச்சொற்களைக் காட்டு (_w)"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "புதிய..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1077
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ஒன்றுமில்லை"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "உருவாக்கு (_r)"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1161
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "கடவுச்சொல் அல்லது மறைகுறியாக்க விசைகள் ஒயர்லெஸ் பிணைய '%s'ஐ அணுகுவதற்கு "
 "தேவைப்படுகிறது."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1163
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "ஒயர்லெஸ் பிணைய அங்கீகாரம் தேவைப்படுகிறது"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1165
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "அங்கீகார ஒயர்லெஸ் பிணையம் தேவைப்படுகிறது"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1170
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "புதிய ஒர்லெஸ் பிணையத்தை உருவாக்கவும்"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "புதிய ஒயர்லெஸ் பிணையம்"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1173
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ஒயர்லெஸ் பிணையத்தை உருவாக்க ஒரு பெயரை உள்ளிடவும்."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1175
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்தை இணைக்கவும்"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "மறைக்கட்ட ஒழர்லெஸ் பிணையம்"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "நீங்கள் இணைக்க விரும்பினால் மறைக்கப்பட்ட ஒயர்லெஸ் பிணையத்திற்கு பெயர் மற்றும்பாதுகாப்பு "
 "விவரங்களை உள்ளிடவும்."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "ஒயர்லெஸ் பாதுகாப்பு (_W):"
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "இணைப்பு (_n):"
 
-#: ../src/libnm-gtk/wifi.ui.h:3
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
 msgstr "ஒயர்லெஸ் அடாப்படர் (_a):"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _security:"
-msgstr "ஒயர்லெஸ் பாதுகாப்பு (_W):"
+#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
+msgid "Wired"
+msgstr "ஒயர்டு"
 
-#: ../src/main.c:73
+#: ../src/libnm-gtk/nm-ui-utils.c:327
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "பயன்பாடு:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
-msgstr "இது NetworkManager இன் நிரல் ஆகும் (https://wiki.gnome.org/Projects/NetworkManager/)."
+msgstr ""
+"இது NetworkManager இன் நிரல் ஆகும் (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -2471,209 +3488,281 @@ msgstr ""
 "கட்டளை வரி கலந்துரையாடலுக்கு நோக்கமில்லை ஆனால் அதற்கு பதிலாக GNOME பணிமேடை சூழலை "
 "இயக்குகிறது."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "வைமாக்ஸ் "
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "செயல்படுத்தப்படவில்லை"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "பதிவு செய்யப்படவில்லை"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "முகப்பு பிணையம் (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "இல்ல பிணையம்"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "தேடுகிறது"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "பதிவுசெய்தல் மறுக்கப்பட்டது"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../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:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ரோமிங்)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "ரோமிங் பிணையம் (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "ரோமிங் பிணையம்"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "முன்னிருப்பு"
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "சிம் கார்ட் '%s' ( '%s' இல்) க்கு PIN கோட்"
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"பிணைய மேலாளர் அப்லெட் தேவையான மூலங்களைக் கண்டு பிடிக்க முடியவில்லை. (.ui கோப்பு "
-"காணப்படவில்லை)."
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "PIN குறியீடு தேவைப்படுகிறது"
 
-#: ../src/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
-msgstr "இங்கீகார சான்றிதழ் தேர்ந்தெடுக்கப்படவில்லை"
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "PIN குறியீடு மொபைல் பிராட்பேண்டு சாதனத்திற்கு தேவைப்படுகிறது"
 
-#: ../src/wireless-security/eap-method.c:280
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "மொபைல் பிராட்பேண்டு இணைப்பு '%s' செயல்பாட்டிலுள்ளது : (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "ரோமிங் "
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "அடிப்படை இணைப்பு:"
+
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-" Not using a Certificate Authority (CA) certificate can result in "
-"connections to insecure, rogue wireless networks.  Would you like to choose "
-"a Certificate Authority certificate?"
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
-msgstr "CA சான்றிதழை தேர்ந்தெடுக்கவும்"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:648
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:651
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER அல்லது PEM சான்றிதழ்கள் (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:2
-msgid "Allow automatic PAC pro_visioning"
-msgstr "_v தானியங்கி PAC  ஏற்பாடு"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.ui.h:3
-#: ../src/wireless-security/eap-method-peap.ui.h:2
-#: ../src/wireless-security/eap-method-ttls.ui.h:2
-msgid "Anony_mous identity:"
-msgstr "பெயரில்லாத அடையாளம் (_m):"
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
+msgid "GTC"
+msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:4
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr "ஒரு PAC கோப்பினை தேர்ந்தெடுக்கவும்..."
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr "PAC கோப்புகள் (*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr "எல்லா கோப்புகள்"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "பெயரில்லாத அடையாளம்"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:5
+#: ../src/wireless-security/eap-method-fast.ui.h:3
 msgid "Authenticated"
 msgstr "அங்கீகரித்த"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:6
+#: ../src/wireless-security/eap-method-fast.ui.h:4
 msgid "Both"
 msgstr "இரண்டும்"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:7
+#: ../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:"
+msgstr "பெயரில்லாத அடையாளம் (_m):"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
 msgid "PAC _file:"
 msgstr "PAC _ கோப்பு:"
 
-#: ../src/wireless-security/eap-method-fast.ui.h:8
+#: ../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:4
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "_I உள் அங்கீகாரம்:"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
-msgid "GTC"
-msgstr "GTC"
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr "_v தானியங்கி PAC  ஏற்பாடு"
 
-#: ../src/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "ஒரு PAC கோப்பினை தேர்ந்தெடுக்கவும்..."
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:406
-msgid "PAC files (*.pac)"
-msgstr "PAC கோப்புகள் (*.pac)"
+#: ../src/wireless-security/eap-method-leap.c:69
+msgid "missing EAP-LEAP password"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:410
-msgid "All files"
-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:263
-#: ../src/wireless-security/wireless-security.c:373
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "அங்கீகார சான்றிதழைத் தேர்ந்தெடு..."
 
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr "பதிப்பு 0"
+
 #: ../src/wireless-security/eap-method-peap.ui.h:4
-#: ../src/wireless-security/eap-method-tls.ui.h:1
+msgid "Version 1"
+msgstr "பதிப்பு 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 "C_A சான்றிதழ்:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:5
+#: ../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
+msgid "No CA certificate is _required"
+msgstr "CA சான்றிதழ் தேவையில்லை (_r)"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "_v PEAP பதிப்பு:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:6
-msgid "Version 0"
-msgstr "பதிப்பு 0"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-msgid "Version 1"
-msgstr "பதிப்பு 1"
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-simple.ui.h:1
-msgid "As_k for this password every time"
-msgstr "ஒவ்வொரு முறையும் இந்த கடவுச்சொல்லைக் கேட்கவும் (_k)"
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A சான்றிதழ்:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "மறைகுறியாக்கப்படாத தனிபட்ட விசைகள் பாதுகாப்பில்லாதது"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../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 "
@@ -2687,87 +3776,366 @@ msgstr ""
 "\n"
 "(You can password-protect your private key with openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "உங்கள் தனிப்பட்ட சான்றிதழை தேர்ந்தெடுக்கவும்..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "உங்கள் தனிப்பட்ட விசையை தேர்ந்தெடுக்கவும்..."
 
-#: ../src/wireless-security/eap-method-tls.ui.h:2
+#: ../src/wireless-security/eap-method-tls.ui.h:1
 msgid "I_dentity:"
 msgstr "அடையாளம்(_d):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:3
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "பயனர் சான்றிதழ் (_U):"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "தனிப்பட்ட விசை ( _k):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "தனிப்பட்ட விசை கடவுச்சொல் (_P):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:6
-msgid "_User certificate:"
-msgstr "பயனர் சான்றிதழ் (_U):"
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
 
-#: ../src/wireless-security/wireless-security.c:385
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:409
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:420
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:431
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "பாதுகாக்கப்பட்ட EAP (PEAP)"
 
 #: ../src/wireless-security/ws-dynamic-wep.ui.h:2
-#: ../src/wireless-security/ws-wep-key.ui.h:5
+#: ../src/wireless-security/ws-wep-key.ui.h:9
 #: ../src/wireless-security/ws-wpa-eap.ui.h:2
 msgid "Au_thentication:"
 msgstr "_t அங்கீகாரம்:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (முன்னிருப்பு)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, c-format
+msgid "invalid wep-key: key with a length of %zu must contain only hex-digits"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:6
+#: ../src/wireless-security/ws-wep-key.c:120
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
 msgid "Open System"
 msgstr "திறந்த கணினி"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:7
+#: ../src/wireless-security/ws-wep-key.ui.h:6
 msgid "Shared Key"
 msgstr "பகிரப்பட்ட விசை"
 
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "விசை (_K):"
+
 #: ../src/wireless-security/ws-wep-key.ui.h:8
 msgid "Sho_w key"
 msgstr "விசையை காட்டு (_w)"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:9
+#: ../src/wireless-security/ws-wep-key.ui.h:10
 msgid "WEP inde_x:"
 msgstr "WEP அட்டவணை (_x):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:10
-msgid "_Key:"
-msgstr "விசை (_K):"
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "வகை (_T):"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "புதிய மொபைல் பிராட்பேண்டு (CDMA) இணைப்பு..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "இப்போது நீங்கள் CDMA பிணையத்தோடு இணைக்கப்பட்டுள்ளீர்கள்."
+
+#~ msgid "CDMA network."
+#~ msgstr "சிடிஎம்ஏ வலைப்பின்னல்"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "புதிய மொபைல் பிராட்பேண்டு (GSM) இணைப்பு..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "இப்போது நீங்கள் GSM பிணையத்தோடு இணைக்கப்படுகிறது."
+
+#~ msgid "GSM network."
+#~ msgstr "ஜிஎஸ்எம் வலைப்பின்னல்"
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "ஒயர்லெஸ் பிணையங்கள் (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "ஒயர்லெஸ் பிணையங்கள் (%s)"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "ஒயர்லெஸை செயல்நீக்கு"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "ஒயர்லெஸ் வன்பொருள் மாற்றியால் செயல்நீக்கப்பட்டது"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "'%s'காக ஒயர்லெஸ் பிணையம் தயாராகிறதுடுகிறது..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "'%s' ஒயர்லெஸ் பிணைய இணைப்பு கட்டமைக்கிறது..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "'%s'காக ஒரு ஒயர்லெஸ் பிணைய முகவரி தேவைப்படுகிறது..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "ஒயர்லெஸ் பிணைய இணைப்பு '%s' செயல்படுகிறது"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "வைமாக்ஸ் மொபைல் அகலப்பட்டை(%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "வைமாக்ஸ் மொபைல் அகலப்பட்டை"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "இப்போது நீங்கள் வைமாக்ஸ்  பிணையத்தோடு இணைக்கப்பட்டுள்ளீர்கள்."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "தெரியாத"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "வைமாக்ஸ் (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "இரண்டாவது DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "மூன்றாவது DNS:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "_X வைமாக்ஸ் மொபைல் பிராட்பேண்டை செயற்படுத்தவும் "
+
+#~ msgid "_Help"
+#~ msgstr "உதவி (_H)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2 ஜி (ஜிபிஆர்எஸ்/எட்ஜ்)"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3ஜி (யூஎம்டிஎஸ்/ஹெச்எஸ்பிஏ)"
+
+#~ msgid "Any"
+#~ msgstr "ஏதாவது"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "2 ஜி (ஜிபிஆர்எஸ்/எட்ஜ்) ஐ விரும்புகிறேன்"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "3ஜி (யூஎம்டிஎஸ்/ஹெச்எஸ்பிஏ) ஐ விரும்புகிறேன்"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_D சாதன MAC முகவரி:"
+
+#~ msgid "Infrastructure"
+#~ msgstr "கட்டுமானம்"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "தானாக (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "தானியக்கி (PPP) முகவரிகள் மட்டுமே"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "கம்பியுள்ள பாதுகாப்பு பயனர் இடைமுகத்தை ஏற்ற முடியவில்லை."
+
+#~ msgid "Wireless"
+#~ msgstr "கம்பியில்லா"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "ஒயர்லெஸ் இணைப்பு %d"
+
+#~ msgid "_Save..."
+#~ msgstr "_S சேமிக்கவும்..."
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "அனைத்து பயனர்களுக்கும் கிடைக்கப் பெறும"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "தானாக இணைக்கவும் (_a)"
+
+#~ msgid "_Import"
+#~ msgstr "இறக்குமதி (_I)"
+
+#~ msgid "Error saving connection"
+#~ msgstr "இணைப்பு சேமிக்கும் போது பிழை"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "பண்பு '%s' / '%s' செல்லுபடியாகாதது: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "ஒரு தெரியாத பிழை ஏற்பட்டுவிட்டது."
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "இறக்கப்பட்ட இணைப்பை திருத்த முடியவில்லை"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr "விபிஎன் சொருகி ஏதும் கிடைக்கவில்லை. ஒன்றை இந்த பொத்தானை செயலாக்க  நிறுவவும்."
+
+#~ msgid "_Edit..."
+#~ msgstr "_E திருத்து..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_D அழி..."
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "'%s' இணைப்பை திருத்துவது எப்படி என்று தெரியவில்லை"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "உங்கள் ஃபோன் இப்போது பயன்படுத்துவதற்கு தயாராக உள்ளது!"
+
+#~ msgid "%s Network"
+#~ msgstr "%s பிணையம்"
+
+#~ msgid "Error: %s"
+#~ msgstr "பிழை: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "டன் (DUN) இணைப்பை உருவாக்க முடியவில்லை: %s"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "மொபைல் பார்வை ரத்துசெய்யப்பட்டது"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "தெரியாத ஃபோன் சாதன வகை ( GSM இல்லை அல்லது CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "ஃபோனுக்கு இணைக்க முடியவில்லை."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "எதிர்பாராமல் ஃபோனிலிருந்து துண்டிக்கப்பட்டது."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "ஃபோன் விவரங்களை தேடுவதற்கு நேரம் முடிந்தது."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "ஃபோன் கட்டமைப்பை தேடுகிறது..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "டயல்-அப்-பிணைய இணைப்பு அமைவிற்கு முன் முன்னிருப்பு ஃப்ளூடூத் அடாப்படர் செயல்படுதப்பட "
+#~ "வேண்டும்."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr "ப்ளூடூத் கட்டமைப்பு சாத்தியமில்லை (D-Busஉடன் இணைக்க முடியவில்லை: %s)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "ப்ளூடூத் கட்டமைப்பு சாத்தியமில்லை (D-Bus ப்ராக்ஸியை உருவாக்க முடியவில்லை)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr ""
+#~ "ப்ளூடூத் கட்டமைப்பு சாத்தியமில்லை (NetworkManagerஐ கண்டுபிடிப்பதில் பிழை: %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "ஒரு பிணைய சாதனமாக உங்கள் மொபைல் ஃபோனை பயன்படுத்தவும் (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "உங்களது மொபைல் போனுக்கு பயன்படுத்துகிற இணையத்தை அணுகுகிறது (DUN)"
+
+#~ msgid "WiMAX"
+#~ msgstr "வைமாக்ஸ் "
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "இங்கீகார சான்றிதழ் தேர்ந்தெடுக்கப்படவில்லை"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ " Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
 
 #~ msgid "Click on this icon to connect to a wireless network"
 #~ msgstr "ஒரு ஒயர்லெஸ் பிணையத்தை இணைப்பதற்கு இந்த சின்னத்தை கிளிக் செய்யவும்"
@@ -2790,9 +4158,6 @@ msgstr "விசை (_K):"
 #~ msgid "label"
 #~ msgstr "லேபில்"
 
-#~ msgid "Network Manager"
-#~ msgstr "பிணைய மேலாளர்"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "nm-அப்லெட்டின் ஒரு எடுத்துக்காட்டு ஏற்கனவே இயங்கிக் கொண்டிருக்கிறது.\n"
 
@@ -2830,9 +4195,6 @@ msgstr "விசை (_K):"
 #~ "பதிப்பு 0\n"
 #~ "பதிப்பு 1"
 
-#~ msgid "C_onnect"
-#~ msgstr "இணை (_o)"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "மற்ற ஒயர்லெஸ் பிணையம்..."
 
diff --git a/po/te.po b/po/te.po
index caf728ba..2f86c7b0 100644
--- a/po/te.po
+++ b/po/te.po
@@ -12,20 +12,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: te\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2012-06-25 18:50+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "నెట్‌వర్క్"
 
@@ -47,8 +46,6 @@ msgid "Disable connected notifications"
 msgstr "అనుసంధానము నోటీసులను అచేతనముచేయుము"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
-#| msgid ""
-#| "Set this to TRUE to disable notifications when connecting to a network."
 msgid "Set this to true to disable notifications when connecting to a network."
 msgstr ""
 "నెట్వర్కునకు అనుసంధానమవుచున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చండి. "
@@ -58,23 +55,16 @@ msgid "Disable disconnected notifications"
 msgstr "అననుసంధానపు నోటీసులను అచేతనముచేయుము"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "నెట్వర్కునుండి అననుసంధానము అవుచున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చుము. "
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
-#| msgid "Disable connected notifications"
 msgid "Disable VPN notifications"
 msgstr "VPN ప్రకటనలను డిసేబుల్ చెయ్యి "
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:6
-#| msgid ""
-#| "Set this to TRUE to disable notifications when disconnecting from a "
-#| "network."
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
@@ -86,12 +76,9 @@ msgid "Suppress networks available notifications"
 msgstr "నెట్వర్కులు అందుబాటులోవున్నాయి నోటీసు అణిచివేయుము"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
-#| msgid ""
-#| "Set this to TRUE to disable notifications when wireless networks are "
-#| "available."
+#, fuzzy
 msgid ""
-"Set this to true to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "వైర్‌లెస్ నెట్వర్కులు అందుబాటులో వున్నప్పుడు నోటీసులను అచేతనము చేయుటకు దీనిని TRUE గా అమర్చండి. "
 
@@ -108,1039 +95,1429 @@ msgid "Disable WiFi Create"
 msgstr "WiFi సృష్టించుట అచేతనము చేయుము"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
-#| msgid ""
-#| "Set to TRUE to disable creation of adhoc networks when using the applet."
 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
-#| msgid "Choose CA Certificate"
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "CA ధృవీకరణపత్రమును విస్మరించు "
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 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:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr "EAP ప్రామాణిక దశ 2 లో CA సర్టిఫికేట్ల గురించి హెచ్చరికలు డిసేబుల్ నిజమైతే సెట్ చెయ్యండి."
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "అందుబాటులోవుంది"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "నెట్వర్కు నిర్వాహిక"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "నెట్వర్కు నిర్వాహిక"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "అనుసంధానించు (_o)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "నెట్వర్కు పేరు (_N):"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+msgid "Failed to add/activate connection"
+msgstr "అనుసంధానమును సృష్టించడం/క్రియాత్మకం చేయుటలో విఫలమైనది"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr "తెలియని దోషము"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+msgid "Connection failure"
+msgstr "అనుసంధానమగుట విఫలం"
+
+#: ../src/applet.c:399
+msgid "Device disconnect failed"
+msgstr "పరికరము అననుసంధానమురద్దు అగుటలో విఫలము"
+
+#: ../src/applet.c:404
+msgid "Disconnect failure"
+msgstr "అననుసంధానమురద్దు విఫలము"
+
+#: ../src/applet.c:434
+msgid "Connection activation failed"
+msgstr "అనుసంధానం క్రియాత్మకంలో విఫలమైంది"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "ఈ సందేశమును మరలా చూపవద్దు"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "మీరు '%s'కు అనుసంధానించబడినారు."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే నెట్వర్కు అనుసంధానము ఆటంకపరచబడింది."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "అనుసంధానము యేర్పరచబడింది"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ అనుకోకుండా ఆపివేయబడింది."
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "మీరు యిప్పుడు మొబైల్ బ్రాడ్‌బ్యాండ్ నెట్వర్కునకు అనుసంధానించబడి వున్నారు."
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ చెల్లని ఆకృతీకరణను తిప్పియిచ్చింది."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' ప్రిపేర్ చేయబడుతోంది..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే అనుసంధానపు ప్రయత్నం సమయం ముగిసింది."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' ఆకృతీకరించబడుతోంది..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ సమయం లోపల ప్రారంభంకాలేదు."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' కొరకు వినియోగదారి దృవీకరణము అవసరమైంది..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ ప్రారంభమవుటలో విఫలమైంది."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2500
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "'%s' కొరకు నెట్వర్కు చిరునామాను అభ్యర్ధిస్తోంది..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే అక్కడ చెల్లునటువంటి VPN రహస్యాలు లేవు."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' క్రియాశీలము"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే చెల్లని VPN రహస్యాలు."
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' విఫలమైంది."
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
-#: ../src/applet-dialogs.c:424
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "మొబైల్ బ్రాడ్‌బాండ్ (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' అననుసంధానించబడింది యెంచేతంటే నెట్వర్కు అనుసంధానము ఆటంకపరచబడింది."
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1510
-msgid "Mobile Broadband"
-msgstr "మొబైల్ బ్రాడ్‌బాండ్"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' అననుసంధానించబడింది యెంచేతంటే VPN సేవ ఆపివేయబడింది."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "కొత్త మొబైల్ బ్రాడ్‌బాండ్ (CDMA) అనుసంధానము..."
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' అననుసంధానించబడింది."
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "మీరు CDMA నెట్వర్కునకు అనుసంధానించబడినారు."
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"VPN కనెక్షన్ విజయవంతంగా స్థాపించబడింది.\n"
+"\n"
+"%s\n"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr "VPN కనెక్షన్ విజయవంతంగా స్థాపించబడింది.\n"
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "VPN లాగిన్ సందేశము"
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "VPN అనుసంధానము విఫలమైంది"
+
+#: ../src/applet.c:990
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' క్రియాశీలముగా వుంది: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ ప్రారంభమగుటలో విఫలమైంది.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "రోమింగ్"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"VPN అనుసంధానము '%s' ప్రారంభమగుటలో విఫలమైంది.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-msgid "CDMA network."
-msgstr "సిడియంఏ నెట్వర్కు."
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "పరికరము సిద్దముకాలేదు (ఫర్మువేర్ తప్పిపోయినది)"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
-msgid "You are now registered on the home network."
-msgstr "మీరు యిప్పుడు హోమ్ నెట్వర్కునకు రిజిస్టరైనారు."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "పరికరము సిద్దముకాలేదు"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
-msgid "You are now registered on a roaming network."
-msgstr "మీరు యిప్పుడు రోమింగ్  నెట్వర్కునకు రిజిస్టరైనారు."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "అననుసంధానించబడింది"
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "అననుసంధానించుము"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:459
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "కొత్త మొబైల్ బ్రాడ్‌బాండ్ (GSM) అనుసంధానము..."
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "పరికరము నిర్వహించబడలేదు"
 
-#: ../src/applet-device-gsm.c:493
-msgid "You are now connected to the GSM network."
-msgstr "మీరు యిప్పడు GSM నెట్వర్కునకు అనుసంధానించబడినారు."
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "ఎటువంటి నెట్వర్కు పరికరములు అందుబాటులోలేవు"
 
-#: ../src/applet-device-gsm.c:654
-msgid "PIN code required"
-msgstr "PIN కోడ్ అవసరమైంది"
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "_VPN అనుసంధానములు"
 
-#: ../src/applet-device-gsm.c:662
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "మొబైల్ బ్రాడ్‌బాండ్ పరికరము కొరకు PIN కోడ్ అవసరమైంది"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "VPN ఆకృతీకరించుము... (_C)"
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "VPN అననుసంధానించుము (_D)"
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "నెట్‌వర్క్ మ్యానేజర్ నడుచుటలేదు..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "నెట్వర్కింగ్ అచేతనమైంది"
 
-#: ../src/applet-device-gsm.c:783
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "నెట్వర్కింగ్ చేతనముచేయుము (_N)"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "వైర్‌లేని విధం చేతనముచేయుము (_W)"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "మొబైల్ బ్రాడ్‌బాండ్‌ను చేతనముచేయుము (_M)"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "సూచన ప్రకటనలను చేతనముచేయుము (_o)"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "అనుసంధానము సమాచారము (_I)"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "అనుసంధానములను సవరించు..."
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "గురించి (_A)"
+
+#: ../src/applet.c:2179
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "'%s' పై '%s'సిమ్ కార్డ్ కొరకు పిన్ కోడ్ "
+msgid "You are now connected to '%s'."
+msgstr "మీరు '%s'కు అనుసంధానించబడినారు."
 
-#: ../src/applet-device-gsm.c:875
-msgid "Wrong PIN code; please contact your provider."
-msgstr "తప్పయిన PIN కోడ్; దయచేసి మీ వుత్పాదకుని సంప్రదించుము."
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "అననుసంధానించబడింది"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "నెట్వర్కు అనుసంధానము అననుసంధానించబడింది."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "నెట్వర్కు అనుసంధానము '%s' సిద్దముచేయుచున్నది..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "నెట్వర్కు అనుసంధానము '%s' కొరకు వినియోగదారి దృవీకరణము అవసరము..."
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "'%s' కొరకు నెట్వర్కు చిరునామాను అభ్యర్ధిస్తోంది..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "నెట్వర్కు అనుసంధానము '%s' క్రియాశీలము"
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "VPN అనుసంధానము '%s'ను ప్రారంభించుచున్నది..."
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "VPN అనుసంధానము '%s' కొరకు వినియోగదారి దృవీకరణము అవసరమైంది..."
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "'%s' కొరకు VPN చిరునామాను అభ్యర్దించుచున్నది..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "VPN అనుసంధానము '%s' క్రియాశీలం"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "నెట్వర్కు అనుసంధానము లేదు"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "నెట్‌వర్క్ మ్యానేజర్ ఆప్లెట్"
+
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "తప్పయిన PUK కోడ్; దయచేసి మీ వుత్పాదకుని సంప్రదించుము."
 
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "తప్పయిన PIN కోడ్; దయచేసి మీ వుత్పాదకుని సంప్రదించుము."
+
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:925
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "అన్‌లాక్ కోడ్‌ను పంపుచున్నది..."
 
-#: ../src/applet-device-gsm.c:988
-msgid "SIM PIN unlock required"
-msgstr "SIM PIN అన్‌లాక్ అవసరమైంది"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ (%s)"
 
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN Unlock Required"
-msgstr "SIM PIN అన్‌లాక్ అవసరమైంది"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "మొబైల్ బ్రాడ్‌బాండ్"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr "మొబైల్ బ్రాడ్‌బాండ్ పరికరము '%s'ను వుపయోగించుటకు ముందుగా దానికి SIM PIN అవసరము."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "అందుబాటులోవుంది"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
-msgid "PIN code:"
-msgstr "PIN కోడ్:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "కొత్త మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
-msgid "Show PIN code"
-msgstr "పిన్  కోడ్ చూపుము:"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "అనుసంధానము యేర్పరచబడింది"
 
-#: ../src/applet-device-gsm.c:1000
-msgid "SIM PUK unlock required"
-msgstr "SIM PUK అన్‌లాక్ అవసరమైంది"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "మీరు యిప్పుడు మొబైల్ బ్రాడ్‌బ్యాండ్ నెట్వర్కునకు అనుసంధానించబడి వున్నారు."
 
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK Unlock Required"
-msgstr "SIM PUK అన్‌లాక్ అవసరమైంది"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ నెట్వర్కు సంకేతపదము"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr "మొబైల్ బ్రాడ్‌బాండ్ పరికరము '%s'ను వుపయోగించుటకు ముందుగా దానికి SIM PUK కోడ్ అవసరము."
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "మీరు యిప్పుడు హోమ్ నెట్వర్కునకు రిజిస్టరైనారు."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
-msgid "PUK code:"
-msgstr "PUK కోడ్:"
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "మీరు యిప్పుడు రోమింగ్  నెట్వర్కునకు రిజిస్టరైనారు."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "New PIN code:"
-msgstr "కొత్త PIN కోడ్:"
+#: ../src/applet-device-bt.c:88
+msgid "You are now connected to the mobile broadband network."
+msgstr "మీరు యిప్పుడు మొబైల్ బ్రాడ్‌బ్యాండ్ నెట్వర్కునకు అనుసంధానించబడి వున్నారు."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
-msgid "Re-enter new PIN code:"
-msgstr "కొత్త PIN కోడ్‌ను మరలా-ప్రవేశపెట్టుము:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' ప్రిపేర్ చేయబడుతోంది..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
-msgid "Show PIN/PUK codes"
-msgstr "PIN/PUK కోడ్ లను చూపుము:"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' ఆకృతీకరించబడుతోంది..."
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
-msgid "GSM network."
-msgstr "GSM నెట్వర్కు"
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' కొరకు వినియోగదారి దృవీకరణము అవసరమైంది..."
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' క్రియాశీలము"
+
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "స్వయంచాలక ఈథర్‌నెట్"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "వైర్‌తో నెట్వర్క్సు (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "వైర్‌తో నెట్వర్కు (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "వైర్‌తో నెట్వర్క్సు"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "వైర్‌తో నెట్వర్కు"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
-msgid "disconnected"
-msgstr "అననుసంధానించబడింది"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "మీరు యిప్పుడు వైర్ నెట్వర్కునకు అనుసంధానించబడినారు."
 
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "వైర్ నెట్వర్కు అనుసంధానమును సిద్దపరుస్తోంది '%s'..."
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "వైర్ నెట్వర్కు అనుసంధానము '%s'ను ఆకృతీకరిస్తోంది..."
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "వైర్ నెట్వర్కు అనుసంధానము '%s' కొరకు వినియోగదారి ధృవీకరణము అవసరమైంది..."
 
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' కొరకు వైర్ నెట్వర్కు చిరునామాను అభ్యర్దిస్తోంది..."
 
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "వైర్ నెట్వర్కు అనుసంధానము '%s' క్రియాశీలం"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL దృవీకరణము"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "మరుగునవున్న వైర్‌లేని నెట్వర్కుకు అనుసంధానమవ్వు... (_C)"
 
-#: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "కొత్త వైర్‌లేని నెట్వర్కును సృష్టించుము... (_N)"
 
-#: ../src/applet-device-wifi.c:292
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ఏదీకాదు)"
 
-#: ../src/applet-device-wifi.c:790
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "వైర్‌లేని నెట్వర్కులు (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "వైర్‌తో నెట్వర్క్సు (%s)"
 
-#: ../src/applet-device-wifi.c:792
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "వైర్‌లేని నెట్వర్కు (%s)"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "వైర్‌తో నెట్వర్కు (%s)"
 
-#: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "వైర్‌లేని నెట్వర్కు"
-msgstr[1] "వైర్‌లేని నెట్వర్కులు"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "వైర్‌తో నెట్వర్కు"
+msgstr[1] "వైర్‌తో నెట్వర్కు"
 
-#: ../src/applet-device-wifi.c:827
-msgid "wireless is disabled"
-msgstr "వైర్‌లేని విధం అచేతనమైంది"
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "WiMAX అచేతనమైంది"
 
-#: ../src/applet-device-wifi.c:828
-msgid "wireless is disabled by hardware switch"
-msgstr "వైర్‌లేని విధం హార్డ్ వేరు స్విచ్ తో అచేతనమైంది"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WIMAX హార్డ్వేరు స్విచ్ వల్ల నిరుపయోగమైబడినది"
 
-#: ../src/applet-device-wifi.c:889
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "మరిన్ని నెట్వర్కులు"
 
-#: ../src/applet-device-wifi.c:1068
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "వైర్‌లెస్ నెట్వర్కులు అందుబాటులోవున్నాయి"
 
-#: ../src/applet-device-wifi.c:1069
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "వైర్‌లెస్ నెట్వర్కునకు అనుసంధానమగుటకు నెట్వర్క్ మెనూని ఉపయోగించుము"
 
-#: ../src/applet-device-wifi.c:1072 ../src/applet.c:924
-msgid "Don't show this message again"
-msgstr "ఈ సందేశమును మరలా చూపవద్దు"
-
-#: ../src/applet-device-wifi.c:1263
+#: ../src/applet-device-wifi.c:1364
 #, c-format
-msgid "You are now connected to the wireless network '%s'."
-msgstr "మీరు యిప్పుడు వైర్‌లేని నెట్వర్కు '%s'కు అనుసంధానించబడినారు."
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr "మీరు యిప్పుడు వై-ఫై నెట్వర్కు '%s'కు అనుసంధానించబడినారు."
 
-#: ../src/applet-device-wifi.c:1294
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "వైర్‌లేని నెట్వర్కు అనుసంధానము '%s'ను సిద్దపరుస్తోంది..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "నెట్వర్కు అనుసంధానము '%s' సిద్దముచేయుచున్నది..."
 
-#: ../src/applet-device-wifi.c:1297
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "వైర్‌లేని నెట్వర్కు అనుసంధానము '%s'ను ఆకృతీకరిస్తోంది..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "వైర్ నెట్వర్కు అనుసంధానము '%s'ను ఆకృతీకరిస్తోంది..."
 
-#: ../src/applet-device-wifi.c:1300
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "వైర్‌లేని నెట్వర్కు '%s' కొరకు వినియోగదారి దృవీకరణము అవసరమైంది..."
 
-#: ../src/applet-device-wifi.c:1303
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "'%s' కొరకు వైర్‌లేని నెట్వర్కు చిరునామా అభ్యర్ధించుచున్నది..."
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "'%s' కొరకు నెట్వర్కు చిరునామాను అభ్యర్ధిస్తోంది..."
 
-#: ../src/applet-device-wifi.c:1324
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "వైర్‌లేని నెట్వర్కు అనుసంధానము '%s' క్రియాశీలము: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1329
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "వైర్‌లేని నెట్వర్కు అనుసంధానము '%s' క్రియాశీలం"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "వైర్ నెట్వర్కు అనుసంధానము '%s' క్రియాశీలం"
 
-#: ../src/applet-device-wifi.c:1377
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "అనుసంధానమును క్రియాత్మకం చేయుటలో విఫలం"
 
-#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
-#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
-msgid "Unknown error"
-msgstr "తెలియని దోషము"
-
-#: ../src/applet-device-wifi.c:1382 ../src/applet-device-wifi.c:1401
-#: ../src/applet.c:493 ../src/applet.c:563
-msgid "Connection failure"
-msgstr "అనుసంధానమగుట విఫలం"
-
-#: ../src/applet-device-wifi.c:1396
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "కొత్త అనుసంధానమును జతచేయుటలో విఫలము"
 
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX మొబైల్ బ్రాడ్‌బాండ్ (%s)"
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX మొబైల్ బ్రాడ్‌బాండ్"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "WiMAX అచేతనమైంది"
-
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WIMAX హార్డ్వేరు స్విచ్ వల్ల నిరుపయోగమైబడినది"
-
-#: ../src/applet-device-wimax.c:428
-msgid "You are now connected to the WiMAX network."
-msgstr "మీరు WiMAX నెట్వర్కునకు అనుసంధానించబడినారు."
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "అనుసంధానము సమాచారమును ప్రదర్శించుటలో దోషము:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:313
-#: ../src/libnm-gtk/nm-wireless-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "గతిక WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "చిరునామాలు"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/libnm-gtk/nm-wireless-dialog.c:905
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ఏదీకాదు"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (అప్రమేయ)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "తెలియదు"
 
-#: ../src/applet-dialogs.c:361
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:363
-msgctxt "WiMAX CINR"
-msgid "unknown"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
 msgstr "తెలియదు"
 
-#: ../src/applet-dialogs.c:375
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP చిరునామా:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "బ్రాడ్‌కాస్ట్ చిరునామా:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
 msgstr "తెలియదు"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "సబ్‌నెట్ మాస్క్:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ఈథర్‌నెట్ (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "సాధారణం"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "అంతరవర్తి:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "హార్డువేర్ చిరునామా:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "డ్రైవర్:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "వేగము:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "రక్షణ:"
 
-#: ../src/applet-dialogs.c:512
-msgid "CINR:"
-msgstr "సీఐయన్ ఆర్:"
-
-#: ../src/applet-dialogs.c:525
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "IP చిరునామా:"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "తెలియదు"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "బ్రాడ్‌కాస్ట్ చిరునామా:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "సబ్‌నెట్ మాస్క్:"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "తెలియదు"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "అప్రమేయ రూట్:"
 
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "ప్రాధమిక DNS:"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "ద్వితీయ DNS:"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "టర్నరీ DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "వదిలివేయినది"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN రకము :"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN గేట్‌వే"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN వినియోగదారినామము :"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN ధ్వజము :"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "పీఠము అనుసంధానము :"
 
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "తెలియదు"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "ఎటువంటి చెల్లునటువంటి క్రియాశీల అనుసంధానములు కనబడలేదు!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 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:942
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "మీ నెట్వర్కు పరికరములను మరియు అనుసంధానములను నిర్వహించుటకు ప్రకటన ప్రాంత ఆప్లెట్."
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "నెట్‌వర్క్ మ్యానేజర్ వెబ్‌సైట్"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "వనరులు తప్పిపోయినవి"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ నెట్వర్కు సంకేతపదము"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s'కు అనుసంధానమగుటకు వొక సంకేతపదము అవసరమైంది."
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "సంకేతపదము:"
 
-#: ../src/applet.c:488
-msgid "Failed to add/activate connection"
-msgstr "అనుసంధానమును సృష్టించడం/క్రియాత్మకం చేయుటలో విఫలమైనది"
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "SIM PIN అన్‌లాక్ అవసరమైంది"
 
-#: ../src/applet.c:532
-msgid "Device disconnect failed"
-msgstr "పరికరము అననుసంధానమురద్దు అగుటలో విఫలము"
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "SIM PIN అన్‌లాక్ అవసరమైంది"
 
-#: ../src/applet.c:537
-msgid "Disconnect failure"
-msgstr "అననుసంధానమురద్దు విఫలము"
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ పరికరము '%s'ను వుపయోగించుటకు ముందుగా దానికి SIM PIN అవసరము."
 
-#: ../src/applet.c:558
-msgid "Connection activation failed"
-msgstr "అనుసంధానం క్రియాత్మకంలో విఫలమైంది"
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "PIN కోడ్:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "పిన్  కోడ్ చూపుము:"
 
-#: ../src/applet.c:1013
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "SIM PUK అన్‌లాక్ అవసరమైంది"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "SIM PUK అన్‌లాక్ అవసరమైంది"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ పరికరము '%s'ను వుపయోగించుటకు ముందుగా దానికి SIM PUK కోడ్ అవసరము."
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "PUK కోడ్:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "కొత్త PIN కోడ్:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "కొత్త PIN కోడ్‌ను మరలా-ప్రవేశపెట్టుము:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే నెట్వర్కు అనుసంధానము ఆటంకపరచబడింది."
 
-#: ../src/applet.c:1016
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ అనుకోకుండా ఆపివేయబడింది."
+"IP చిరునామాలు మీ కంప్యూటర్‌ను నెట్వర్కునందు గుర్తించినవి.  IP చిరునామాను జతచేయుటకు \"జతచేయి\" "
+"బటన్ వత్తుము."
 
-#: ../src/applet.c:1019
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+#: ../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
+msgid "_Add"
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ చెల్లని ఆకృతీకరణను తిప్పియిచ్చింది."
 
-#: ../src/applet.c:1022
-#, c-format
+#. 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
+msgid "_Delete"
+msgstr "తొలగించు (_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే అనుసంధానపు ప్రయత్నం సమయం ముగిసింది."
+"చేతనపరచినట్లైతే, ఈ అనుసంధానము యెప్పుడూకూడా అప్రమేయ నెట్వర్కు అనుసంధానమువలె వుపయోగించబడదు."
 
-#: ../src/applet.c:1025
-#, c-format
+#: ../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…"
+msgstr "సృష్టించుము..."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "VPN అనుసంధానము విధమును  ఎంచుకొనుము"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"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."
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ సమయం లోపల ప్రారంభంకాలేదు."
+"కొత్త అనుసంధానము కొరకు మీరు వుపయోగించాలి అనుకొనుచున్న VPN రకమును యెంపికచేయుము  మీరు "
+"సృష్టించాలని అనుకొనుచున్న VPN అనుసంధానము రకము జాబితానందు కనిపించకపోతే, మీరు సరైన VPN ప్లగ్‌యిన్ "
+"సంస్థాపన కలిగివుండక పోవచ్చును."
 
-#: ../src/applet.c:1028
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr "రౌండ్-రాబిన్"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr "క్రియాశీల బ్యాకప్"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr "XOR"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr "బ్రాడ్‌కాస్ట్"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr "802.3ad"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr "అడాప్టివ్ ట్రాన్స్‌మిట్ లోడ్ బాలెన్సింగ్"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr "అడాప్టివ్ లోడ్ బాలెన్సింగ్"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr "MII (సిఫార్సుచేసిన)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr "ARP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+msgid "Bonded _connections:"
+msgstr "బాండెడ్ అనుసంధానములు (_c):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "సవరించు (_E)"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr "మానిటరింగ్ ఫ్రీక్వెన్సీ (_f):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+msgid "_Interface name:"
+msgstr "ఇంటర్ఫేస్ పేరు (_I):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr "లింక్ మానిటరింగ్ (_L):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr "ARP లక్ష్యాలు (_t):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ ప్రారంభమవుటలో విఫలమైంది."
+"లింక్ స్థితిని పరిశీలిస్తున్నప్పుడు చూడటానికి, ఒక ఐపి చిరునామా, లేదా కామాతో-వేరుచేసిన ఐపి చిరునామాల జాబితా."
 
-#: ../src/applet.c:1031
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr "లింక్ అప్ ఆలస్యం (_u):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr "లింక్ డౌన్ ఆలస్యం (_d):"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "ప్రాధమిక DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే అక్కడ చెల్లునటువంటి VPN రహస్యాలు లేవు."
 
-#: ../src/applet.c:1034
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+#: ../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:"
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "బైట్లు"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "రక్షణ(_e):"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "పీఠము అనుసంధానము :"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే చెల్లని VPN రహస్యాలు."
 
-#: ../src/applet.c:1041
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "నెట్వర్కింగ్ చేతనముచేయుము (_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "స్వయంచాలకం"
+
+#: ../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
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+msgid "default"
+msgstr "అప్రమేయ"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' విఫలమైంది."
 
-#: ../src/applet.c:1059
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "చిరునామా"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "చిరునామా"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+msgid "invalid %s for %s (%s)"
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' అననుసంధానించబడింది యెంచేతంటే నెట్వర్కు అనుసంధానము ఆటంకపరచబడింది."
 
-#: ../src/applet.c:1062
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+msgid "invalid %s (%s)"
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' అననుసంధానించబడింది యెంచేతంటే VPN సేవ ఆపివేయబడింది."
 
-#: ../src/applet.c:1068
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+msgid "invalid interface-name for %s (%s)"
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' అననుసంధానించబడింది."
 
-#: ../src/applet.c:1098
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid ""
-"VPN connection has been successfully established.\n"
-"\n"
-"%s\n"
+msgid "invalid interface-name (%s)"
 msgstr ""
-"VPN కనెక్షన్ విజయవంతంగా స్థాపించబడింది.\n"
-"\n"
-"%s\n"
 
-#: ../src/applet.c:1100
-msgid "VPN connection has been successfully established.\n"
-msgstr "VPN కనెక్షన్ విజయవంతంగా స్థాపించబడింది.\n"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "ఏ పరికరమైనా"
 
-#: ../src/applet.c:1102
-msgid "VPN Login Message"
-msgstr "VPN లాగిన్ సందేశము"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "తెలియని దోషము కారణంగా అనుసంధానము రహస్యాలు నవీకరించుటకు విఫలమైంది."
 
-#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
-msgid "VPN Connection Failed"
-msgstr "VPN అనుసంధానము విఫలమైంది"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "ఈ అనుసంధానము కొరకు 802.1_X రక్షణ వుపయోగించుము"
 
-#: ../src/applet.c:1173
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' విఫలమైంది యెంచేతంటే VPN సేవ ప్రారంభమగుటలో విఫలమైంది.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1176
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
 msgstr ""
-"\n"
-"VPN అనుసంధానము '%s' ప్రారంభమగుటలో విఫలమైంది.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1496
-msgid "device not ready (firmware missing)"
-msgstr "పరికరము సిద్దముకాలేదు (ఫర్మువేర్ తప్పిపోయినది)"
-
-#: ../src/applet.c:1498
-msgid "device not ready"
-msgstr "పరికరము సిద్దముకాలేదు"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1524
-msgid "Disconnect"
-msgstr "అననుసంధానించుము"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1538
-msgid "device not managed"
-msgstr "పరికరము నిర్వహించబడలేదు"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.c:1582
-msgid "No network devices available"
-msgstr "ఎటువంటి నెట్వర్కు పరికరములు అందుబాటులోలేవు"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.c:1670
-msgid "_VPN Connections"
-msgstr "_VPN అనుసంధానములు"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.c:1727
-msgid "_Configure VPN..."
-msgstr "VPN ఆకృతీకరించుము... (_C)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.c:1731
-msgid "_Disconnect VPN"
-msgstr "VPN అననుసంధానించుము (_D)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.c:1825
-msgid "NetworkManager is not running..."
-msgstr "నెట్‌వర్క్ మ్యానేజర్ నడుచుటలేదు..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.c:1830 ../src/applet.c:2631
-msgid "Networking disabled"
-msgstr "నెట్వర్కింగ్ అచేతనమైంది"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2051
-msgid "Enable _Networking"
-msgstr "నెట్వర్కింగ్ చేతనముచేయుము (_N)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2060
-msgid "Enable _Wireless"
-msgstr "వైర్‌లేని విధం చేతనముచేయుము (_W)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2069
-msgid "Enable _Mobile Broadband"
-msgstr "మొబైల్ బ్రాడ్‌బాండ్‌ను చేతనముచేయుము (_M)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2078
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMAX మొబైల్ బ్రాడ్‌బాండ్‌ను చేతనముచేయుము (_M)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#. Toggle notifications item
-#: ../src/applet.c:2089
-msgid "Enable N_otifications"
-msgstr "సూచన ప్రకటనలను చేతనముచేయుము (_o)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2100
-msgid "Connection _Information"
-msgstr "అనుసంధానము సమాచారము (_I)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2110
-msgid "Edit Connections..."
-msgstr "అనుసంధానములను సవరించు..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2124
-msgid "_Help"
-msgstr "సహాయము (_H)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2133
-msgid "_About"
-msgstr "గురించి (_A)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.c:2310
-msgid "Disconnected"
-msgstr "అననుసంధానించబడింది"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2311
-msgid "The network connection has been disconnected."
-msgstr "నెట్వర్కు అనుసంధానము అననుసంధానించబడింది."
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2494
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "నెట్వర్కు అనుసంధానము '%s' సిద్దముచేయుచున్నది..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2497
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "నెట్వర్కు అనుసంధానము '%s' కొరకు వినియోగదారి దృవీకరణము అవసరము..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:2503
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "నెట్వర్కు అనుసంధానము '%s' క్రియాశీలము"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:2586
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "VPN అనుసంధానము '%s'ను ప్రారంభించుచున్నది..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.c:2589
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "VPN అనుసంధానము '%s' కొరకు వినియోగదారి దృవీకరణము అవసరమైంది..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
 
-#: ../src/applet.c:2592
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "'%s' కొరకు VPN చిరునామాను అభ్యర్దించుచున్నది..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
 
-#: ../src/applet.c:2595
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "VPN అనుసంధానము '%s' క్రియాశీలం"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
 
-#: ../src/applet.c:2636
-msgid "No network connection"
-msgstr "నెట్వర్కు అనుసంధానము లేదు"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.c:3327
-msgid "NetworkManager Applet"
-msgstr "నెట్‌వర్క్ మ్యానేజర్ ఆప్లెట్"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "స్వయచాలకంగా ఈ పరికరమును అన్‌లాక్ చేయు"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "అన్‌లాక్ (_U)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Connection Information"
-msgstr "అనుసంధానము సమాచారము"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Active Network Connections"
-msgstr "క్రియాశీల నెట్వర్కు అనుసంధానములు"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "వైరు‌గల 802.1X ధృవీకరణము"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
-msgstr "నెట్వర్కు పేరు (_N):"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "స్వయంచాలకం"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:318
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "తెలియని దోషము కారణంగా అనుసంధానము రహస్యాలు నవీకరించుటకు విఫలమైంది."
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 msgstr ""
-"IP చిరునామాలు మీ కంప్యూటర్‌ను నెట్వర్కునందు గుర్తించినవి.  IP చిరునామాను జతచేయుటకు \"జతచేయి\" "
-"బటన్ వత్తుము."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-msgid "Ig_nore automatically obtained routes"
-msgstr "స్వయంచాలకంగా పొందినటువంటి రూట్లను వదిలివేయుము (_n)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "_Use this connection only for resources on its network"
-msgstr "ఈ నెట్వర్కు నందలి వనరులకొరకు ఈ అనుసంధానమును మాత్రమే వుపయోగించుము (_U)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:8
+#: ../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
@@ -1153,15 +1530,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 msgid "Sho_w password"
 msgstr "సంకేతపదమును చూపుము (_w)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../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
@@ -1169,15 +1548,167 @@ msgstr "సంకేతపదమును చూపుము (_w)"
 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-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#: ../src/connection-editor/page-ip6.c:142
+#: ../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
 msgid "Automatic"
 msgstr "స్వయంచాలకంగా"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "పురి జత(TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "అటాచ్ మెంట్ యూనిట్ ఇంటర్ఫేస్(AUI)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "మధ్యస్థత  స్వతంత్రమైన సంవిధానం(MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "పోర్ట్ (_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "వేగము (_S):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "పూర్తి డప్లెక్స్ (_x)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "స్వయంచాలకబదలాయింపు (_o)"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "సేవ (_S):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+msgid "C_loned MAC address:"
+msgstr "క్లోన్ చేయబడిన MAC చిరునామా (_l):"
+
+#: ../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 ""
+"ఇక్కడ యిచ్చినటువంటి MAC చిరునామా ఈ అనుసంధానము క్రియాశీలపరచబడిన నెట్వర్కు పరికరము కొరకు హార్డువేర్ "
+"చిరునామాగా వుపయోగించబడును. ఈ విశేషతను MAC క్లోనింగ్ లేదా స్పూఫింగ్‌గా తెలుపుబడుతోంది.  ఉదా: "
+"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.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "అప్రమేయ"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "వదిలివేయి"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "బ్రాడ్‌కాస్ట్ చిరునామా:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr "డాటాగ్రామ్"
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+msgid "Connected"
+msgstr "అనుసంధానించెను"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1185,8 +1716,8 @@ msgstr "నిర్దేశిక DNS అమరికలు తో స్వ�
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "మానవీయం"
 
@@ -1197,22 +1728,22 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "ఇంతర కంప్యూటర్లకు భాగస్వామ్యపరచబడింది"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "విధానము (_M):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "చిరునామాలు"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1221,8 +1752,8 @@ msgstr ""
 "మీ కంప్యూటర్ యొక్క ఆకృతీకరణను మలచుటకు DHCP క్లైంట్ గుర్తింపుదారి నెట్వర్కు నిర్వహణాధికారిని "
 "అనుమతించును.  మీరు DHCP క్లైంట్ గుర్తింపుదారిని వుపయోగించవలెనంటే, దానిని యిచట ప్రవేశపెట్టుము."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1230,26 +1761,25 @@ msgstr ""
 "హోస్ట్ నామములను పరిష్కరించునప్పుడు వుపయోగించిన డొమైన్స్. బహుళ డొమైన్లను వేరుచేయుటు కామాలను "
 "వుపయోగించుము."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "శోధించుము (_S) ఈ డొమైన్లను: "
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS సేవికలు:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1257,11 +1787,11 @@ msgstr ""
 "డొమైన్ నేమ్ సర్వర్ల యొక్క IP చిరునామాలు హోస్టు నామములను పరిష్కరించుటకు వుపయోగించబడెను. బహుళ డొమైన్ "
 "నేమ్ సర్వర్ చిరునామాలను వేరుచేయుటకు కామాలను వుపయోగించుము."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1269,16 +1799,43 @@ msgstr ""
 "IPv6-సామర్ధ్యపు నెట్వర్కులకు అనుసంధానమగునప్పుడు, IPv4 ఆకృతీకరణ విఫలమైతే అనుసంధానము పూర్తి "
 "అగుటకు అనుమతించును అయితే IPv6 సఫలమైతే."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "దారులు...(_R)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "అచేతనమైన"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 చిరునామాలు హోస్టు నామములను పరిష్కరించుటకు వుపయోగించబడెను. బహుళ డొమైన్ "
+"నేమ్ సర్వర్ చిరునామాలను వేరుచేయుటకు కామాలను వుపయోగించుము."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "ఈ అనుసంధానము పూర్తగుటకు IPv_6 చిరునామీకరణ అవసరము"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1287,63 +1844,38 @@ msgstr ""
 "పూర్తగుట అనుమతించును అయితే IPv4 ఆకృతీకరణ సఫలమైతే."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "ఏవైనా"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA) ప్రాధాన్యపరుచు"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE) ప్రాధాన్యపరుచు"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "Basic"
 msgstr "ప్రాథమికం"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "సంఖ్య (_m):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "అధునాతనం"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "నెట్వర్కు ID (_e):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "రకము (_T):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "మార్చు..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "పిన్ (_I):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "హోమ్ నెట్వర్కు అందుబాటులో లేకపోతే రోమింగ్‌ను అనుమతించుము(_r)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "సంకేతపదములను చూపుము (_w)"
 
@@ -1395,194 +1927,176 @@ msgstr "ప్రతిధ్వని"
 msgid "Send PPP _echo packets"
 msgstr "PPP _echo ప్యాకెట్లను పంపుము"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "పురి జత(TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "అటాచ్ మెంట్ యూనిట్ ఇంటర్ఫేస్(AUI)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "మధ్యస్థత  స్వతంత్రమైన సంవిధానం(MII)"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "పీఠము అనుసంధానము :"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+msgid "_Parent interface:"
+msgstr "పేరెంట్ ఇంటర్ఫేస్ (_P):"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "పోర్ట్ (_P):"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "క్లోన్ చేయబడిన MAC చిరునామా (_l):"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "వేగము (_S):"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr "VLAN _id:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "పూర్తి డప్లెక్స్ (_x)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "స్వయంచాలకబదలాయింపు (_o)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "_Device MAC address:"
-msgstr "పరికరము MAC చిరునామా (_D):"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "C_loned MAC address:"
-msgstr "క్లోన్ చేయబడిన MAC చిరునామా (_l):"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-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"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
 msgstr ""
-"ఇక్కడ యిచ్చినటువంటి MAC చిరునామా ఈ అనుసంధానము క్రియాశీలపరచబడిన నెట్వర్కు పరికరము కొరకు హార్డువేర్ "
-"చిరునామాగా వుపయోగించబడును. ఈ విశేషతను MAC క్లోనింగ్ లేదా స్పూఫింగ్‌గా తెలుపుబడుతోంది.  ఉదా: "
-"00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "_MTU:"
-msgstr "MTU(_M):"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
+msgstr "పరికరం పేరు + సంఖ్య"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "బైట్లు"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr "\"vlan\" + సంఖ్య"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr "రక్షణ(_e):"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "Infrastructure"
-msgstr "నిర్మాణము"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "బదిలీకరణ శక్తి (_w):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "రేటు (_R):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"ఈ ఐచ్చికము ఈ అనుసంధానమును BSSID ద్వారా ప్రవేశపెట్టబడిన వైర్‌లెస్ యాక్సిస్ పాయింట్ (AP)కు లాక్ చేయును. "
-"Example: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "ప్రసారమార్గము (_h):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "బాండ్ (_d):"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "M_ode:"
-msgstr "రీతి (_o):"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SSID(_I):"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "S_ecurity:"
-msgstr "రక్షణ(_e):"
+#: ../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:1
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
 msgid "Allowed Authentication Methods"
 msgstr "<b>అనుమతించిన ధృవీకరణ విధానములు</b>"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "పోడిగించదగు ఆథెంటికేషన్ ప్రోటోకాల్"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "సంకేతపదము ధృవీకరణ నిభందన"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "ఛాలెంజ్ హాండ్‌షేక్ ఆథెంటికేషన్ ప్రోటోకాల్"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "మైక్రోసాఫ్ట్ ఛాలెంజ్ హాండ్‌షేక్ ఆథెంటికేషన్ ప్రోటోకాల్"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "మైక్రోసాఫ్టు ఛాలెంజ్ హాండ్‌షేక్ ఆథెంటికేషన్ ప్రొటోకాల్ వర్షన్ 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1590,187 +2104,641 @@ msgstr ""
 "చాలా సందర్భాలలో, ఉత్పాదకుల PPP సేవికలు అన్ని దృవీకరణ విధానాలను మద్దతిస్తాయి. ఒకవేళ అనుసంధానములు "
 "విఫలమైతే, కొన్ని విధానాలకు మద్దతును అచేతనముచేయుటకు ప్రయత్నించుము."
 
-#: ../src/connection-editor/ce-vpn-wizard.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/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+#, fuzzy
+msgid "Ethernet"
+msgstr "స్వయంచాలక ఈథర్‌నెట్"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "VPN అనుసంధానము విధమును  ఎంచుకొనుము"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-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."
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
 msgstr ""
-"కొత్త అనుసంధానము కొరకు మీరు వుపయోగించాలి అనుకొనుచున్న VPN రకమును యెంపికచేయుము  మీరు "
-"సృష్టించాలని అనుకొనుచున్న VPN అనుసంధానము రకము జాబితానందు కనిపించకపోతే, మీరు సరైన VPN ప్లగ్‌యిన్ "
-"సంస్థాపన కలిగివుండక పోవచ్చును."
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Create…"
-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:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr "VLAN"
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/connection-helpers.c:196
+msgid "Hardware"
+msgstr "హార్డువేర్"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr "వర్చ్యువల్"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:911
-#: ../src/connection-editor/page-ip6.c:877
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+msgid "Import a saved VPN configuration..."
+msgstr "భద్రపరచిన VPN ఆకృతీకరణను దిగుమతిచేయి..."
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "తెలియని దోషము కారణంగా అనుసంధానము సరికూర్పరి డైలాగ్ సిద్దపరచబడలేక పోయింది."
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "కొత్త అనుసంధానమును సృష్టించలేక పోయింది"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "అనుసంధానము తొలగింపు విఫలమైంది"
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "మీరు ఖచ్చితంగా అనుసంధానము %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
 msgid "Address"
 msgstr "చిరునామా"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "నెట్‌మాస్క్"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
+#: ../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
 msgid "Gateway"
 msgstr "గేట్‌వే"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "మెట్రిక్"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "ప్రిఫిక్స్"
 
-#: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1518
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "సరికూర్చుచున్నది %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "పేరు-లేని అనుసంధానమును సరికూర్చుచున్నది"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "అనుసంధానము పేరు (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "సరికూర్పరి సిద్దపరచుటలో దోషము"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "అనుసంధానం జతచేయుట విఫలమైంది"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+msgstr ""
+"అనుసంధానము సరికూర్పరి అవసరమైన కొన్ని వనరులను కనుగొనలేక పోయింది (గ్లేడ్ ఫైలు కనుగొనబడలేదు)."
+
+#: ../src/connection-editor/nm-connection-editor.c:419
+msgid "_Save"
+msgstr "భద్రపరుచు (_S)"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "ఈ అనుసంధానమునకు చేసిన యే మార్పులనైనా దాయుము."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "ఈ మిషన్‌యొక్క వినియోగదారులందరికి ఈ అనుసంధానమును దాయుటకు దృవీకరించుము."
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not create connection"
+msgstr "అనుసంధానమును సృష్టించలేక పోయింది"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "అనుసంధానమును సరికూర్చలేక పోయింది"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr "అనుసంధానము సరికూర్పరి డైలాగును సృష్టించుటలో తెలియని దోషము."
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "సరికూర్పరి సిద్దపరచుటలో దోషము"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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/page-dsl.c:141
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
+msgid "Connection _name:"
+msgstr "అనుసంధానము పేరు (_n):"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+msgid "_Export..."
+msgstr "ఎగుమతి... (_E)"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "ఎప్పటికికాదు"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "ఇప్పుడు"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d సంవత్సరం క్రితం"
+msgstr[1] "%d సంవత్సరాల క్రితం"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "పేరు"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "చివరిగా వుపయోగించిన"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "ఎంపికచేసిన అనుసంధానమును సరికూర్చుము"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "ఎంపికచేసిన అనుసంధానమును సరికూర్చుటకు దృవీకరించుము"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "ఎంపికచేసిన అనుసంధానమును తొలగించుము"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "ఎంపికచేసిన అనుసంధానమును తొలగించుటకు ధృవీకరించుము"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "'%s' అనుసంధానమును ఎలా  సృష్టించలేక పోయింది"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "అనుసంధానము  సృష్టించుటలో దోషము."
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr "అనుసంధానమును సరికూర్చుటలో దోషం "
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "UUID '%s' తో ఒక సంభందం కనుగొన బడలేదు"
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "802.1x రక్షణ"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "WiFi రక్షణ వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
+
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr "ఈ అనుసంధానము కొరకు 802.1_X రక్షణ వుపయోగించుము"
+
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "బ్లూటూత్ పరికరమును కనుగొనలేక పోయినది."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "వైరుగల అనుసంధానము %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "నెట్వర్కింగ్ చేతనముచేయుము (_N)"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "వైర్‌లేని నెట్వర్కు"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
+msgstr "బాండ్ వాడుకరి ఇంటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "ప్రాధమిక DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, c-format
+msgid "Bond connection %d"
+msgstr "బాండ్ అనుసంధానము %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "వైరుగల అనుసంధానము %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "DSL వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-dsl.c:232
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL అనుసంధానము %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"ఇక్కడ ప్రవేశపెట్టిన శాశ్వత MAC చిరునామా ద్వారా తెలుపబడిన నెట్వర్కు పరికరమునకు ఈ ఐచ్చికము ఈ "
+"అనుసంధానమును లాక్ చేయును. ఉదాహరణ: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "ఈథర్‌నెట్ (%s)"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "క్లోన్ చేయబడిన MAC చిరునామా (_l):"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "అప్రమేయ"
+
+#: ../src/connection-editor/page-general.c:52
+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 "నెట్‌వర్క్ మ్యానేజర్ నడుచుటలేదు..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr "ఇన్ఫిబాండ్ వాడుకరి యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr "ఇన్ఫిబాండ్ అనుసంధానము %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "స్వయంచాలక (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "స్వయంచాలక (VPN) చిరునామా మాత్రమే"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "స్వయంచాలక (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "స్వయంచాలక (PPP) చిరునామా మాత్రమే"
+msgid "Automatic, addresses only"
+msgstr "స్వయంచాలక, చిరునామాలు మాత్రమే"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "స్వయంచాలక (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "స్వయంచాలక (PPPoE) చిరునామా మాత్రమే"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "స్వయంచాలక (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "స్వయంచాలక (DHCP) చిరునామా మాత్రమే"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "లింకు-స్థానిక మాత్రమే"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "అచేతనమైన"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "అదనపు _DNS సేవికలు:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "అదనపు శోధించుము (_S) ఈ డొమైన్లను: "
 
-#: ../src/connection-editor/page-ip4.c:843
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s కొరకు IPv4 రూట్లు సరికూర్చుచున్నది"
 
-#: ../src/connection-editor/page-ip4.c:992
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 అమరికలు"
 
-#: ../src/connection-editor/page-ip4.c:994
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 వినియోగదారి యింటర్ఫేస్ లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "స్వయంచాలక, చిరునామాలు మాత్రమే"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:280
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "వదిలివేయి"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "స్వయంచాలక ,DHCP మాత్రమే"
 
-#: ../src/connection-editor/page-ip6.c:809
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s కొరకు IPv6 రూట్లు సరికూర్చుట"
 
-#: ../src/connection-editor/page-ip6.c:956
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 అమరికలు"
 
-#: ../src/connection-editor/page-ip6.c:958
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr "%s స్లేవ్ %d"
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ వినియోగదారి యింటర్ఫేస్ లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "మద్దతీయనటువంటి మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము రకము."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:639
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ ఉత్పాదకుని రకమును యెంపికచేయుము"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1778,420 +2746,265 @@ msgstr ""
 "మీ మొబైల్ బ్రాడ్‌బాండ్ ఉత్పాదకుడు వుపయోగించు సాంకేతికతను యెంపికచేయుము.  మీకు నిర్ధారణ లేకపోతే, మీ "
 "ఉత్పాదకుడిని అడగండి."
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "నా ఉత్పాదకుడు _GSM-ఆధారిత సాంకేతికతను వాడుచున్నాడు (అనగా GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "నా ఉత్పాదకుడు C_DMA-ఆధారిత సాంకేతికతను వుపయోగించుచున్నాడు (అనగా 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ఏదీకాదు"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:282
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP అమరికలు"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP వినియోగదారి యింటర్ఫేస్ లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-#: ../src/connection-editor/nm-connection-list.c:1514
-msgid "VPN"
-msgstr "VPN"
+#: ../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 "దిగుమతి చేయుటకు ఫైలును యెంపికచేయుము"
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "వైరుగల అనుసంధానము %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "నెట్వర్కు అనుసంధానము లేదు"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "IPv4 వినియోగదారి యింటర్ఫేస్ లోడుచేయలేక పోయింది."
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, c-format
+msgid "VLAN connection %d"
+msgstr "VLAN అనుసంధానము %d"
+
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN వినియోగదారి యింటర్ఫేస్ లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' కొరకు VPN ప్లగ్‌యిన్ సేవను కనుగొనలేక పోయింది."
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:899
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN అనుసంధానము %d"
 
-#: ../src/connection-editor/page-wired.c:89
-#: ../src/connection-editor/page-wireless.c:94
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 msgstr ""
-"ఇక్కడ ప్రవేశపెట్టిన శాశ్వత MAC చిరునామా ద్వారా తెలుపబడిన నెట్వర్కు పరికరమునకు ఈ ఐచ్చికము ఈ "
-"అనుసంధానమును లాక్ చేయును. ఉదాహరణ: 00:11:22:33:44:55"
-
-#: ../src/connection-editor/page-wired.c:272
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:1502
-msgid "Wired"
-msgstr "వైరుగలవిధం"
-
-#: ../src/connection-editor/page-wired.c:274
-msgid "Could not load wired user interface."
-msgstr "వైరుగల వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
-
-#: ../src/connection-editor/page-wired.c:449
-#, c-format
-msgid "Wired connection %d"
-msgstr "వైరుగల అనుసంధానము %d"
+"VPN అనుసంధానమును సరిగా దిగుమతి చేయుటలో VPN ప్లగ్‌యిన్ విఫలమైంది\n"
+"\n"
+"దోషము: VPN సేవా రకములేదు."
 
-#: ../src/connection-editor/page-wired-security.c:119
-msgid "802.1x Security"
-msgstr "802.1x రక్షణ"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "VPN అనుసంధానము విధమును  ఎంచుకొనుము"
 
-#: ../src/connection-editor/page-wired-security.c:121
-msgid "Could not load Wired Security security user interface."
-msgstr "వయరు రక్షణ వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
+#: ../src/connection-editor/page-vpn.c:255
+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 ప్లగ్‌యిన్ "
+"సంస్థాపన కలిగివుండక పోవచ్చును."
 
-#: ../src/connection-editor/page-wired-security.c:139
-msgid "Use 802.1_X security for this connection"
-msgstr "ఈ అనుసంధానము కొరకు 802.1_X రక్షణ వుపయోగించుము"
+#: ../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 ద్వారా ప్రవేశపెట్టబడిన వైర్‌లెస్ యాక్సిస్ పాయింట్ (AP)కు లాక్ చేయును. "
+"Example: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
-#, c-format
-msgid "default"
-msgstr "అప్రమేయ"
+#: ../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)\""
+msgstr ""
+"ఇక్కడ ప్రవేశపెట్టిన శాశ్వత MAC చిరునామా ద్వారా తెలుపబడిన నెట్వర్కు పరికరమునకు ఈ ఐచ్చికము ఈ "
+"అనుసంధానమును లాక్ చేయును. ఉదాహరణ: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:457
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:1506
-msgid "Wireless"
-msgstr "వైరులేనివిధం"
-
-#: ../src/connection-editor/page-wireless.c:459
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "WiFi వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేక పోయింది."
 
-#: ../src/connection-editor/page-wireless.c:663
-#, c-format
-msgid "Wireless connection %d"
-msgstr "వైరులేని అనుసంధానము %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "ఏ పరికరమైనా"
 
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/libnm-gtk/nm-wireless-dialog.c:922
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "వైరుగల అనుసంధానము %d"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:300
-#: ../src/libnm-gtk/nm-wireless-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit సంకేతపదము"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:961
+#: ../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)"
 msgstr "గతిక(డైనమిక్) WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:340
-#: ../src/libnm-gtk/nm-wireless-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 వ్యక్తిగత"
 
-#: ../src/connection-editor/page-wireless-security.c:354
-#: ../src/libnm-gtk/nm-wireless-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 ఎంటర్‌ప్రైజ్"
 
-#: ../src/connection-editor/page-wireless-security.c:395
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "WiFi రక్షణ వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది; WiFi అమరిక తప్పిపోయింది."
 
-#: ../src/connection-editor/page-wireless-security.c:405
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "వైర్‌లేనివిధానికి రక్షణ"
 
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
 msgstr "WiFi రక్షణ వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
 
-#: ../src/connection-editor/nm-connection-editor.c:102
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Editing %s"
-msgstr "సరికూర్చుచున్నది %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:106
-msgid "Editing un-named connection"
-msgstr "పేరు-లేని అనుసంధానమును సరికూర్చుచున్నది"
-
-#: ../src/connection-editor/nm-connection-editor.c:292
-msgid ""
-"The connection editor could not find some required resources (the .ui file "
-"was not found)."
+msgid "missing SSID"
 msgstr ""
-"అనుసంధానము సరికూర్పరి అవసరమైన కొన్ని వనరులను కనుగొనలేక పోయింది (గ్లేడ్ ఫైలు కనుగొనబడలేదు)."
-
-#: ../src/connection-editor/nm-connection-editor.c:395
-msgid "Error creating connection editor dialog."
-msgstr "అనుసంధానము సరికూర్పరి డైలాగును సృష్టించుటలో దోషము."
-
-#: ../src/connection-editor/nm-connection-editor.c:407
-msgid "_Save"
-msgstr "భద్రపరుచు (_S)"
-
-#: ../src/connection-editor/nm-connection-editor.c:408
-msgid "Save any changes made to this connection."
-msgstr "ఈ అనుసంధానమునకు చేసిన యే మార్పులనైనా దాయుము."
-
-#: ../src/connection-editor/nm-connection-editor.c:409
-msgid "_Save..."
-msgstr "భద్రపరుచు (_S)"
-
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "ఈ మిషన్‌యొక్క వినియోగదారులందరికి ఈ అనుసంధానమును దాయుటకు దృవీకరించుము."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "_Import"
-msgstr "దిగుమతి (_I)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "E_xport"
-msgstr "ఎగుమతి (_x)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-msgid "Connection _name:"
-msgstr "అనుసంధానము పేరు (_n):"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-msgid "Connect _automatically"
-msgstr "స్వయంచాలకంగా అనుసంధానించుము (_a)"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "A_vailable to all users"
-msgstr "వినియోగదారులందరికి అందుబాటులోవుంది"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "ఎప్పటికికాదు"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "ఇప్పుడు"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d నిముషం క్రితం"
-msgstr[1] "%d నిముషాల క్రితం"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d గంట క్రితం"
-msgstr[1] "%d గంటల క్రితం"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d రోజు క్రితం"
-msgstr[1] "%d రోజుల క్రితం"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d నెల క్రితం"
-msgstr[1] "%d నెలల క్రితం"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d సంవత్సరం క్రితం"
-msgstr[1] "%d సంవత్సరాల క్రితం"
-
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "అనుసంధానం జతచేయుట విఫలమైంది"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "అనుసంధానము సమాచారమును దాచుటలో దోషము:"
-
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr " లక్షణము '%s' / '%s' చెల్లదు: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-msgstr "ఒక తెలియని దోషము సంభవించినది."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-msgstr "సరికూర్పరి సిద్దపరచుటలో దోషము"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:719
-#: ../src/connection-editor/nm-connection-list.c:885
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
-msgstr "తెలియని దోషము కారణంగా అనుసంధానము సరికూర్పరి డైలాగ్ సిద్దపరచబడలేక పోయింది."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "కొత్త అనుసంధానమును సృష్టించలేక పోయింది"
 
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "కొత్త అనుసంధానమును సరికూర్చలేకపోయింది"
-
-#: ../src/connection-editor/nm-connection-list.c:733
-msgid "Could not edit connection"
-msgstr "అనుసంధానమును సరికూర్చలేక పోయింది"
-
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "అనుసంధానము తొలగింపు విఫలమైంది"
-
-#: ../src/connection-editor/nm-connection-list.c:795
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "మీరు ఖచ్చితంగా అనుసంధానము %sను తొలగించుదామని అనుకొనుచున్నారా?"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:929
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN అనుసంధానమును దిగుమతి చేయలేకపోయింది"
 
-#: ../src/connection-editor/nm-connection-list.c:931
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"VPN అనుసంధానమును సరిగా దిగుమతి చేయుటలో VPN ప్లగ్‌యిన్ విఫలమైంది\n"
-"\n"
-"దోషము: VPN సేవా రకములేదు."
-
-#: ../src/connection-editor/nm-connection-list.c:944
-msgid "Could not edit imported connection"
-msgstr "దిగుమతిచేసిన అనుసంధానమును సరికూర్చలేకపోయింది"
-
-#: ../src/connection-editor/nm-connection-list.c:1125
-msgid "Name"
-msgstr "పేరు"
-
-#: ../src/connection-editor/nm-connection-list.c:1137
-msgid "Last Used"
-msgstr "చివరిగా వుపయోగించిన"
-
-#: ../src/connection-editor/nm-connection-list.c:1263
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr "VPN ప్లగిన్ లభ్యత లేదు. ఈ మీటను ఉపయోగించుటకు, దయచేసి ఒక ప్లగిన్ ను స్థాపించండి"
-
-#: ../src/connection-editor/nm-connection-list.c:1274
-msgid "_Edit"
-msgstr "సవరించు (_E)"
-
-#: ../src/connection-editor/nm-connection-list.c:1275
-msgid "Edit the selected connection"
-msgstr "ఎంపికచేసిన అనుసంధానమును సరికూర్చుము"
-
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "_Edit..."
-msgstr "సవరించు...(_E)"
-
-#: ../src/connection-editor/nm-connection-list.c:1277
-msgid "Authenticate to edit the selected connection"
-msgstr "ఎంపికచేసిన అనుసంధానమును సరికూర్చుటకు దృవీకరించుము"
-
-#: ../src/connection-editor/nm-connection-list.c:1292
-msgid "_Delete"
-msgstr "తొలగించు (_D)"
-
-#: ../src/connection-editor/nm-connection-list.c:1293
-msgid "Delete the selected connection"
-msgstr "ఎంపికచేసిన అనుసంధానమును తొలగించుము"
-
-#: ../src/connection-editor/nm-connection-list.c:1294
-msgid "_Delete..."
-msgstr "తొలగించుము...(_D)"
-
-#: ../src/connection-editor/nm-connection-list.c:1295
-msgid "Authenticate to delete the selected connection"
-msgstr "ఎంపికచేసిన అనుసంధానమును తొలగించుటకు ధృవీకరించుము"
-
-#: ../src/connection-editor/nm-connection-list.c:1574
-msgid "Error creating connection"
-msgstr "అనుసంధానము  సృష్టించుటలో దోషము."
-
-#: ../src/connection-editor/nm-connection-list.c:1575
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "'%s' అనుసంధానమును ఎలా  సృష్టించలేక పోయింది"
-
-#: ../src/connection-editor/nm-connection-list.c:1630
-#: ../src/connection-editor/nm-connection-list.c:1642
-msgid "Error editing connection"
-msgstr "అనుసంధానమును సరికూర్చుటలో దోషం "
-
-#: ../src/connection-editor/nm-connection-list.c:1631
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "'%s'అనుసంధానమును ఎలా సరికూర్చాలో తెలియుటలేదు"
-
-#: ../src/connection-editor/nm-connection-list.c:1643
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "UUID '%s' తో ఒక సంభందం కనుగొన బడలేదు"
-
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2203,29 +3016,30 @@ msgstr ""
 "\n"
 "దోషము: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:263
-msgid "Select file to import"
-msgstr "దిగుమతి చేయుటకు ఫైలును యెంపికచేయుము"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "తెలియని దోషము"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" నామముతో వొక ఫైలు యిప్పటికేవుంది."
 
-#: ../src/connection-editor/vpn-helpers.c:316
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "పునఃస్థాపించు (_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:318
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:354
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN అనుసంధానమును ఎగుమతిచేయలేదు"
 
-#: ../src/connection-editor/vpn-helpers.c:356
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2236,116 +3050,58 @@ msgstr ""
 "\n"
 "దోషము: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:391
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN అనుసంధానమును ఎగుమతిచేయుము..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "కొత్త  PAN అనుసంధానమును సృష్టించలేక పోయింది: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "మీ ఫోన్ యిప్పుడు వుపయోగించుటకు సిద్దముగావుంది!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:249
-#, c-format
-msgid "%s Network"
-msgstr "%s నెట్వర్కు"
-
-#: ../src/gnome-bluetooth/bt-widget.c:375
-#, c-format
-msgid "Error: %s"
-msgstr "దోషము: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:488
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "కొత్త అనుసంధానమును సృష్టించడంలో దోషం:%s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:511
-msgid "Mobile wizard was canceled"
-msgstr "మొబైల్ విజార్డ్ రద్దుచేయబడినది"
-
-#: ../src/gnome-bluetooth/bt-widget.c:520
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "తెలియని ఫోన్ పరికరము రకము (GSM కాదు CDMA కాదు)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
-msgid "failed to connect to the phone."
-msgstr "ఫోన్‌నకు అనుసంధానమగుటకు విఫలమైంది."
-
-#: ../src/gnome-bluetooth/bt-widget.c:753
-msgid "unexpectedly disconnected from the phone."
-msgstr "ఫోన్‌నుండి అనుకొకుండా అననుసంధానమైంది."
-
-#: ../src/gnome-bluetooth/bt-widget.c:762
-msgid "timed out detecting phone details."
-msgstr "ఫోన్ వివరములను గుర్తించుటలో సమయం మించినది."
-
-#: ../src/gnome-bluetooth/bt-widget.c:774
-msgid "Detecting phone configuration..."
-msgstr "ఫోన్ ఆకృతీకరణను గుర్తించుచున్నది..."
-
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "బ్లూటూత్ పరికరమును కనుగొనలేక పోయినది."
-
-#: ../src/gnome-bluetooth/bt-widget.c:980
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"డయిల్-అప్-నెట్వర్కింగ్ అనుసంధానమును అమర్చుటకు ముందుగా అప్రమేయ బ్లూటూత్ యెడాప్టర్ తప్పక చేతనము "
-"చేయబడవలెను."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1012
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
-msgstr "బ్లూటూత్ ఆకృతీకరణ సాధ్యం కాదు (D-Busకు అనుసంధానమగుటలో విఫలమైంది: %s)."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr "నెట్‌వర్క్ మ్యానేజర్ ఆప్లెట్ కొన్ని అవసరమైన వనరులను కనుగొనలేకపోయింది(.ui ఫైలు కనుగొనబడలేదు)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "బ్లూటూత్ ఆకృతీకరణ సాధ్యం కాదు (D-Bus ప్రోక్సీ సృష్టించుటలో విఫలమైంది)."
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "అన్‌లాక్ (_U)"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1031
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "బ్లూటూత్ ఆకృతీకరణ సాధ్యం కాదు (NetworkManagerను కనుగొనుటలో దోషము: %s)."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "స్వయచాలకంగా ఈ పరికరమును అన్‌లాక్ చేయు"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1098
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "మీ మొబైల్ ఫోన్‌ను నెట్వర్కు పరికరము వలె వుపయోగించుము (PAN/NAP)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "అనుసంధానము సమాచారము"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1107
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "మీ మొబైల్ ఫోన్ వుపయోగించి యింటర్నెట్‌ను యాక్సెస్ చేయుము (DUN)"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "క్రియాశీల నెట్వర్కు అనుసంధానములు"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
+#: ../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/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "మీ పరికరము:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "మీ ఉత్పాదకుడు:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "మీ ప్లాన్:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
+#: ../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 "
@@ -2358,23 +3114,28 @@ msgstr ""
 "అమర్పులను వొకటికిరెండుసార్లు పరిశీలించండి.  మీ మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము అమరికలను మార్చుటకు, "
 "సిస్టమ్ >> అభీష్టాలు మెనూనుండి \"నెట్వర్కు అనుసంధానాలు\" యెంచుకొనుము."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:264
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ అమరికలను నిర్ధారించుము"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "జాబితాచేయని"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "మీ ప్లాన్ యెంపికచేయుము (_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../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/libnm-gtk/nm-mobile-wizard.c:528
+#: ../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"
@@ -2386,68 +3147,84 @@ msgstr ""
 "\n"
 "మీరు మీ ప్లాన్ పట్ల నిర్ధారణతో లేకపోతే మీ ప్లానుయొక్క APN కొరకు దయచేసి మీ ఉత్పాదకునిని అడుగండి."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "మీ బిల్లింగ్ ప్లానును యెంచుకొనుము"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "నా ప్లాను జాబితాచేసి లేదు..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../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/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ఉత్పాదకుడు"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../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/libnm-gtk/nm-mobile-wizard.c:789
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "ఉత్పాదకుడు:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../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/libnm-gtk/nm-mobile-wizard.c:819
+#: ../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/libnm-gtk/nm-mobile-wizard.c:830
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "మీ ఉత్పాదకునిని యెంచుకొనుము"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1081
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "దేశము లేదా ప్రాంతం  జాబితా:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1093
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "దేశము లేదా ప్రాంతం  జాబితా:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "నా దేశము జాబితాచేసి లేదు"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1146
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1200
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "సంస్థాపించిన GSM పరికరము"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1203
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "సంస్థాపించిన CDMA పరికరము"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1375
+#: ../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."
@@ -2455,113 +3232,215 @@ msgstr ""
 "సెల్యులార్ (3G) నెట్వర్కునకు మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానమును సులువుగా అమర్చుటకు ఈ సహాయకి మీకు "
 "తోడ్పడుతుంది."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1380
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "మీకు ఈ క్రింది సమాచారము అవసరమౌతుంది:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1395
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "మీ బ్రాడ్‌బాండ్ ఉత్పాదకుని నామము"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1401
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "మీ బ్రాడ్‌బాండ్ బిల్లింగ్ ప్లాన్ నామము"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../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 "ఈ మొబైల్ బ్రాడ్‌బాండ్ పరికరము కొరకు అనుసంధానమును సృష్టించుము (_t):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1449
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "ఏ పరికరమైనా"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానమును అమర్చుము"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1626
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "కొత్త మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "సంకేతపదము (_P):"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "సంకేతపదము (_P):"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "సంకేతపదములను చూపుము (_w)"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "కొత్త..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1076
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ఏదీకాదు"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "సృష్టించుము (_r)"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "వైరులేని నెట్వర్కు '%s'ను యాక్సిస్ చేసుకొనుటకు సంకేతపదములు లేదా ఎన్క్రిప్షన్ కీలు అవసరము."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1162
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "వైరులేని నెట్వర్కు ధృవీకరణము అవసరమైంది"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "వైరులేని నెట్వర్కుద్వారా ధృవీకరణము అవసరమైంది"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "కొత్త వైరులేని నెట్వర్కు సృష్టించుము"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1171
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "కొత్త వైరులేని నెట్వర్కు"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "మీరు సృష్టించాలని అనుకొనుచున్న వైరులేని నెట్వర్కునకు వొక నామమును ప్రవేశపెట్టుము."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1174
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "మరుగునవున్న వైరులేని నెట్వర్కునకు అనుసంధానించు"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1176
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "మరుగునవున్న వైరులేని నెట్వర్కు"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "మీరు అనుసంధానం కావాలనుకొన్న మరుగునవుండు వైరులేని నెట్వర్కుయొక్క రక్షణ వివరములను మరియు నామమును "
 "ప్రవేశపెట్టుము."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
 msgstr "వైర్‌లెస్ రక్షణ (_W):"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "అనుసంధానము (_n):"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
 msgstr "వైర్‌లెస్ ఎడాప్టర్ (_a):"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "వినియోగము:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"ఈ ప్రోగ్రామ్ నెట్‌వర్క్ మ్యానేజర్ యొక్క అంతర్భాగము (https://wiki.gnome.org/Projects/NetworkManager/)."
+"ఈ ప్రోగ్రామ్ నెట్‌వర్క్ మ్యానేజర్ యొక్క అంతర్భాగము (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -2569,120 +3448,156 @@ msgstr ""
 "ఇది కమాండ్-లైన్ యింటరాక్షన్ కొరకు వుద్దేశించినది కాదు అయితే బదులుగా GNOME డెస్కుటాప్ వాతావరణంనందు "
 "నడుపవచ్చును."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "చేతనము కాబడలేదు"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "నమోదుకాలేదు"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "హోమ్ నెట్వర్కు (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "హోమ్ నెట్వర్కు"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "శోధించుచున్నది"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "నమోదీకరణ తిరస్కరించబడినది"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../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:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (రోమింగ్)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "రోమింగ్ నెట్వర్కు (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "రోమింగ్ నెట్వర్కు"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "అప్రమేయ"
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "'%s' పై '%s'సిమ్ కార్డ్ కొరకు పిన్ కోడ్ "
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr "నెట్‌వర్క్ మ్యానేజర్ ఆప్లెట్ కొన్ని అవసరమైన వనరులను కనుగొనలేకపోయింది(.ui ఫైలు కనుగొనబడలేదు)."
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "PIN కోడ్ అవసరమైంది"
 
-#: ../src/wireless-security/eap-method.c:274
-msgid "No Certificate Authority certificate chosen"
-msgstr "ఎటువంటి దృవీకరణపత్ర అధికారిక ధృవీకరణపత్రము యెంచుకొనబడలేదు"
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ పరికరము కొరకు PIN కోడ్ అవసరమైంది"
 
-#: ../src/wireless-security/eap-method.c:275
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "మొబైల్ బ్రాడ్‌బాండ్ అనుసంధానము '%s' క్రియాశీలముగా వుంది: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "రోమింగ్"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "పీఠము అనుసంధానము :"
+
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"ధృవీకరణపత్ర అధికారికం (CA) ధృవీకరణపత్రము వుపయోగించకపోవుట వలన అనుసంధానములు రక్షణలేకుండా "
-"అవుతాయి, మోసపూరిత వైరులేని నెట్వర్కులు.  మీరు ధృవీకరణపత్ర అధికారికం ధృవీకరణపత్రమును యెంచుకొనుటకు "
-"యిష్టపడతారా?"
 
-#: ../src/wireless-security/eap-method.c:284
-msgid "Choose CA Certificate"
-msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:643
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:646
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER లేదా PEM ధృవీకరణపత్రములు (*.der, *.pem, *.crt, *.cer)"
 
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr "GTC"
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr "ఒక PAC దస్త్రమును ఎంచుకొనుము"
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr "PAC ఫైళ్ళు (*.PAC)"
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr "అన్ని ఫైళ్ళు"
+
 #: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr " గుర్తింపులేని"
@@ -2706,8 +3621,8 @@ msgid "PAC _file:"
 msgstr "PAC ఫైలు (_f):"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "లోపలి దృవీకరణము (_I):"
 
@@ -2715,31 +3630,32 @@ msgstr "లోపలి దృవీకరణము (_I):"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "PAC అవకాశాన్ని స్వయంచాలకంగా అనుమతించు(_v):"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
-msgid "GTC"
-msgstr "GTC"
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "ఒక PAC దస్త్రమును ఎంచుకొనుము"
+#: ../src/wireless-security/eap-method-leap.c:69
+msgid "missing EAP-LEAP password"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:406
-msgid "PAC files (*.pac)"
-msgstr "PAC ఫైళ్ళు (*.PAC)"
+#: ../src/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:410
-msgid "All files"
-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:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "ధృవీకరణపత్ర అధికారికం ధృవీకరణపత్రమును యెంచుకొనుము..."
 
@@ -2757,19 +3673,56 @@ msgstr "ముద్రణ 1"
 msgid "C_A certificate:"
 msgstr "C_A ధృవీకరణపత్రము:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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
+msgid "No CA certificate is _required"
+msgstr "CA ధృవీకరణపత్రము అవసరంలేదు (_r):"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "PEAP వర్షన్(_v):"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "ఈ సంకేతపదము కొరకు ప్రతిసారి ఆడుగుము (_k)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A ధృవీకరణపత్రము:"
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "ఎన్క్రిప్టుచేయని వ్యక్తిగత కీలు సురక్షితంకావు"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../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 "
@@ -2782,11 +3735,11 @@ msgstr ""
 "\n"
 "(మీరు మీ వ్యక్తిగత కీను openssl సంకేతపదము-రక్షణతో రక్షించుకొనగలరు)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "మీ వ్యక్తిగత ధృవీకరణపత్రమును యెంచుకొనుము..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "మీ వ్యక్తిగత కీను యెంచుకొనుము..."
 
@@ -2798,27 +3751,44 @@ msgstr "గుర్తింపు (_d):"
 msgid "_User certificate:"
 msgstr "వినియోగదారి దృవీకరణపత్రము (_U):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "వ్యక్తిగత కీ (_k):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "వ్యక్తిగత కీ సంకేతపదము (_P):"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "టన్నెల్డ్ TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "సురక్షిత EAP (PEAP)"
 
@@ -2828,29 +3798,55 @@ msgstr "సురక్షిత EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "ధృవీకరణ (_t):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "తెరిచిన సిస్టమ్"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "భాగస్వామ్య కీ"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:4
-msgid "2"
-msgstr "2"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "3"
+msgid "Open System"
+msgstr "తెరిచిన సిస్టమ్"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "4"
+msgid "Shared Key"
+msgstr "భాగస్వామ్య కీ"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -2864,6 +3860,254 @@ msgstr "కీను చూపుము (_w)"
 msgid "WEP inde_x:"
 msgstr "WEP విషయసూచిక (_x):"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "రకము (_T):"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "కొత్త మొబైల్ బ్రాడ్‌బాండ్ (CDMA) అనుసంధానము..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "మీరు CDMA నెట్వర్కునకు అనుసంధానించబడినారు."
+
+#~ msgid "CDMA network."
+#~ msgstr "సిడియంఏ నెట్వర్కు."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "కొత్త మొబైల్ బ్రాడ్‌బాండ్ (GSM) అనుసంధానము..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "మీరు యిప్పడు GSM నెట్వర్కునకు అనుసంధానించబడినారు."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM నెట్వర్కు"
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "వైర్‌లేని నెట్వర్కులు (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "వైర్‌లేని నెట్వర్కు (%s)"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "వైర్‌లేని విధం అచేతనమైంది"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "వైర్‌లేని విధం హార్డ్ వేరు స్విచ్ తో అచేతనమైంది"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "వైర్‌లేని నెట్వర్కు అనుసంధానము '%s'ను సిద్దపరుస్తోంది..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "వైర్‌లేని నెట్వర్కు అనుసంధానము '%s'ను ఆకృతీకరిస్తోంది..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "'%s' కొరకు వైర్‌లేని నెట్వర్కు చిరునామా అభ్యర్ధించుచున్నది..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "వైర్‌లేని నెట్వర్కు అనుసంధానము '%s' క్రియాశీలం"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX మొబైల్ బ్రాడ్‌బాండ్ (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX మొబైల్ బ్రాడ్‌బాండ్"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "మీరు WiMAX నెట్వర్కునకు అనుసంధానించబడినారు."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "తెలియదు"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "తెలియదు"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "సీఐయన్ ఆర్:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "ద్వితీయ DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "టర్నరీ DNS:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "WiMAX మొబైల్ బ్రాడ్‌బాండ్‌ను చేతనముచేయుము (_M)"
+
+#~ msgid "_Help"
+#~ msgstr "సహాయము (_H)"
+
+#~ msgid "Any"
+#~ msgstr "ఏవైనా"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA) ప్రాధాన్యపరుచు"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE) ప్రాధాన్యపరుచు"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "పరికరము MAC చిరునామా (_D):"
+
+#~ msgid "Infrastructure"
+#~ msgstr "నిర్మాణము"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "స్వయంచాలక (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "స్వయంచాలక (PPP) చిరునామా మాత్రమే"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "వయరు రక్షణ వినియోగదారి యింటర్ఫేస్‌ను లోడుచేయలేకపోయింది."
+
+#~ msgid "Wireless"
+#~ msgstr "వైరులేనివిధం"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "వైరులేని అనుసంధానము %d"
+
+#~ msgid "_Save..."
+#~ msgstr "భద్రపరుచు (_S)"
+
+#~ msgid "_Import"
+#~ msgstr "దిగుమతి (_I)"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "స్వయంచాలకంగా అనుసంధానించుము (_a)"
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "వినియోగదారులందరికి అందుబాటులోవుంది"
+
+#~ msgid "Error saving connection"
+#~ msgstr "అనుసంధానము సమాచారమును దాచుటలో దోషము:"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr " లక్షణము '%s' / '%s' చెల్లదు: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "ఒక తెలియని దోషము సంభవించినది."
+
+#~ msgid "Could not edit new connection"
+#~ msgstr "కొత్త అనుసంధానమును సరికూర్చలేకపోయింది"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "దిగుమతిచేసిన అనుసంధానమును సరికూర్చలేకపోయింది"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr "VPN ప్లగిన్ లభ్యత లేదు. ఈ మీటను ఉపయోగించుటకు, దయచేసి ఒక ప్లగిన్ ను స్థాపించండి"
+
+#~ msgid "_Edit..."
+#~ msgstr "సవరించు...(_E)"
+
+#~ msgid "_Delete..."
+#~ msgstr "తొలగించుము...(_D)"
+
+#~ 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 "మీ ఫోన్ యిప్పుడు వుపయోగించుటకు సిద్దముగావుంది!"
+
+#~ msgid "%s Network"
+#~ msgstr "%s నెట్వర్కు"
+
+#~ msgid "Error: %s"
+#~ msgstr "దోషము: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "కొత్త అనుసంధానమును సృష్టించడంలో దోషం:%s"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "మొబైల్ విజార్డ్ రద్దుచేయబడినది"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "తెలియని ఫోన్ పరికరము రకము (GSM కాదు CDMA కాదు)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "ఫోన్‌నకు అనుసంధానమగుటకు విఫలమైంది."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "ఫోన్‌నుండి అనుకొకుండా అననుసంధానమైంది."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "ఫోన్ వివరములను గుర్తించుటలో సమయం మించినది."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "ఫోన్ ఆకృతీకరణను గుర్తించుచున్నది..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "డయిల్-అప్-నెట్వర్కింగ్ అనుసంధానమును అమర్చుటకు ముందుగా అప్రమేయ బ్లూటూత్ యెడాప్టర్ తప్పక చేతనము "
+#~ "చేయబడవలెను."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr "బ్లూటూత్ ఆకృతీకరణ సాధ్యం కాదు (D-Busకు అనుసంధానమగుటలో విఫలమైంది: %s)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "బ్లూటూత్ ఆకృతీకరణ సాధ్యం కాదు (D-Bus ప్రోక్సీ సృష్టించుటలో విఫలమైంది)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr "బ్లూటూత్ ఆకృతీకరణ సాధ్యం కాదు (NetworkManagerను కనుగొనుటలో దోషము: %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "మీ మొబైల్ ఫోన్‌ను నెట్వర్కు పరికరము వలె వుపయోగించుము (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "మీ మొబైల్ ఫోన్ వుపయోగించి యింటర్నెట్‌ను యాక్సెస్ చేయుము (DUN)"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "ఎటువంటి దృవీకరణపత్ర అధికారిక ధృవీకరణపత్రము యెంచుకొనబడలేదు"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "ధృవీకరణపత్ర అధికారికం (CA) ధృవీకరణపత్రము వుపయోగించకపోవుట వలన అనుసంధానములు రక్షణలేకుండా "
+#~ "అవుతాయి, మోసపూరిత వైరులేని నెట్వర్కులు.  మీరు ధృవీకరణపత్ర అధికారికం ధృవీకరణపత్రమును "
+#~ "యెంచుకొనుటకు యిష్టపడతారా?"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "CA ధృవీకరణపత్రమును యెంచుకొనుము"
+
 #~ msgid "_Security:"
 #~ msgstr "రక్షణ (_S):"
 
@@ -2873,9 +4117,6 @@ msgstr "WEP విషయసూచిక (_x):"
 #~ msgid "United Kingdom"
 #~ msgstr "యునైటెడ్ కింగ్‌డమ్"
 
-#~ msgid "Network Manager"
-#~ msgstr "నెట్వర్కు నిర్వాహిక"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "nm-applet యొక్క వొక సంభవం యిప్పటికే నడుచుచున్నది.\n"
 
@@ -2913,9 +4154,6 @@ msgstr "WEP విషయసూచిక (_x):"
 #~ "వర్షన్ 0\n"
 #~ "వర్షన్ 1"
 
-#~ msgid "C_onnect"
-#~ msgstr "అనుసంధానించు (_o)"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "ఇతర వైర్‌లెస్ నెట్వర్కు..."
 
diff --git a/po/tg.po b/po/tg.po
index 19b4c7bf..2249be5a 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet nma-0-9-8\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-02-07 11:44+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -19,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Шабака"
 
@@ -139,50 +138,95 @@ msgid ""
 "authentication."
 msgstr "Огоҳиҳо"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "зербарнома"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "зербарнома"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "Санҷиши ҳаққонияти 802.1X"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+#, fuzzy
+msgid "C_onnect"
+msgstr "Пайваст шудааст"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "_Номи шабака:"
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 #, fuzzy
 msgid "Failed to add/activate connection"
 msgstr "Иловакунии пайваст қатъ шудааст"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Хатои номаълум"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Вайроншавии пайваст"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 #, fuzzy
 msgid "Device disconnect failed"
 msgstr "Қатъ _кардани пайваст"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 #, fuzzy
 msgid "Disconnect failure"
 msgstr "Нокомӣ."
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Фаъолсозии пайваст қатъ шудааст"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 #, fuzzy
 msgid "Don't show this message again"
 msgstr "Дигар намоиш надодани ин паём."
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -192,7 +236,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки пайвасти шабака қатъ шудааст."
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -201,7 +245,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки хидмати VPN ногаҳон манъ шудааст."
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -212,7 +256,7 @@ msgstr ""
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки хидмати VPN танзимоти беэътиборро "
 "ирсол кард."
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -222,7 +266,7 @@ msgstr ""
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки вақти кӯшиши пайваст ба анҷом "
 "расидааст."
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -232,7 +276,7 @@ msgstr ""
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки хидмати VPN дар вақташ оғоз "
 "нашудааст."
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -241,7 +285,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки оғози хидмати VPN қатъ шудааст."
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -250,7 +294,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки паролҳои VPN нодурустанд."
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -259,7 +303,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки паролҳои VPN нодурустанд."
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -268,7 +312,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст."
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -278,7 +322,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки пайвасти шабака қатъ карда шудааст."
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -287,7 +331,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст, зеро ки хидмати VPN манъ шудааст."
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -296,7 +340,7 @@ msgstr ""
 "\n"
 "Пайвасти VPN '%s' қатъ шудааст."
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, fuzzy, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -307,20 +351,20 @@ msgstr ""
 "\n"
 "Хатогӣ: %s."
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 #, fuzzy
 msgid "VPN connection has been successfully established.\n"
 msgstr "пайваст бо муваффақият иҷро шудааст"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Паёми воридшавии VPN"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Пайвасти VPN қатъ шудааст"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -333,7 +377,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -346,897 +390,615 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 #, fuzzy
 msgid "device not ready (firmware missing)"
 msgstr "Эҳтимол аст, ки дастгоҳ нармафзори дарунсохтро надорад"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 #, fuzzy
 msgid "device not ready"
 msgstr "Тайёр"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 #, fuzzy
 msgid "disconnected"
 msgstr "Қатъшуда"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Қатъ кардани пайваст"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 #, fuzzy
 msgid "device not managed"
 msgstr "Ин дастгоҳ бо рангҳо идора намешавад."
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 #, fuzzy
 msgid "No network devices available"
 msgstr "Ягон дастгоҳи мултидиск дастрас нест"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_Пайвастҳои VPN"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Танзим кардани VPN..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "_Қатъ кардани пайвасти VPN"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 #, fuzzy
 msgid "NetworkManager is not running..."
 msgstr "Иҷро нашудааст"
 
-#: ../src/applet.c:1970 ../src/applet.c:2940
+#: ../src/applet.c:1620 ../src/applet.c:2612
 #, fuzzy
 msgid "Networking disabled"
 msgstr "Пайвасти шабакавӣ ғайрифаъол аст"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 #, fuzzy
 msgid "Enable _Networking"
 msgstr "Фаъол кардани шабака"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 #, fuzzy
 msgid "Enable _Wi-Fi"
 msgstr "Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 #, fuzzy
 msgid "Enable _Mobile Broadband"
 msgstr "Паҳннавори мобилӣ"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-#, fuzzy
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Паҳннавори мобилӣ"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 #, fuzzy
 msgid "Enable N_otifications"
 msgstr "_Фаъол кардан"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Иттилооти _пайвастшавӣ"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Таҳрир кардани пайвастҳо..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "_Кӯмак"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Дар бораи барнома"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Шумо ба '%s' пайваст шудед."
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Қатъшуда"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 #, fuzzy
 msgid "The network connection has been disconnected."
 msgstr "Пайваст рад карда шудааст"
 
-#: ../src/applet.c:2802
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Омодасозии пайвасти шабакавии '%s'..."
 
-#: ../src/applet.c:2805
+#: ../src/applet.c:2477
 #, fuzzy, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "Шабакаи бесим санҷиши ҳаққониятро талаб мекунад"
 
-#: ../src/applet.c:2808 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, fuzzy, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Суроғаи шабакавӣ"
 
-#: ../src/applet.c:2811
+#: ../src/applet.c:2483
 #, fuzzy, c-format
 msgid "Network connection '%s' active"
 msgstr "Пайвасти шабакавии '%s' фаъол аст"
 
-#: ../src/applet.c:2894
+#: ../src/applet.c:2557
 #, fuzzy, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Пайвасти VPN-и '%s' фаъол аст"
 
-#: ../src/applet.c:2897
+#: ../src/applet.c:2560
 #, fuzzy, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "Санҷиши ҳаққоният талаб мекунад, ки иттилооти корбарро тағйир диҳед"
 
-#: ../src/applet.c:2900
+#: ../src/applet.c:2563
 #, fuzzy, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "%s VPN"
 
-#: ../src/applet.c:2903
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Пайвасти VPN '%s' фаъол аст"
 
-#: ../src/applet.c:2945
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Ягон пайвасти шабакавӣ нест"
 
-#: ../src/applet.c:3615
+#: ../src/applet.c:3204
 #, fuzzy
 msgid "NetworkManager Applet"
 msgstr "зербарнома"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:769 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Дастрас"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:796 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Алоқа пайваст шудааст"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Шумо ба шабакаи алоқадор пайваст шудед."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Омодасозии пайвасти алоқаи '%s'..."
-
-#: ../src/applet-device-bond.c:117
-#, fuzzy, c-format
-#| msgid "InfiniBand connection %d"
-msgid "Configuring bond connection '%s'..."
-msgstr "Пайвасти алоқаи '%s' танзим шуда истодааст..."
-
-#: ../src/applet-device-bond.c:120
-#, fuzzy, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Пайвасти алоқаи '%s' танзим шуда истодааст..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, fuzzy, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Иттилооти дархостӣ"
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Пайвасти алоқаи '%s' фаъол аст"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Шумо ба шабакаи пул пайваст шудед."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Омодасозии пайвасти пули '%s'..."
-
-#: ../src/applet-device-bridge.c:117
-#, fuzzy, c-format
-#| msgid "Bridge connection %d"
-msgid "Configuring bridge connection '%s'..."
-msgstr "Пайвасти пули '%s' танзим шуда истодааст..."
-
-#: ../src/applet-device-bridge.c:120
-#, fuzzy, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Пайвасти пули '%s' танзим шуда истодааст..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Пайвасти пули '%s' фаъол аст"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Рамзи PUK нодуруст аст. Лутфан, бо провайдери худ дар тамос шавед."
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 #, fuzzy
 msgid "Sending unlock code..."
 msgstr "Рамзи кушоишро ворид кунед"
 
-#: ../src/applet-device-broadband.c:715 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:421
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Паҳннаври мобилӣ (%s)"
 
-#: ../src/applet-device-broadband.c:717 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Паҳннаври мобилӣ"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Дастрас"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:782
+#: ../src/applet-device-broadband.c:801
 #, fuzzy
 msgid "New Mobile Broadband connection..."
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/applet-device-broadband.c:797
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Алоқа пайваст шудааст"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Шумо ба шабакаи паҳннавори мобилӣ пайваст шудед."
 
-#: ../src/applet-device-broadband.c:932 ../src/applet-device-broadband.c:938
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 #, fuzzy
 msgid "Mobile Broadband network."
 msgstr "Пароли шабакаи паҳннавори мобилӣ"
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Шумо дар шабакаи хонагӣ қайд шудед."
 
-#: ../src/applet-device-broadband.c:939 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Шумо дар шабакаи роумингӣ қайд шудед."
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Шумо ба шабакаи паҳннавори мобилӣ пайваст шудед."
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, fuzzy, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, fuzzy, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, fuzzy, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-#, fuzzy
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Шумо ба шабакаи CDMA пайваст шудед."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "Шабакаи CDMA."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Шабакаи Ethernet (Худкор)"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Шабакаҳои Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Шабакаи Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Шабакаҳои Ethernet"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Шабакаи Ethernet"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Шумо ба шабакаи Ethernet пайваст шудед."
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "Омодасозии пайвасти шабакавии Ethernet '%s'..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, fuzzy, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "Омодасозии пайвасти шабакавии Ethernet '%s'..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../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:180
+#: ../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:184
+#: ../src/applet-device-ethernet.c:174
 #, fuzzy, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "Пайвасти шабакавии '%s' фаъол аст"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Санҷиши ҳаққонияти DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-#, fuzzy
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Шумо ба шабакаи GSM пайваст шудед."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "Шабакаи GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "InfiniBand-и худкор"
-
-#: ../src/applet-device-infiniband.c:92
-#, fuzzy, c-format
-#| msgid "Wi-Fi Networks (%s)"
-msgid "InfiniBand Networks (%s)"
-msgstr "Шабакаҳои InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, fuzzy, c-format
-#| msgid "Wi-Fi Network (%s)"
-msgid "InfiniBand Network (%s)"
-msgstr "Шабакаи InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-#, fuzzy
-#| msgid "InfiniBand"
-msgid "InfiniBand Networks"
-msgstr "Шабакаҳои InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-#, fuzzy
-#| msgid "InfiniBand"
-msgid "InfiniBand Network"
-msgstr "Шабакаи InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Шумо ба шабакаи InfiniBand пайваст шудед."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Омодасозии пайвасти InfiniBand '%s'..."
-
-#: ../src/applet-device-infiniband.c:170
-#, fuzzy, c-format
-#| msgid "InfiniBand connection %d"
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Пайвасти InfiniBand '%s' танзим шуда истодааст..."
-
-#: ../src/applet-device-infiniband.c:173
-#, fuzzy, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Пайвасти InfiniBand '%s' танзим шуда истодааст..."
-
-#: ../src/applet-device-infiniband.c:180
-#, fuzzy, c-format
-#| msgid "InfiniBand connection %d"
-msgid "InfiniBand connection '%s' active"
-msgstr "Пайвасти InfiniBand '%s' фаъол аст"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Шумо ба шабакаи гурӯҳӣ пайваст шудед."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Омодасозии пайвасти гурӯҳии '%s'..."
-
-#: ../src/applet-device-team.c:113
-#, fuzzy, c-format
-#| msgid "Bridge connection %d"
-msgid "Configuring team connection '%s'..."
-msgstr "Пайвасти гурӯҳии '%s' танзим шуда истодааст..."
-
-#: ../src/applet-device-team.c:116
-#, fuzzy, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Пайвасти гурӯҳии '%s' фаъол аст"
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Пайвасти гурӯҳии '%s' фаъол аст"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Шумо ба шабакаи VLAN пайваст шудед."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Омодасозии пайвасти VLAN '%s'..."
-
-#: ../src/applet-device-vlan.c:231
-#, fuzzy, c-format
-#| msgid "VLAN connection %d"
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Пайвасти VLAN '%s' танзим шуда истодааст..."
-
-#: ../src/applet-device-vlan.c:234
-#, fuzzy, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Пайвасти VLAN '%s' танзим шуда истодааст..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "Пайвасти VLAN '%s' фаъол аст"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 #, fuzzy
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "_Эҷод кардани шабакаи Wi-Fi-и нав..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ҳеҷ)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Шабакаҳои Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Шабакаи Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Шабакаи Wi-Fi"
 msgstr[1] "Шабакаҳои Wi-Fi"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi хомӯш аст"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi тавассути калиди сахтафзор хомӯш шудааст"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Шабакаҳои бештар"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Шабакаҳои Wi-Fi-и дастрас"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 #, fuzzy
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Шумо ба шабакаи Wi-Fi '%s' пайваст шудед."
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "Омодасозии пайвасти шабакавии Wi-Fi '%s'..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, fuzzy, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "Омодасозии пайвасти шабакавии Wi-Fi '%s'..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, fuzzy, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, fuzzy, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "Шабакаи Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Пайвасти шабакавии Wi-Fi '%s' фаъол аст: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Пайвасти шабакавии Wi-Fi '%s' фаъол аст"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 #, fuzzy
 msgid "Failed to activate connection"
 msgstr "Пайваст қатъ шудааст."
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 #, fuzzy
 msgid "Failed to add new connection"
 msgstr "Иловакунии пайваст қатъ шудааст"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Пайвасти паҳннавори мобилии WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "Пайвасти паҳннавори мобилии WiMAX"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX ғайрифаъол аст"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX бо калиди сахтафзорӣ ғайрифаъол шудааст"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Шумо ба шабакаи WiMAX пайваст шудед."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, fuzzy, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "роуминг"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 #, fuzzy
 msgid "Error displaying connection information:"
 msgstr "Ҳангоми намоиши кӯмак хатогӣ ба вуҷуд омад: %s"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:918
-#: ../src/wireless-security/wireless-security.c:441
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP-и серҳаракат"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Суроғаҳо"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Ҳеҷ"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (пешфарз)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:481
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мб/с"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:483
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Номаълум"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d дБ"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Номаълум"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Суроғаи IP:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Суроғаи пахш:"
 
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "номаълум"
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Номаълум"
 
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "номаълум"
+#: ../src/applet-dialogs.c:382
+#, fuzzy
+msgid "Subnet Mask:"
+msgstr "Маскаи зершабака"
 
-#: ../src/applet-dialogs.c:407
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Шабакаи Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:417
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:419
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:423
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:429 ../src/applet-dialogs.c:788
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Умумӣ"
 
-#: ../src/applet-dialogs.c:433
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: ../src/applet-dialogs.c:449
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Суроғаи сахтафзор:"
 
 #. Driver
-#: ../src/applet-dialogs.c:457
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Драйвер:"
 
-#: ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Суръат:"
 
-#: ../src/applet-dialogs.c:496
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Амният:"
 
-#: ../src/applet-dialogs.c:509
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:522
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:550 ../src/applet-dialogs.c:657
-msgid "IP Address:"
-msgstr "Суроғаи IP:"
-
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:568
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Номаълум"
-
-#: ../src/applet-dialogs.c:566
-msgid "Broadcast Address:"
-msgstr "Суроғаи пахш:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:575
-#, fuzzy
-msgid "Subnet Mask:"
-msgstr "Маскаи зершабака"
-
-#: ../src/applet-dialogs.c:577
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Номаълум"
-
-#: ../src/applet-dialogs.c:585 ../src/applet-dialogs.c:672
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 #, fuzzy
 msgid "Default Route:"
 msgstr "Масири пешфарз"
 
-#: ../src/applet-dialogs.c:597
-msgid "Primary DNS:"
-msgstr "DNS-и асосӣ:"
-
-#: ../src/applet-dialogs.c:606
-msgid "Secondary DNS:"
-msgstr "DNS-и иловагӣ:"
-
-#: ../src/applet-dialogs.c:616
-msgid "Ternary DNS:"
-msgstr "DNS-и эҳтиётӣ:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:631
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:640
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Радшуда"
 
-#: ../src/applet-dialogs.c:793
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Навъи VPN:"
 
-#: ../src/applet-dialogs.c:800
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Шлюзи VPN:"
 
-#: ../src/applet-dialogs.c:806
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Номи корбари VPN:"
 
-#: ../src/applet-dialogs.c:812
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Баннери VPN:"
 
-#: ../src/applet-dialogs.c:818
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Пайвасти асосӣ:"
 
-#: ../src/applet-dialogs.c:820 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Номаълум"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:883
+#: ../src/applet-dialogs.c:957
 #, fuzzy
 msgid "No valid active connections found!"
 msgstr "Гирифтани пайвастҳои фаъол барои Интернет"
 
-#: ../src/applet-dialogs.c:911
+#: ../src/applet-dialogs.c:985
 #, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 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:914
+#: ../src/applet-dialogs.c:988
 #, fuzzy
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Намоиш додани зербарнома дар ноҳияи огоҳӣ"
 
-#: ../src/applet-dialogs.c:916
+#: ../src/applet-dialogs.c:990
 #, fuzzy
 msgid "NetworkManager Website"
 msgstr "Вебсайт"
 
-#: ../src/applet-dialogs.c:931
+#: ../src/applet-dialogs.c:1005
 #, fuzzy
 msgid "Missing resources"
 msgstr "Манбаҳои намерасидагӣ"
 
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:1030
 #, fuzzy
 msgid "Mobile broadband network password"
 msgstr "Пароли шабакаи паҳннавори мобилӣ"
 
-#: ../src/applet-dialogs.c:965
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Барои пайваст шудан ба '%s' парол лозим аст."
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Парол:"
 
-#: ../src/applet-dialogs.c:1261
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Кушодани SIM бо PIN лозим аст"
 
-#: ../src/applet-dialogs.c:1262
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "Кушодани SIM бо PIN лозим аст"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1264
+#: ../src/applet-dialogs.c:1339
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1244,25 +1006,25 @@ msgid ""
 msgstr "Барои дастгоҳи паҳннавори мобилӣ рамзи PIN лозим аст"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1266
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Рамзи PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1270
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Намоиш додани рамзи PIN"
 
-#: ../src/applet-dialogs.c:1272
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Кушодани SIM бо PUK лозим аст"
 
-#: ../src/applet-dialogs.c:1273
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "Кушодани SIM бо PUK лозим аст"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1275
+#: ../src/applet-dialogs.c:1350
 #, fuzzy, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1270,29 +1032,36 @@ msgid ""
 msgstr "Барои дастгоҳи паҳннавори мобилӣ рамзи PIN лозим аст"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1277
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Рамзи PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1280
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Рамзи нави PIN:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1282
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Рамзи нави PIN-ро дубора ворид кунед:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1287
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Намоиш додани рамзҳои PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 #, fuzzy
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
@@ -1302,29 +1071,51 @@ msgstr ""
 "ҷудошуда иборат мебошад.  Агар шумо надонед, ки дар ин ҷо чӣ бояд ворид "
 "шавад, бо маъмури шабакаи худ дар тамос шавед."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Нест кардан"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 #, fuzzy
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Нодида гирифтани масирҳои ба таври худкор бадастовардашуда"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 #, fuzzy
 msgid "_Use this connection only for resources on its network"
 msgstr "Истифода бурдани ин пайваст _танҳо барои сарчашмаҳои ин шабака"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 #, fuzzy
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "Пайвасти шабака мавҷуд нест"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1332,16 +1123,16 @@ msgstr "Пайвасти шабака мавҷуд нест"
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Эҷод кардан…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 #, fuzzy
 msgid "Choose a Connection Type"
 msgstr "Навъи пайваст"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 #, fuzzy
 msgid ""
 "Select the type of connection you wish to create.\n"
@@ -1395,50 +1186,43 @@ msgid "Bonded _connections:"
 msgstr "Пайвастҳои _алоқадор:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "_Ҳолат:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "Ҳ_олат:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "_Таҳрир кардан"
-
-#. Delete
 #: ../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:703
-msgid "_Delete"
-msgstr "_Нест кардан"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Таҳрир кардан"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 #, fuzzy
 msgid "Monitoring _frequency:"
 msgstr "FREQUENCY"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "мс"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "_Номи интерфейс:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 #, fuzzy
 msgid "_Link Monitoring:"
 msgstr "Нармафзори пайгирии вақти воқеӣ"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "_Мақсадҳои ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 #, fuzzy
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
@@ -1450,21 +1234,21 @@ msgstr ""
 "Сервери якуми номҳо дар рӯйхат аввалин дархост карда мешавад. Агар шумо "
 "нахоҳед, ки ягон сервери номро истифода баред, ин майдонро холӣ монед."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 #, fuzzy
 msgid "Link _up delay:"
 msgstr "Таъхир:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 #, fuzzy
 msgid "Link _down delay:"
 msgstr "Таъхир пеш аз пайдошавии менюҳои фаровардану поён"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Асосӣ:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 #, fuzzy
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
@@ -1473,12 +1257,31 @@ 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+#, 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
+msgid "bytes"
+msgstr "байт"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "Арзиши _масир:"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "_Аввалият:"
 
@@ -1491,46 +1294,292 @@ msgstr "MODE"
 msgid "Bridged _connections:"
 msgstr "Пайвастҳои _пул:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 #, fuzzy
 msgid "_Forward delay:"
 msgstr "Пеш"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 #, fuzzy
 msgid "_Hello time:"
 msgstr "ВАҚТ"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 #, fuzzy
 msgid "s"
 msgstr "#%s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Фаъол кардани шабака"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 #, fuzzy
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Фаъол кардани хатҳои дарахт"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 #, fuzzy
 msgid "_Max age:"
 msgstr "Синни ҳадди аксари файлҳои охирин"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "_Вақти фарсудашавӣ:"
 
-#: ../src/connection-editor/ce-page.c:67
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "худкор"
 
-#: ../src/connection-editor/ce-page.c:342
+#: ../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
+msgid "default"
+msgstr "пешфарз"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Суроға"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Суроға"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Ҳар дастгоҳ"
+
+#: ../src/connection-editor/ce-page.c:591
 #, fuzzy
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "Вобаста ба раванди иҷроиш навсозӣ қатъ карда шуд"
 
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "Ҳамчун пайвасти Интернет истифода кардан"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#, fuzzy
+msgid "Enable"
+msgstr "Wi-Fi"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#, fuzzy
+msgid "Priority"
+msgstr "_Аввалият:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#, fuzzy
+msgid "Priority Groups"
+msgstr "_Аввалият:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Priority:"
+msgstr "_Аввалият:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Priority Bandwidth:"
+msgstr "_Аввалият:"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:10
+#: ../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
@@ -1543,7 +1592,7 @@ 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:4
+#: ../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
@@ -1551,8 +1600,9 @@ msgid "Sho_w password"
 msgstr "На_моиш додани парол"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1564,7 +1614,8 @@ msgstr "_Парол:"
 #: ../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-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Худкор"
@@ -1622,20 +1673,19 @@ msgstr "Қабулкунии _худкор"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
 #, fuzzy
-msgid "_Device MAC address:"
-msgstr "Суроғаи MAC"
+msgid "_Device:"
+msgstr "_Хидмат:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 #, fuzzy
 msgid "C_loned MAC address:"
 msgstr "Суроғаи MAC"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
 #, fuzzy
 msgid ""
 "The MAC address entered here will be used as hardware address for the "
@@ -1643,20 +1693,54 @@ msgid ""
 "MAC cloning or spoofing.  Example: 00:11:22:33:44:55"
 msgstr "Суроғаи MAC"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
 #, fuzzy
-msgid "_MTU:"
-msgstr "MTU:"
+msgid "De_fault"
+msgstr "Пешфарз"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "байт"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Рад кардан"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Интиқол"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Пароли калиди шахсӣ:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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
 #, fuzzy
@@ -1702,8 +1786,8 @@ msgstr "DNS-и худкор"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 #, fuzzy
 msgid "Manual"
 msgstr "Дастур"
@@ -1716,23 +1800,23 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Бо компютерҳои дигар мубодилашуда"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 #, fuzzy
 msgid "_Method:"
 msgstr "_Усул"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Суроғаҳо"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 #, fuzzy
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
@@ -1746,35 +1830,35 @@ msgstr ""
 "метавонед инчунин конфигуратсияи худкори шабакаи DHCP-ро бо номи мизбоне, ки "
 "шумо пешниҳод мекунед, такрор кунед."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 #, 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.h:13
 #, fuzzy
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "_Доменҳои ҷустуҷӯӣ:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 #, fuzzy
 msgid "DNS ser_vers:"
 msgstr "Серверҳои DNS-и _иловагӣ:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -1786,24 +1870,37 @@ msgstr ""
 "Сервери якуми номҳо дар рӯйхат аввалин дархост карда мешавад. Агар шумо "
 "нахоҳед, ки ягон сервери номро истифода баред, ин майдонро холӣ монед."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 #, 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.h:18
 #, 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:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "_Масирҳо..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Ғайрифаъол"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 #, fuzzy
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
@@ -1816,12 +1913,16 @@ msgstr ""
 "Сервери якуми номҳо дар рӯйхат аввалин дархост карда мешавад. Агар шумо "
 "нахоҳед, ки ягон сервери номро истифода баред, ин майдонро холӣ монед."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 #, fuzzy
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "IPv_6"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 #, fuzzy
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
@@ -1829,75 +1930,42 @@ msgid ""
 msgstr "Танзимот"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Ҳар"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Афзал донистани 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Афзал донистани 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Афзал донистани 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Истифодаи танҳо 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Асосӣ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 #, fuzzy
 msgid "Nu_mber:"
 msgstr "_Рақам:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Иловагӣ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 #, fuzzy
 msgid "N_etwork ID:"
 msgstr "_ID-и шабака:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Навъ:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 #, fuzzy
 msgid "Change..."
 msgstr "Тағйир додан ба:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 #, fuzzy
 msgid "Allow _roaming if home network is not available"
 msgstr "Шабакаи роумингӣ"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "Намоиш додани _паролҳо"
 
@@ -1975,8 +2043,8 @@ msgstr "_Пайвастҳои гурӯҳӣ:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
 #, fuzzy
-msgid "I_mport team configuration from a file..."
-msgstr "_Ворид кардан"
+msgid "Im_port team configuration from a file..."
+msgstr "Ворид кардан аз файл"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 #, fuzzy
@@ -1984,26 +2052,47 @@ msgid "_Parent interface:"
 msgstr "_Интерфейси асосӣ:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Номи интерфейси VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
 #, fuzzy
-msgid "_Cloned MAC address:"
+msgid "Cloned MAC _address:"
 msgstr "С_уроғаи MAC-и нусхабардошта"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "_Рамзи VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 #, fuzzy
 msgid "Device name + number"
 msgstr "Номи дастгоҳ:"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + рақам"
 
@@ -2020,438 +2109,487 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-#, fuzzy
-msgid "Infrastructure"
-msgstr "Инфрасохтор"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 #, fuzzy
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 #, fuzzy
 msgid "Transmission po_wer:"
 msgstr "Қуттии почта"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Мб/с"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Суръат:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Канал:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_Алоқа:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "Ҳ_олат:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Усулҳои санҷиши ҳаққонияти иҷозатшуда"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Протоколи санҷиши ҳаққонияти васеъшаванда"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Протоколи санҷиши ҳаққонияти паролӣ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Протоколи санҷиши ҳаққонияти даъватӣ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 #, fuzzy
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Протоколи санҷиши ҳаққонияти даъватӣ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 #, fuzzy
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Протоколи санҷиши ҳаққонияти даъватӣ"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 #, 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/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:887
-msgid "Address"
-msgstr "Суроға"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "Ниқоби шабака"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:921
-msgid "Gateway"
-msgstr "Шлюз"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "Метрӣ"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:904
-msgid "Prefix"
-msgstr "Пешоянд"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Шабакаи Ethernet"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Шабакаи Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "Шабакаи WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "Шабакаи DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "Шабакаи InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:430 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "Алоқа"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:255 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "Гурӯҳ"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "Пул"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:482 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "Шабакаи VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Сахтафзор"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Виртуалӣ"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 #, fuzzy
 msgid "Import a saved VPN configuration..."
 msgstr "Пайвасти VPN ворид намешавад"
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 #, fuzzy
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "китобхонаи libburn оғоз дода нашуд"
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 #, fuzzy
 msgid "Could not create new connection"
 msgstr "Бойгонӣ эҷод нашуд"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Несткунии пайваст қатъ шудааст"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "Шумо мутмаин ҳастед, ки мехоҳед пайвасти %s-ро нест кунед?"
 
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../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
+msgid "Address"
+msgstr "Суроға"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "Ниқоби шабака"
+
+#: ../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
+msgid "Gateway"
+msgstr "Шлюз"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "Метрӣ"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "Пешоянд"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, fuzzy, c-format
 msgid "Editing %s"
 msgstr "Таҳрири профили “%s”"
 
-#: ../src/connection-editor/nm-connection-editor.c:126
+#: ../src/connection-editor/nm-connection-editor.c:104
 #, fuzzy
 msgid "Editing un-named connection"
 msgstr "Д_игар маъқул нест"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "Номи _пайваст:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Ҳангоми омодасозии ҳаҷми ҷисмонӣ хатогӣ ба вуҷуд омад"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Иловакунии пайваст қатъ шудааст"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 #, 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:417
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Захира кардан"
 
-#: ../src/connection-editor/nm-connection-editor.c:418
+#: ../src/connection-editor/nm-connection-editor.c:420
 #, fuzzy
 msgid "Save any changes made to this connection."
 msgstr ""
 "Агар шумо интихоб кунед, ки ин файли конфигуратсияро бо версияи навтар "
 "ҷойиваз кунед, шумо ҳамаи тағйироти ба он даровардаро гум мекунед."
 
-#: ../src/connection-editor/nm-connection-editor.c:419
-msgid "_Save..."
-msgstr "_Захира кардан..."
-
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 #, fuzzy
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "Таъин кардан барои ҳамаи корбарон"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 #, fuzzy
 msgid "Could not create connection"
 msgstr "Бойгонӣ эҷод нашуд"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 #, fuzzy
 msgid "Could not edit connection"
 msgstr "Таҳрир кардани пайвасти интихобшуда"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 #, fuzzy
 msgid "Unknown error creating connection editor dialog."
 msgstr "(Хатогӣ: муҳаррири пайвасти VPN кушода нашуд)"
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 #, fuzzy
 msgid "Error initializing editor"
 msgstr "Ҳангоми омодасозии ҳаҷми ҷисмонӣ хатогӣ ба вуҷуд омад"
 
-#: ../src/connection-editor/nm-connection-editor.c:903
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Иловакунии пайваст қатъ шудааст"
 
-#: ../src/connection-editor/nm-connection-editor.c:943
-#, fuzzy
-msgid "Error saving connection"
-msgstr "Ҳангоми захиракунӣ хатогӣ ба вуҷуд омад "
-
-#: ../src/connection-editor/nm-connection-editor.c:944
-#, fuzzy, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "%s-и нодуруст барои корбари ‘%s’ (%s, %d): "
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "Номи _пайваст:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Содир кардан..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "ҳеҷ гоҳ"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "ҳозир"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d дақиқа пеш"
 msgstr[1] "%d дақиқа пеш"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d соат пеш"
 msgstr[1] "%d соат пеш"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d рӯз пеш"
 msgstr[1] "%d рӯз пеш"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d моҳ пеш"
 msgstr[1] "%d моҳ пеш"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d сол пеш"
 msgstr[1] "%d сол пеш"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Ном"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Истифодаи охирин"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Таҳрир кардани пайвасти интихобшуда"
 
-#: ../src/connection-editor/nm-connection-list.c:688
-msgid "_Edit..."
-msgstr "_Таҳрир кардан..."
-
-#: ../src/connection-editor/nm-connection-list.c:689
+#: ../src/connection-editor/nm-connection-list.c:685
 #, fuzzy
 msgid "Authenticate to edit the selected connection"
 msgstr "Таҳрир кардани пайвасти интихобшуда"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:700
 #, fuzzy
 msgid "Delete the selected connection"
 msgstr "Несткунии пайваст қатъ шудааст"
 
-#: ../src/connection-editor/nm-connection-list.c:705
-msgid "_Delete..."
-msgstr "_Нест кардан..."
-
-#: ../src/connection-editor/nm-connection-list.c:706
+#: ../src/connection-editor/nm-connection-list.c:701
 #, fuzzy
 msgid "Authenticate to delete the selected connection"
 msgstr "Несткунии пайваст қатъ шудааст"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:929
 #, fuzzy
 msgid "No VPN plugins are installed."
 msgstr "Плагинҳои VPN бор намешаванд"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:931
 #, fuzzy, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr ""
 "Инро ба арзишҳои мусбат насб кунед, ки нишондиҳандаи баъзе пешравиҳо аст, "
 "вале чӣ қадар буданашонро намедонед"
 
-#: ../src/connection-editor/nm-connection-list.c:939
+#: ../src/connection-editor/nm-connection-list.c:933
 #, fuzzy
 msgid "Error creating connection"
 msgstr "Хатои эҷоди қатори RAID"
 
-#: ../src/connection-editor/nm-connection-list.c:995
+#: ../src/connection-editor/nm-connection-list.c:955
 #, fuzzy
 msgid "Error editing connection"
 msgstr "Таҳрир"
 
-#: ../src/connection-editor/nm-connection-list.c:996
+#: ../src/connection-editor/nm-connection-list.c:956
 #, fuzzy, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "%s бо шахсияти ‘%s’ дар маълумоти корбар ёфт нашуд"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "Амнияти 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 #, fuzzy
 msgid "Could not load 802.1x Security user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 #, fuzzy
 msgid "Use 802.1_X security for this connection"
 msgstr "Ҳамчун пайвасти Интернет истифода кардан"
 
-#: ../src/connection-editor/page-bond.c:433
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "Интерфейси корбари vlan бор нашуд."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Пайвасти алоқаи %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Шабакаи Ethernet"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Шабакаи Wi-Fi"
+
+#: ../src/connection-editor/page-bond.c:447
 #, fuzzy
 msgid "Could not load bond user interface."
 msgstr "Интерфейси корбари vlan бор нашуд."
 
-#: ../src/connection-editor/page-bond.c:587
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Асосӣ:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Пайвасти алоқаи %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 #, fuzzy
 msgid "Could not load bridge user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
@@ -2464,52 +2602,76 @@ msgstr "Пайвасти пули %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Порти пул"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 #, fuzzy
 msgid "Could not load bridge port user interface."
 msgstr "Интерфейси корбари порти гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
+
+#: ../src/connection-editor/page-dsl.c:129
 #, fuzzy
 msgid "Could not load DSL user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Пайвасти DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
 #, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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:244
+#: ../src/connection-editor/page-ethernet.c:328
 #, fuzzy
 msgid "Could not load ethernet user interface."
 msgstr "Интерфейси корбари vlan бор нашуд."
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Шабакаи Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "Суроғаи MAC"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Пешфарз"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 #, fuzzy
 msgid ""
 "The zone defines the trust level of the connection. Default is not a regular "
@@ -2517,244 +2679,283 @@ msgid ""
 "firewall. Only usable if firewalld is active."
 msgstr "Минтақа сатҳи эътимоднокии пайвастро муайян мекунад"
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 #, fuzzy
 msgid "FirewallD is not running."
 msgstr "Иҷро нашудааст"
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 #, fuzzy
 msgid "Could not load General user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 #, fuzzy
 msgid "Could not load InfiniBand user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Пайвасти InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Худкор (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Худкор (VPN) танҳо суроғаҳо"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Худкор (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Худкор (PPP) танҳо суроғаҳо"
+#, fuzzy
+msgid "Automatic, addresses only"
+msgstr "Танҳо суроғаҳои худкор (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Худкор (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Худкор (PPPoE) танҳо суроғаҳо"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Худкор (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Худкор (DHCP) танҳо суроғаҳо"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 #, fuzzy
 msgid "Link-Local Only"
 msgstr "Танҳо пайванди маҳаллӣ"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Ғайрифаъол"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Серверҳои DNS-и _иловагӣ:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "_Доменҳои ҷустуҷӯии иловагӣ:"
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, fuzzy, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Таҳрири профили “%s”"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Танзимоти IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 #, fuzzy
 msgid "Could not load IPv4 user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-ip6.c:143
-#, fuzzy
-msgid "Automatic, addresses only"
-msgstr "Танҳо суроғаҳои худкор (DHCP)"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Рад кардан"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Худкор, танҳо DHCP"
 
-#: ../src/connection-editor/page-ip6.c:819
+#: ../src/connection-editor/page-ip6.c:964
 #, fuzzy, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Таҳрири профили “%s”"
 
-#: ../src/connection-editor/page-ip6.c:969
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Танзимоти IPv6"
 
-#: ../src/connection-editor/page-ip6.c:971
+#: ../src/connection-editor/page-ip6.c:1157
 #, fuzzy
 msgid "Could not load IPv6 user interface."
 msgstr "Интерфейси корбари PPP бор нашуд."
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 #, fuzzy
 msgid "Duplicate slaves"
 msgstr "Пайвасти фармонбарон"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, fuzzy, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "Татбиқкунии танзимоти нав қатъ шуд: %s"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, 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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s фармонбари %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 #, fuzzy
 msgid "Could not load mobile broadband user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 #, fuzzy
 msgid "Unsupported mobile broadband connection type."
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 #, fuzzy
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Паҳннавори мобилӣ"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 #, fuzzy
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr "Провайдери шумо:"
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 #, fuzzy
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "2G (GPRS/EDGE)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 #, fuzzy
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "EVDO"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:248
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:298
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:264
-#: ../src/wireless-security/eap-method-ttls.c:281
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:265
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ҳеҷ"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../src/connection-editor/page-ppp.c:196
 #, fuzzy, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "Усулҳои санҷиши ҳаққонияти иҷозатшуда"
 
-#: ../src/connection-editor/page-ppp.c:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Танзимоти PPP"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Интерфейси корбари PPP бор нашуд."
 
-#: ../src/connection-editor/page-team.c:94
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:234
+#: ../src/connection-editor/page-team.c:98
+#: ../src/connection-editor/page-team-port.c:71
+#: ../src/connection-editor/vpn-helpers.c:165
 #, fuzzy
 msgid "Select file to import"
 msgstr "Файли JSON-ро барои воридот интихоб намоед"
 
-#: ../src/connection-editor/page-team.c:114
-#: ../src/connection-editor/page-team-port.c:97
+#: ../src/connection-editor/page-team.c:118
+#: ../src/connection-editor/page-team-port.c:91
 #, fuzzy
 msgid "Error: file doesn't contain a valid JSON configuration"
 msgstr ""
@@ -2763,13 +2964,12 @@ msgstr ""
 "мувофиқат мекунад.\n"
 "Файли танзимотии аслӣ тағйир наёфт."
 
-#: ../src/connection-editor/page-team.c:258
+#: ../src/connection-editor/page-team.c:270
 #, fuzzy
-#| msgid "Could not load vlan user interface."
 msgid "Could not load team user interface."
 msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
 
-#: ../src/connection-editor/page-team.c:353
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Пайвасти гурӯҳии %d"
@@ -2777,50 +2977,58 @@ msgstr "Пайвасти гурӯҳии %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Порти гурӯҳӣ"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 #, fuzzy
-#| msgid "Could not load vlan user interface."
 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:318
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (тавассути \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:484
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Ягон пайвасти шабакавӣ нест"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Интерфейси корбари vlan бор нашуд."
 
-#: ../src/connection-editor/page-vlan.c:680
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Пайвасти VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Интерфейси корбари VPN бор нашуд."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, fuzzy, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr ""
 "Плагин дар ҳеҷ кадоме аз манбаҳои нармафзории пайкарбандишуда ёфт нашуд"
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Пайвасти VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 #, fuzzy
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
@@ -2831,12 +3039,12 @@ msgstr ""
 "\n"
 "Хатогӣ: %s."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 #, fuzzy
 msgid "Choose a VPN Connection Type"
 msgstr "Навъи VPN"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 #, fuzzy
 msgid ""
 "Select the type of VPN you wish to use for the new connection.  If the type "
@@ -2844,89 +3052,99 @@ msgid ""
 "not have the correct VPN plugin installed."
 msgstr "Шумо мехоҳед, ки %s-ро бо пайвасти VPN-и захирашуда ҷойгузин кунед?"
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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:172
-#: ../src/connection-editor/page-wifi.c:176
-#: ../src/connection-editor/page-wifi.c:197
-#, c-format
-msgid "default"
-msgstr "пешфарз"
+#: ../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)\""
+msgstr "Суроғаи шабакавӣ муайян нашудааст"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u МГҳ)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Интерфейси корбари Wi-Fi бор нашуд."
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Ҳар дастгоҳ"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Пайвасти Wi-Fi %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:892
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:901
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "Гузарвожаи WEP 128-бит"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:931
+#: ../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)"
 msgstr "WEP-и серҳаракат (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:945
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2-и Шахсӣ"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:959
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2-и Тиҷорӣ"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "Интерфейси корбари Wi-Fi бор нашуд."
 
-#: ../src/connection-editor/page-wifi-security.c:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Амнияти Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 #, fuzzy
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Интерфейси корбари Wi-Fi бор нашуд."
 
-#: ../src/connection-editor/page-wimax.c:128
-#, fuzzy
-msgid "Could not load WiMAX user interface."
-msgstr "Интерфейси корбари гурӯҳӣ бор нашуд."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Пайвасти WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 #, fuzzy
 msgid "Cannot import VPN connection"
 msgstr "Пайвасти VPN ворид намешавад"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../src/connection-editor/vpn-helpers.c:140
 #, fuzzy, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2939,26 +3157,31 @@ msgstr ""
 "\n"
 "Хатогӣ: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:284
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Хатои номаълум"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Номи файли \"%s\" аллакай мавҷуд аст."
 
-#: ../src/connection-editor/vpn-helpers.c:286
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "Ҷ_ойгузин кардан"
 
-#: ../src/connection-editor/vpn-helpers.c:288
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:324
+#: ../src/connection-editor/vpn-helpers.c:255
 #, fuzzy
 msgid "Cannot export VPN connection"
 msgstr "Пайвасти VPN содир намешавад"
 
-#: ../src/connection-editor/vpn-helpers.c:326
+#: ../src/connection-editor/vpn-helpers.c:257
 #, fuzzy, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2969,118 +3192,23 @@ msgstr ""
 "\n"
 "Хатогӣ: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:361
+#: ../src/connection-editor/vpn-helpers.c:292
 #, fuzzy
 msgid "Export VPN connection..."
 msgstr "Пайвасти VPN содир намешавад"
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 #, fuzzy
 msgid ""
 "The NetworkManager Applet could not find some required resources (the .ui "
 "file was not found)."
 msgstr "Плагини лозимӣ ёфт нашуд"
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, fuzzy, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "Гузаргоҳи сессия пайваст нашуд:"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, fuzzy, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "Ҳангоми нусхабардории натзимоти bluetooth хатогӣ ба вуҷуд омад"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-#, fuzzy
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Пайдо кардани дастрасӣ ба Интернет тавассути телефони мобилӣ (DUN)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Пайдо кардани дастрасӣ ба Интернет тавассути телефони мобилӣ (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, fuzzy, c-format
-msgid "Error: %s"
-msgstr "!! ХАТОГӢ: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, fuzzy, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Пайвастшавӣ ба '%s' қатъ шудааст"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:947
-msgid "Your phone is now ready to use!"
-msgstr "Телефони шумо барои истифода омода аст!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-#, fuzzy
-msgid "Mobile wizard was canceled"
-msgstr "Бекоршуда"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-#, fuzzy
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Абзори телефонҳои мобилии CDMA"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-#, fuzzy
-msgid "unknown modem type."
-msgstr "Навъи огоҳии номаълум"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:721
-#: ../src/gnome-bluetooth/nma-bt-device.c:727
-#, fuzzy
-msgid "failed to connect to the phone."
-msgstr "Телефон"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:758
-#, fuzzy
-msgid "unexpectedly disconnected from the phone."
-msgstr "Телефон"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:768
-#, fuzzy
-msgid "timed out detecting phone details."
-msgstr "Вақти ҷавоби дастгоҳ ба анҷом расид"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:779
-#, fuzzy
-msgid "Detecting phone configuration..."
-msgstr "Телефон"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:811
-#, fuzzy
-#| msgid "No network connection"
-msgid "error getting bus connection"
-msgstr "хатои қабулкунии пайвасти гузаргоҳ"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:908
-#, fuzzy
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr "Шуморагирии худкор"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:945
-#, fuzzy, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Пайвастшавӣ ба '%s' қатъ шудааст"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:966
-#, c-format
-msgid "%s Network"
-msgstr "Шабакаи %s"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Кушодан"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 #, fuzzy
 msgid "Automatically unlock this device"
 msgstr "Кушодани қулфи дастгоҳи дорои рамз"
@@ -3089,32 +3217,37 @@ msgstr "Кушодани қулфи дастгоҳи дорои рамз"
 msgid "Connection Information"
 msgstr "Иттилооти пайвастшавӣ"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Пайвастҳои шабакавии фаъол"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../src/libnma/nma-mobile-wizard.c:198
+#: ../src/libnm-gtk/nm-mobile-wizard.c:199
 #, fuzzy
 msgid ""
 "Your mobile broadband connection is configured with the following settings:"
 msgstr "Танзимоти паҳннавори мобилӣ"
 
 #. Device
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Дастгоҳи шумо:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Провайдери шумо:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Нақшаи шумо:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3126,26 +3259,31 @@ msgstr ""
 "Пайвасти шабакаи дастрас вуҷуд надорад.\n"
 "Лутфан танзимоти пайвасти худро санҷида дубора кӯшиш намоед."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:266
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 #, fuzzy
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Танзимоти паҳннавори мобилӣ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:330
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Бе рӯйхат"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:461
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 #, fuzzy
 msgid "_Select your plan:"
 msgstr "Нақшаи шумо:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:485
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
 #, fuzzy
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "_APN:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:505
+#: ../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 "
@@ -3154,55 +3292,66 @@ msgid ""
 "If you are unsure of your plan please ask your provider for your plan's APN."
 msgstr "Нақшаи шумо:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:512
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 #, fuzzy
 msgid "Choose your Billing Plan"
 msgstr "Нақшаи шумо:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:561
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 #, fuzzy
 msgid "My plan is not listed..."
 msgstr "Нақша"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:714
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 #, fuzzy
 msgid "Select your provider from a _list:"
 msgstr "Интихоб кардан аз рӯйхати умумиҷаҳонӣ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:727
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Провайдер"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:752
+#: ../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 %%"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:765
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Провайдер:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:782
+#: ../src/libnma/nma-mobile-wizard.c:778
+#: ../src/libnm-gtk/nm-mobile-wizard.c:779
 #, fuzzy
 msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"
 msgstr "3G (UMTS/HSPA)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
 #, fuzzy
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "EVDO"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:795
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 #, fuzzy
 msgid "Choose your Provider"
 msgstr "Провайдери шумо:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1047
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 #, fuzzy
 msgid "Country or Region List:"
 msgstr "Минтақа ё кишвари худро интихоб намоед."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1060
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 #, fuzzy
 msgid "Country or region"
 msgstr ""
@@ -3210,122 +3359,148 @@ msgstr ""
 "масалан “Каҳвахонаи Нигина дар назди роҳи асосӣ” ё ”Нуқтаи дастраси WiFi дар "
 "назди боғи Рӯдаки” пайдо кунед.</li>"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1070
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 #, fuzzy
 msgid "My country is not listed"
 msgstr "Вуҷуд надора?"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1120
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1174
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 #, fuzzy
 msgid "Installed GSM device"
 msgstr "GSM"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1177
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 #, fuzzy
 msgid "Installed CDMA device"
 msgstr "CDMA"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1345
+#: ../src/libnma/nma-mobile-wizard.c:1354
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1355
 #, fuzzy
 msgid ""
 "This assistant helps you easily set up a mobile broadband connection to a "
 "cellular (3G) network."
 msgstr "Шумо ба шабакаи паҳннавори мобилӣ пайваст шудед."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1350
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Ба шумо иттилооти зерил лозим мешавад:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 #, fuzzy
 msgid "Your broadband provider's name"
 msgstr "Провайдери шумо:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1367
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 #, fuzzy
 msgid "Your broadband billing plan name"
 msgstr "Нақшаи шумо:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1373
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../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 "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1417
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Ҳар дастгоҳ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1430
+#: ../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'..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1603
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 #, fuzzy
 msgid "New Mobile Broadband Connection"
 msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "Симдор"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "_Пароли иловагӣ:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Пароли иловагӣ:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../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
+#, 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/libnm-gtk/nm-wifi-dialog.c:435
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Нав..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:875
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Ҳеҷ"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1046
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Эҷод кардан"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1130
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, fuzzy, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
@@ -3333,220 +3508,254 @@ msgstr ""
 "Барои пайдо кардани дастрасӣ ба шабакаи бесими \"%s\" паролҳо ё калидҳои "
 "рамзгузорӣ лозиманд."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1132
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1134
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 #, fuzzy
 msgid "Authentication required by Wi-Fi network"
 msgstr "Санҷиши ҳаққонияти шабакавии Wi-Fi лозим аст"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Эҷод кардани шабакаи Wi-Fi-и нав"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1141
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Шабакаи Wi-Fi-и нав"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1142
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 #, fuzzy
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "_Эҷод кардани шабакаи Wi-Fi-и нав..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Шабакаи Wi-Fi-и ноаён"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 #, fuzzy
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "Пайваст шудан ба шабакаи Wi-Fi-и ноаён"
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "_Пароли иловагӣ:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "На_моиш додани паролҳо"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_Амнияти Wi-Fi:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "_Пайвастшавӣ:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "_Адаптери Wi-Fi:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Истифодабарӣ:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 #, fuzzy
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr "_Лоиҳаҳои охирин"
 
-#: ../src/main.c:76
+#: ../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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 #, fuzzy
 msgid "not enabled"
 msgstr "_Фаъол"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 #, fuzzy
 msgid "not registered"
 msgstr "сабтшуда"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Шабакаи хонагӣ (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Шабакаи хонагӣ"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ҷустуҷӯ"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "қайдкунӣ қатъ шудааст"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роуминг)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Шабакаи роумингӣ (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Шабакаи роумингӣ"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "Рамзи PIN барои корти SIM '%s' дар '%s'"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Рамзи PIN лозим аст"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Барои дастгоҳи паҳннавори мобилӣ рамзи PIN лозим аст"
 
+#: ../src/mobile-helpers.c:619
+#, fuzzy, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "роуминг"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Пайвасти %s"
 
-#: ../src/utils/utils.c:376
-#, fuzzy
-msgid "Store the password only for this _user"
-msgstr "Пароли наверо барои корбари нав интихоб намоед:"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:378
-#, fuzzy
-msgid "Store the password for _all users"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
 msgstr ""
-"Ин пешниҳод шояд дар экрани вуруд намоиш дода шавад. Ин ба ҳамаи корбарони "
-"ин система аён мешавад. Иҷрои <b>not</b> дар ин ҷо паролро дар бар мегирад."
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 #, 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:443
+#: ../src/wireless-security/eap-method.c:455
 #, fuzzy
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Гувоҳиномаҳои DER ё PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:298
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:400
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Интихоби файли PAC..."
 
-#: ../src/wireless-security/eap-method-fast.c:407
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Файлҳои PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Ҳамаи файлҳо"
 
@@ -3584,15 +3793,33 @@ msgstr "Санҷиши _ҳаққонияти дохилӣ"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "_Таъминоти PAC"
 
-#: ../src/wireless-security/eap-method-peap.c:281
-#: ../src/wireless-security/wireless-security.c:417
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 #, fuzzy
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:377
-#: ../src/wireless-security/eap-method-tls.c:464
-#: ../src/wireless-security/eap-method-ttls.c:377
+#: ../src/wireless-security/eap-method-peap.c:381
+#: ../src/wireless-security/eap-method-tls.c:481
+#: ../src/wireless-security/eap-method-ttls.c:412
 #, fuzzy
 msgid "Choose a Certificate Authority certificate..."
 msgstr "Интихоб кардани гувоҳиномаи Мақомоти гувоҳиномаҳо..."
@@ -3615,7 +3842,6 @@ msgstr "Гувоҳиномаи C_A:"
 #: ../src/wireless-security/eap-method-tls.ui.h:4
 #: ../src/wireless-security/eap-method-ttls.ui.h:4
 #, fuzzy
-#| msgid "C_A certificate:"
 msgid "No CA certificate is _required"
 msgstr "Ягон гувоҳиномаи CA _лозим нест"
 
@@ -3623,16 +3849,47 @@ msgstr "Ягон гувоҳиномаи CA _лозим нест"
 msgid "PEAP _version:"
 msgstr "_Версияи PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "Ҳамеша ин паролро _дархост кардан"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Гувоҳиномаи C_A:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 #, fuzzy
 msgid "Unencrypted private keys are insecure"
 msgstr "Калидҳои махфии берамз хатарнок мебошанд"
 
-#: ../src/wireless-security/eap-method-tls.c:282
+#: ../src/wireless-security/eap-method-tls.c:299
 #, fuzzy
 msgid ""
 "The selected private key does not appear to be protected by a password.  "
@@ -3648,12 +3905,12 @@ msgstr ""
 "(Шумо метавонед калиди махфии худро тавассути openssl бо парол муҳофизат "
 "кунед)"
 
-#: ../src/wireless-security/eap-method-tls.c:458
+#: ../src/wireless-security/eap-method-tls.c:475
 #, fuzzy
 msgid "Choose your personal certificate..."
 msgstr "Интихоб кардани гувоҳиномаи шахсӣ..."
 
-#: ../src/wireless-security/eap-method-tls.c:470
+#: ../src/wireless-security/eap-method-tls.c:487
 #, fuzzy
 msgid "Choose your private key..."
 msgstr "Интихоб кардани калиди шахсӣ..."
@@ -3675,24 +3932,37 @@ msgstr "Калиди _шахсӣ:"
 msgid "_Private key password:"
 msgstr "_Пароли калиди шахсӣ:"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "ТЕЗ"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 #, fuzzy
 msgid "Tunneled TLS"
 msgstr "TLS-и нақбӣ"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP-и муҳофизатшуда (PEAP)"
 
@@ -3702,21 +3972,47 @@ msgstr "EAP-и муҳофизатшуда (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Санҷиши ҳаққоният:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "1 (Default)"
-msgstr "1 (Пешфарз)"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "2"
-msgstr "2"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
-msgid "3"
-msgstr "3"
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:4
-msgid "4"
-msgstr "4"
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
 #, fuzzy
@@ -3739,6 +4035,356 @@ msgstr "Намоиш _додани калид"
 msgid "WEP inde_x:"
 msgstr "_Индекси WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Навъ:"
+
+#, fuzzy
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Паҳннавори мобилӣ"
+
+#~ msgid "_Help"
+#~ msgstr "_Кӯмак"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Шумо ба шабакаи алоқадор пайваст шудед."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Омодасозии пайвасти алоқаи '%s'..."
+
+#, fuzzy
+#~| msgid "InfiniBand connection %d"
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Пайвасти алоқаи '%s' танзим шуда истодааст..."
+
+#, fuzzy
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Пайвасти алоқаи '%s' танзим шуда истодааст..."
+
+#, fuzzy
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Иттилооти дархостӣ"
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Пайвасти алоқаи '%s' фаъол аст"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Шумо ба шабакаи пул пайваст шудед."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Омодасозии пайвасти пули '%s'..."
+
+#, fuzzy
+#~| msgid "Bridge connection %d"
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Пайвасти пули '%s' танзим шуда истодааст..."
+
+#, fuzzy
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Пайвасти пули '%s' танзим шуда истодааст..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Пайвасти пули '%s' фаъол аст"
+
+#, fuzzy
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Шумо ба шабакаи CDMA пайваст шудед."
+
+#~ msgid "CDMA network."
+#~ msgstr "Шабакаи CDMA."
+
+#, fuzzy
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Омодасозии пайвасти паҳннавори мобилии '%s'..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Шумо ба шабакаи GSM пайваст шудед."
+
+#~ msgid "GSM network."
+#~ msgstr "Шабакаи GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "InfiniBand-и худкор"
+
+#, fuzzy
+#~| msgid "Wi-Fi Networks (%s)"
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Шабакаҳои InfiniBand (%s)"
+
+#, fuzzy
+#~| msgid "Wi-Fi Network (%s)"
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Шабакаи InfiniBand (%s)"
+
+#, fuzzy
+#~| msgid "InfiniBand"
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Шабакаҳои InfiniBand"
+
+#, fuzzy
+#~| msgid "InfiniBand"
+#~ msgid "InfiniBand Network"
+#~ msgstr "Шабакаи InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Шумо ба шабакаи InfiniBand пайваст шудед."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Омодасозии пайвасти InfiniBand '%s'..."
+
+#, fuzzy
+#~| msgid "InfiniBand connection %d"
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Пайвасти InfiniBand '%s' танзим шуда истодааст..."
+
+#, fuzzy
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "Пайвасти InfiniBand '%s' танзим шуда истодааст..."
+
+#, fuzzy
+#~| msgid "InfiniBand connection %d"
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "Пайвасти InfiniBand '%s' фаъол аст"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Шумо ба шабакаи гурӯҳӣ пайваст шудед."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Омодасозии пайвасти гурӯҳии '%s'..."
+
+#, fuzzy
+#~| msgid "Bridge connection %d"
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Пайвасти гурӯҳии '%s' танзим шуда истодааст..."
+
+#, fuzzy
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Пайвасти гурӯҳии '%s' фаъол аст"
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Пайвасти гурӯҳии '%s' фаъол аст"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Шумо ба шабакаи VLAN пайваст шудед."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Омодасозии пайвасти VLAN '%s'..."
+
+#, fuzzy
+#~| msgid "VLAN connection %d"
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Пайвасти VLAN '%s' танзим шуда истодааст..."
+
+#, fuzzy
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Пайвасти VLAN '%s' танзим шуда истодааст..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "Пайвасти VLAN '%s' фаъол аст"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Пайвасти паҳннавори мобилии WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Пайвасти паҳннавори мобилии WiMAX"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX ғайрифаъол аст"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX бо калиди сахтафзорӣ ғайрифаъол шудааст"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Шумо ба шабакаи WiMAX пайваст шудед."
+
+#~ msgid "%d dB"
+#~ msgstr "%d дБ"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "номаълум"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "номаълум"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Primary DNS:"
+#~ msgstr "DNS-и асосӣ:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "DNS-и иловагӣ:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "DNS-и эҳтиётӣ:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Ҳолат:"
+
+#, fuzzy
+#~ msgid "_Device MAC address:"
+#~ msgstr "Суроғаи MAC"
+
+#~ msgid "Any"
+#~ msgstr "Ҳар"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Афзал донистани 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Афзал донистани 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Афзал донистани 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Истифодаи танҳо 4G (LTE)"
+
+#, fuzzy
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "_Ворид кардан"
+
+#, fuzzy
+#~ msgid "Infrastructure"
+#~ msgstr "Инфрасохтор"
+
+#~ msgid "WiMAX"
+#~ msgstr "Шабакаи WiMAX"
+
+#~ msgid "_Save..."
+#~ msgstr "_Захира кардан..."
+
+#, fuzzy
+#~ msgid "Error saving connection"
+#~ msgstr "Ҳангоми захиракунӣ хатогӣ ба вуҷуд омад "
+
+#, fuzzy
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "%s-и нодуруст барои корбари ‘%s’ (%s, %d): "
+
+#~ msgid "_Edit..."
+#~ msgstr "_Таҳрир кардан..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Нест кардан..."
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Худкор (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ 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)."
+#~ msgstr "Гузаргоҳи сессия пайваст нашуд:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "Ҳангоми нусхабардории натзимоти bluetooth хатогӣ ба вуҷуд омад"
+
+#, fuzzy
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Пайдо кардани дастрасӣ ба Интернет тавассути телефони мобилӣ (DUN)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Пайдо кардани дастрасӣ ба Интернет тавассути телефони мобилӣ (DUN)"
+
+#, fuzzy
+#~ msgid "Error: %s"
+#~ msgstr "!! ХАТОГӢ: %s"
+
+#, fuzzy
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Пайвастшавӣ ба '%s' қатъ шудааст"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "Телефони шумо барои истифода омода аст!"
+
+#, fuzzy
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Бекоршуда"
+
+#, fuzzy
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Абзори телефонҳои мобилии CDMA"
+
+#, fuzzy
+#~ msgid "unknown modem type."
+#~ msgstr "Навъи огоҳии номаълум"
+
+#, fuzzy
+#~ msgid "failed to connect to the phone."
+#~ msgstr "Телефон"
+
+#, fuzzy
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "Телефон"
+
+#, fuzzy
+#~ msgid "timed out detecting phone details."
+#~ msgstr "Вақти ҷавоби дастгоҳ ба анҷом расид"
+
+#, fuzzy
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Телефон"
+
+#, fuzzy
+#~| msgid "No network connection"
+#~ msgid "error getting bus connection"
+#~ msgstr "хатои қабулкунии пайвасти гузаргоҳ"
+
+#, fuzzy
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr "Шуморагирии худкор"
+
+#, fuzzy
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Пайвастшавӣ ба '%s' қатъ шудааст"
+
+#~ msgid "%s Network"
+#~ msgstr "Шабакаи %s"
+
 #~ msgid "Choose CA Certificate"
 #~ msgstr "Интихоби гувоҳиномаи CA"
 
diff --git a/po/th.po b/po/th.po
index f2ca2b6f..31c57aa6 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2012-08-20 16:42+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -20,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "เครือข่าย"
 
@@ -70,9 +69,9 @@ msgid "Suppress networks available notifications"
 msgstr "ปิดการแจ้งเหตุเมื่อมีเครือข่ายให้เชื่อมต่อ"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to true to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการแจ้งเหตุเมื่อพบเครือข่ายไร้สายที่เชื่อมต่อได้"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
@@ -93,623 +92,827 @@ msgid ""
 msgstr "กำหนดเป็นค่าจริงถ้าต้องการปิดการสร้างเครือข่ายเฉพาะกิจขณะใช้แอพเพล็ต"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "ปิดคำเตือนใบรับรอง CA"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 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:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
 msgstr ""
 "กำหนดเป็นค่าจริงถ้าต้องการปิดคำเตือนเกี่ยวกับใบรับรอง CA ในขั้นที่ 2 ของการยืนยันตัวตนแบบ EAP"
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:396
-#: ../src/applet-device-gsm.c:444 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:862 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "เครือข่ายที่มี"
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "แอพเพล็ต NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "แอพเพล็ต NetworkManager"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:438
-#: ../src/applet-device-gsm.c:486 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "เ_ชื่อมต่อ"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "_ชื่อเครือข่าย:"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "เฉพาะกิจ"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+msgid "Failed to add/activate connection"
+msgstr "สร้าง/เปิดใช้การเชื่อมต่อไม่สำเร็จ"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr "ข้อผิดพลาดไม่ทราบสาเหตุ"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+msgid "Connection failure"
+msgstr "เชื่อมต่อไม่สำเร็จ"
+
+#: ../src/applet.c:399
+msgid "Device disconnect failed"
+msgstr "ตัดการเชื่อมต่อกับอุปกรณ์ไม่สำเร็จ"
+
+#: ../src/applet.c:404
+msgid "Disconnect failure"
+msgstr "ตัดการเชื่อมต่อไม่สำเร็จ"
+
+#: ../src/applet.c:434
+msgid "Connection activation failed"
+msgstr "เปิดใช้การเชื่อมต่อไม่สำเร็จ"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "ไม่ต้องแสดงข้อความนี้อีก"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "คุณเชื่อมต่อกับ '%s' แล้ว"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะการเชื่อมต่อถูกขัดจังหวะ"
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:442
-#: ../src/applet-device-gsm.c:490 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1264 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "เชื่อมต่อเครือข่ายแล้ว"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN หยุดทำงานกะทันหัน"
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "คุณเชื่อมต่อกับเครือข่ายบรอดแบนด์มือถือแล้ว"
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN คืนค่าตั้งที่ไม่ถูกต้องกลับมา"
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:478
-#: ../src/applet-device-gsm.c:526 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "กำลังเตรียมการเชื่อมต่อเครือข่ายบรอดแบนด์มือถือ '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะหมดเวลารอเชื่อมต่อ"
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:529 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "กำลังตั้งค่าการเชื่อมต่อเครือข่ายบรอดแบนด์มือถือ '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN ไม่เริ่มทำงานในเวลาที่กำหนด"
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:532 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่ายบรอดแบนด์มือถือ '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN เริ่มทำงานไม่สำเร็จ"
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:535 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2500
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "กำลังขอที่อยู่สำหรับเครือข่าย '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะไม่มีข้อมูลลับ VPN ที่จะใช้เข้าระบบ"
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:505
-#: ../src/applet-device-gsm.c:553
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "เครือข่ายบรอดแบนด์มือถือ '%s' ทำงานอยู่"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะข้อมูลลับ VPN ไม่ถูกต้อง"
 
-#: ../src/applet-device-cdma.c:181 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จ"
 
-#: ../src/applet-device-cdma.c:342 ../src/applet-device-gsm.c:390
-#: ../src/applet-dialogs.c:424
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "เครือข่ายบรอดแบนด์มือถือ (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"การเชื่อมต่อ VPN '%s' ถูกตัดเพราะการเชื่อมต่อเครือข่ายถูกขัดจังหวะ"
 
-#: ../src/applet-device-cdma.c:344 ../src/applet-device-gsm.c:392
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1510
-msgid "Mobile Broadband"
-msgstr "เครือข่ายบรอดแบนด์มือถือ"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"การเชื่อมต่อ VPN '%s' ถูกตัดเพราะบริการ VPN หยุดทำงาน"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:409
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "เครือข่ายบรอดแบนด์มือถือ (CDMA) ใหม่..."
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"การเชื่อมต่อ VPN '%s' ถูกตัด"
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+"การเชื่อมต่อ VPN เชื่อมต่อสำเร็จแล้ว\n"
+"\n"
+"%s\n"
 
-#: ../src/applet-device-cdma.c:443
-msgid "You are now connected to the CDMA network."
-msgstr "คุณเชื่อมต่อกับเครือข่าย CDMA แล้ว"
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr "การเชื่อมต่อ VPN เชื่อมต่อสำเร็จแล้ว\n"
 
-#: ../src/applet-device-cdma.c:500 ../src/applet-device-gsm.c:548
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "ข้อความเข้าระบบ VPN"
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "เชื่อมต่อ VPN ไม่สำเร็จ"
+
+#: ../src/applet.c:990
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "เครือข่ายบรอดแบนด์มือถือ '%s' ทำงานอยู่: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN เริ่มทำงานไม่สำเร็จ\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:551
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "ข้ามเขต"
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"การเชื่อมต่อ VPN '%s' เริ่มทำงานไม่สำเร็จ\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:644 ../src/applet-device-cdma.c:650
-msgid "CDMA network."
-msgstr "เครือข่าย CDMA"
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "อุปกรณ์ไม่พร้อม (ขาดเฟิร์มแวร์)"
 
-#: ../src/applet-device-cdma.c:645 ../src/applet-device-gsm.c:1196
-msgid "You are now registered on the home network."
-msgstr "ขณะนี้คุณลงทะเบียนกับเครือข่ายเหย้าแล้ว"
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "อุปกรณ์ไม่พร้อม"
 
-#: ../src/applet-device-cdma.c:651 ../src/applet-device-gsm.c:1202
-msgid "You are now registered on a roaming network."
-msgstr "ขณะนี้คุณลงทะเบียนกับเครือข่ายบริการข้ามเขตแล้ว"
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "ตัดการเชื่อมต่อแล้ว"
 
-#: ../src/applet-device-gsm.c:211 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "ตัดการเชื่อมต่อ"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:457
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "เครือข่ายบรอดแบนด์มือถือ (GSM) ใหม่"
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "อุปกรณ์ไม่มีการจัดการ"
 
-#: ../src/applet-device-gsm.c:491
-msgid "You are now connected to the GSM network."
-msgstr "คุณเชื่อมต่อกับเครือข่าย GSM แล้ว"
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "ไม่มีอุปกรณ์เครือข่ายในระบบ"
 
-#: ../src/applet-device-gsm.c:652
-msgid "PIN code required"
-msgstr "ต้องใช้รหัส PIN"
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "_การเชื่อมต่อ VPN"
 
-#: ../src/applet-device-gsm.c:660
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "ต้องใช้รหัส PIN สำหรับอุปกรณ์บรอดแบนด์มือถือ"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "_ตั้งค่า VPN..."
+
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "ตั_ดการเชื่อมต่อ VPN"
 
-#: ../src/applet-device-gsm.c:781
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager ไม่ได้ทำงานอยู่..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "ปิดการใช้งานเครือข่ายอยู่"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "เปิดใช้เ_ครือข่าย"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "เปิดใช้ไ_ร้สาย"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "เปิดใช้บรอดแบนด์_มือถือ"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "เปิดใช้การแ_จ้งเหตุ"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "_ข้อมูลการเชื่อมต่อ"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "แก้ไขการเชื่อมต่อ..."
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "เ_กี่ยวกับ"
+
+#: ../src/applet.c:2179
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "รหัส PIN สำหรับการ์ด SIM '%s' ใน '%s'"
+msgid "You are now connected to '%s'."
+msgstr "คุณเชื่อมต่อกับ '%s' แล้ว"
 
-#: ../src/applet-device-gsm.c:873
-msgid "Wrong PIN code; please contact your provider."
-msgstr "รหัส PIN ไม่ถูกต้อง กรุณาติดต่อผู้ให้บริการของคุณ"
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "ตัดการเชื่อมต่อแล้ว"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "การเชื่อมต่อเครือข่ายถูกตัดแล้ว"
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "กำลังเตรียมเชื่อมต่อเครือข่าย '%s'..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่าย '%s'..."
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "กำลังขอที่อยู่สำหรับเครือข่าย '%s'..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "การเชื่อมต่อเครือข่าย '%s' เปิดทำงานแล้ว"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "กำลังเปิดการเชื่อมต่อ VPN '%s'..."
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่าย VPN '%s'..."
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "กำลังขอที่อยู่ VPN สำหรับ '%s'..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "การเชื่อมต่อ VPN '%s' เปิดทำงานแล้ว"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "ไม่ได้เชื่อมกับเครือข่าย"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "แอพเพล็ต NetworkManager"
 
-#: ../src/applet-device-gsm.c:896
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "รหัส PUK ไม่ถูกต้อง กรุณาติดต่อผู้ให้บริการของคุณ"
 
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "รหัส PIN ไม่ถูกต้อง กรุณาติดต่อผู้ให้บริการของคุณ"
+
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:923
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "กำลังส่งรหัสปลดล็อค..."
 
-#: ../src/applet-device-gsm.c:986
-msgid "SIM PIN unlock required"
-msgstr "ต้องการ PIN ปลดล็อค SIM"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "เครือข่ายบรอดแบนด์มือถือ (%s)"
 
-#: ../src/applet-device-gsm.c:987
-msgid "SIM PIN Unlock Required"
-msgstr "ต้องการ PIN ปลดล็อค SIM"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "เครือข่ายบรอดแบนด์มือถือ"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:989
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr "อุปกรณ์บรอดแบนด์มือถือ '%s' ต้องการรหัส PIN ของ SIM ก่อนที่จะใช้งานได้"
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "เครือข่ายที่มี"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:991
-msgid "PIN code:"
-msgstr "รหัส PIN:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "การเชื่อมต่อบรอดแบนด์มือถือรายการใหม่"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:995
-msgid "Show PIN code"
-msgstr "แสดงรหัส PIN"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "เชื่อมต่อเครือข่ายแล้ว"
 
-#: ../src/applet-device-gsm.c:998
-msgid "SIM PUK unlock required"
-msgstr "ต้องการ PUK ปลดล็อค SIM"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "คุณเชื่อมต่อกับเครือข่ายบรอดแบนด์มือถือแล้ว"
 
-#: ../src/applet-device-gsm.c:999
-msgid "SIM PUK Unlock Required"
-msgstr "ต้องการ PUK ปลดล็อค SIM"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "รหัสผ่านเครือข่ายบรอดแบนด์มือถือ"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1001
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr "อุปกรณ์บรอดแบนด์มือถือ '%s' ต้องการรหัส PUK ของ SIM ก่อนที่จะใช้งานได้"
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "ขณะนี้คุณลงทะเบียนกับเครือข่ายเหย้าแล้ว"
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1003
-msgid "PUK code:"
-msgstr "รหัส PUK:"
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "ขณะนี้คุณลงทะเบียนกับเครือข่ายบริการข้ามเขตแล้ว"
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1006
-msgid "New PIN code:"
-msgstr "ตั้งรหัส PIN ใหม่:"
+#: ../src/applet-device-bt.c:88
+msgid "You are now connected to the mobile broadband network."
+msgstr "คุณเชื่อมต่อกับเครือข่ายบรอดแบนด์มือถือแล้ว"
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "Re-enter new PIN code:"
-msgstr "ป้อนรหัส PIN ที่ตั้งซ้ำอีกครั้ง:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "กำลังเตรียมการเชื่อมต่อเครือข่ายบรอดแบนด์มือถือ '%s'..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1013
-msgid "Show PIN/PUK codes"
-msgstr "แสดงรหัส PIN/PUK"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "กำลังตั้งค่าการเชื่อมต่อเครือข่ายบรอดแบนด์มือถือ '%s'..."
+
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่ายบรอดแบนด์มือถือ '%s'..."
 
-#: ../src/applet-device-gsm.c:1195 ../src/applet-device-gsm.c:1201
-msgid "GSM network."
-msgstr "เครือข่าย GSM"
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "เครือข่ายบรอดแบนด์มือถือ '%s' ทำงานอยู่"
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "อีเทอร์เน็ตอัตโนมัติ"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "เครือข่ายโยงสาย (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "เครือข่ายโยงสาย (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "เครือข่ายโยงสาย"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "เครือข่ายโยงสาย"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1508
-msgid "disconnected"
-msgstr "ตัดการเชื่อมต่อแล้ว"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "คุณเชื่อมต่อกับเครือข่ายโยงสายแล้ว"
 
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "กำลังเตรียมเชื่อมต่อเครือข่ายโยงสาย '%s'..."
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "กำลังตั้งค่าการเชื่อมต่อเครือข่ายโยงสาย '%s'..."
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่ายโยงสาย '%s'..."
 
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "กำลังขอที่อยู่จากเครือข่ายโยงสาย '%s'..."
 
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "เครือข่ายโยงสาย '%s' ทำงานอยู่"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "การยืนยันตัวบุคคลกับ DSL"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "เ_ชื่อมต่อกับเครือข่ายไร้สายที่ซ่อนอยู่..."
 
-#: ../src/applet-device-wifi.c:148
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "_สร้างเครือข่ายไร้สายใหม่..."
 
-#: ../src/applet-device-wifi.c:292
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(ไม่มี)"
 
-#: ../src/applet-device-wifi.c:790
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "เครือข่ายไร้สาย (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "เครือข่ายโยงสาย (%s)"
 
-#: ../src/applet-device-wifi.c:792
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "เครือข่ายไร้สาย (%s)"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "เครือข่ายโยงสาย (%s)"
 
-#: ../src/applet-device-wifi.c:794
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "เครือข่ายไร้สาย"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "เครือข่ายโยงสาย"
 
-#: ../src/applet-device-wifi.c:827
-msgid "wireless is disabled"
-msgstr "ปิดการใช้งานเครือข่ายไร้สายอยู่"
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "ปิดการใช้งาน WiMAX อยู่"
 
-#: ../src/applet-device-wifi.c:828
-msgid "wireless is disabled by hardware switch"
-msgstr "เครือข่ายไร้สายถูกปิดไว้ด้วยสวิตช์ฮาร์ดแวร์"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WiMAX ถูกปิดไว้ด้วยสวิตช์ฮาร์ดแวร์"
 
-#: ../src/applet-device-wifi.c:889
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "เครือข่ายเพิ่มเติม"
 
-#: ../src/applet-device-wifi.c:1068
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "มีเครือข่ายไร้สายบริเวณนี้"
 
-#: ../src/applet-device-wifi.c:1069
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "ใช้เมนูเครือข่ายเพื่อเชื่อมต่อกับเครือข่ายไร้สาย"
 
-#: ../src/applet-device-wifi.c:1072 ../src/applet.c:924
-msgid "Don't show this message again"
-msgstr "ไม่ต้องแสดงข้อความนี้อีก"
-
-#: ../src/applet-device-wifi.c:1263
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, fuzzy, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "คุณเชื่อมต่อกับเครือข่ายไร้สาย '%s' แล้ว"
 
-#: ../src/applet-device-wifi.c:1294
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "กำลังเตรียมการเชื่อมต่อเครือข่ายไร้สาย '%s'..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "กำลังเตรียมเชื่อมต่อเครือข่าย '%s'..."
 
-#: ../src/applet-device-wifi.c:1297
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "กำลังตั้งค่าการเชื่อมต่อเครือข่ายไร้สาย '%s'..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "กำลังตั้งค่าการเชื่อมต่อเครือข่ายโยงสาย '%s'..."
 
-#: ../src/applet-device-wifi.c:1300
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่ายไร้สาย '%s'..."
 
-#: ../src/applet-device-wifi.c:1303
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "กำลังขอที่อยู่จากเครือข่ายไร้สาย '%s'..."
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "กำลังขอที่อยู่สำหรับเครือข่าย '%s'..."
 
-#: ../src/applet-device-wifi.c:1324
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "เครือข่ายไร้สาย '%s' ทำงานอยู่: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1329
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "เครือข่ายไร้สาย '%s' ทำงานอยู่"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "เครือข่ายโยงสาย '%s' ทำงานอยู่"
 
-#: ../src/applet-device-wifi.c:1377
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "เปิดใช้ช่องเชื่อมต่อไม่สำเร็จ"
 
-#: ../src/applet-device-wifi.c:1379 ../src/applet-device-wifi.c:1398
-#: ../src/applet.c:490 ../src/applet.c:534 ../src/applet.c:560
-msgid "Unknown error"
-msgstr "ข้อผิดพลาดไม่ทราบสาเหตุ"
-
-#: ../src/applet-device-wifi.c:1382 ../src/applet-device-wifi.c:1401
-#: ../src/applet.c:493 ../src/applet.c:563
-msgid "Connection failure"
-msgstr "เชื่อมต่อไม่สำเร็จ"
-
-#: ../src/applet-device-wifi.c:1396
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "เพิ่มการเชื่อมต่อรายการใหม่ไม่สำเร็จ"
 
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "เครือข่ายบรอดแบนด์มือถือ WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr "เครือข่ายบรอดแบนด์มือถือ WiMAX"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "ปิดการใช้งาน WiMAX อยู่"
-
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX ถูกปิดไว้ด้วยสวิตช์ฮาร์ดแวร์"
-
-#: ../src/applet-device-wimax.c:428
-msgid "You are now connected to the WiMAX network."
-msgstr "คุณเชื่อมต่อกับเครือข่าย WiMAX แล้ว"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "เกิดข้อผิดพลาดในการแสดงข้อมูลการเชื่อมต่อ:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:313
-#: ../src/libnm-gtk/nm-wireless-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP แบบผันแปร"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "ที่อยู่"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/libnm-gtk/nm-wireless-dialog.c:905
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "ไม่มี"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (ปริยาย)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "ไม่มีข้อมูล"
 
-#: ../src/applet-dialogs.c:361
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "ไม่มีข้อมูล"
 
-#: ../src/applet-dialogs.c:363
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "ไม่ทราบ"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "ที่อยู่ไอพี:"
 
-#: ../src/applet-dialogs.c:375
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "ไม่ทราบ"
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "ที่อยู่บรอดแคสต์:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "ไม่มีข้อมูล"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "ซับเน็ตแมสก์:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "อีเทอร์เน็ต (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "ทั่วไป"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "อินเทอร์เฟซ:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "หมายเลขฮาร์ดแวร์:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ไดรเวอร์:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "ความเร็ว:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "ความปลอดภัย:"
 
-#: ../src/applet-dialogs.c:512
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:525
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "ที่อยู่ไอพี:"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "ไม่มีข้อมูล"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "ที่อยู่บรอดแคสต์:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "ซับเน็ตแมสก์:"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "ไม่มีข้อมูล"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "เส้นทางปริยาย:"
 
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "DNS แรก:"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "DNS ที่สอง:"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "DNS ที่สาม:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "ไม่ใช้"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "ชนิด VPN:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "เกตเวย์ VPN:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "ชื่อผู้ใช้ VPN:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "ข้อความต้อนรับของ VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "การเชื่อมต่อฐาน:"
 
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "ไม่ทราบ"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "ไม่มีการเชื่อมต่อที่ใช้งานอยู่!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -717,406 +920,597 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "และผู้ร่วมสมทบงานและนักแปลในชุมชนอีกเป็นจำนวนมาก"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "แอพเพล็ตพื้นที่แจ้งเหตุสำหรับจัดการอุปกรณ์เครือข่ายและการเชื่อมต่อ"
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "เว็บไซต์ NetworkManager"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "ขาดทรัพยากร"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "รหัสผ่านเครือข่ายบรอดแบนด์มือถือ"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "ต้องการรหัสผ่านในการเชื่อมต่อกับ '%s'"
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: ../src/applet.c:488
-msgid "Failed to add/activate connection"
-msgstr "สร้าง/เปิดใช้การเชื่อมต่อไม่สำเร็จ"
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "ต้องการ PIN ปลดล็อค SIM"
 
-#: ../src/applet.c:532
-msgid "Device disconnect failed"
-msgstr "ตัดการเชื่อมต่อกับอุปกรณ์ไม่สำเร็จ"
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "ต้องการ PIN ปลดล็อค SIM"
 
-#: ../src/applet.c:537
-msgid "Disconnect failure"
-msgstr "ตัดการเชื่อมต่อไม่สำเร็จ"
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr "อุปกรณ์บรอดแบนด์มือถือ '%s' ต้องการรหัส PIN ของ SIM ก่อนที่จะใช้งานได้"
 
-#: ../src/applet.c:558
-msgid "Connection activation failed"
-msgstr "เปิดใช้การเชื่อมต่อไม่สำเร็จ"
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "รหัส PIN:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "แสดงรหัส PIN"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "ต้องการ PUK ปลดล็อค SIM"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "ต้องการ PUK ปลดล็อค SIM"
 
-#: ../src/applet.c:1013
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr "อุปกรณ์บรอดแบนด์มือถือ '%s' ต้องการรหัส PUK ของ SIM ก่อนที่จะใช้งานได้"
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "รหัส PUK:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "ตั้งรหัส PIN ใหม่:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "ป้อนรหัส PIN ที่ตั้งซ้ำอีกครั้ง:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
 msgstr ""
-"\n"
-"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะการเชื่อมต่อถูกขัดจังหวะ"
 
-#: ../src/applet.c:1016
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN หยุดทำงานกะทันหัน"
+"ที่อยู่ไอพีเป็นหมายเลขประจำเครื่องของคุณสำหรับอ้างถึงในเครือข่าย คลิกที่ปุ่ม \"เพิ่ม\" "
+"เพื่อเพิ่มที่อยู่ไอพี"
 
-#: ../src/applet.c:1019
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+#: ../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
+msgid "_Add"
 msgstr ""
-"\n"
-"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN คืนค่าตั้งที่ไม่ถูกต้องกลับมา"
 
-#: ../src/applet.c:1022
-#, c-format
+#. 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
+msgid "_Delete"
+msgstr "_ลบ"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
-msgstr ""
-"\n"
-"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะหมดเวลารอเชื่อมต่อ"
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr "ถ้าเปิดใช้ การเชื่อมต่อนี้จะไม่มีการใช้งานเป็นการเชื่อมต่อปริยาย"
 
-#: ../src/applet.c:1025
-#, c-format
+#: ../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…"
+msgstr "สร้าง…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "เลือกชนิดการเชื่อมต่อ VPN"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"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."
 msgstr ""
-"\n"
-"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN ไม่เริ่มทำงานในเวลาที่กำหนด"
+"เลือกชนิดของ VPN ที่คุณต้องการใช้สำหรับการเชื่อมต่อใหม่นี้ ถ้าชนิดของการเชื่อมต่อ VPN "
+"ที่คุณต้องการสร้างไม่มีอยู่ในรายชื่อนี้ ก็แปลว่าคุณอาจไม่ได้ติดตั้งปลั๊กอิน VPN ที่ถูกต้องไว้"
 
-#: ../src/applet.c:1028
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
 msgstr ""
-"\n"
-"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN เริ่มทำงานไม่สำเร็จ"
 
-#: ../src/applet.c:1031
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "ที่อยู่บรอดแคสต์:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "การเชื่อมต่อฐาน:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "แ_ก้ไข"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "อินเทอร์เฟซ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะไม่มีข้อมูลลับ VPN ที่จะใช้เข้าระบบ"
 
-#: ../src/applet.c:1034
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "DNS แรก:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
 msgstr ""
-"\n"
-"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะข้อมูลลับ VPN ไม่ถูกต้อง"
 
-#: ../src/applet.c:1041
+#: ../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:"
+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
+msgid "bytes"
+msgstr "ไบต์"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "การรักษาความ_ปลอดภัย:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "การเชื่อมต่อฐาน:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "เปิดใช้เ_ครือข่าย"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "อัตโนมัติ"
+
+#: ../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
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+msgid "default"
+msgstr "ปริยาย"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"\n"
-"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จ"
 
-#: ../src/applet.c:1059
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "ที่อยู่"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "ที่อยู่"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+msgid "invalid %s for %s (%s)"
 msgstr ""
-"\n"
-"การเชื่อมต่อ VPN '%s' ถูกตัดเพราะการเชื่อมต่อเครือข่ายถูกขัดจังหวะ"
 
-#: ../src/applet.c:1062
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+msgid "invalid %s (%s)"
 msgstr ""
-"\n"
-"การเชื่อมต่อ VPN '%s' ถูกตัดเพราะบริการ VPN หยุดทำงาน"
 
-#: ../src/applet.c:1068
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+msgid "invalid interface-name for %s (%s)"
 msgstr ""
-"\n"
-"การเชื่อมต่อ VPN '%s' ถูกตัด"
 
-#: ../src/applet.c:1098
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid ""
-"VPN connection has been successfully established.\n"
-"\n"
-"%s\n"
+msgid "invalid interface-name (%s)"
 msgstr ""
-"การเชื่อมต่อ VPN เชื่อมต่อสำเร็จแล้ว\n"
-"\n"
-"%s\n"
 
-#: ../src/applet.c:1100
-msgid "VPN connection has been successfully established.\n"
-msgstr "การเชื่อมต่อ VPN เชื่อมต่อสำเร็จแล้ว\n"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "อุปกรณ์ใดๆ"
 
-#: ../src/applet.c:1102
-msgid "VPN Login Message"
-msgstr "ข้อความเข้าระบบ VPN"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "ไม่สามารถปรับข้อมูลข้อมูลลับของการเชื่อมต่อเนื่องจากเกิดข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../src/applet.c:1108 ../src/applet.c:1116 ../src/applet.c:1166
-msgid "VPN Connection Failed"
-msgstr "เชื่อมต่อ VPN ไม่สำเร็จ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "ใช้การรักษาความปลอดภัย 802.1_X สำหรับการเชื่อมต่อนี้"
 
-#: ../src/applet.c:1173
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
 msgstr ""
-"\n"
-"เชื่อมต่อเครือข่าย VPN '%s' ไม่สำเร็จเพราะบริการ VPN เริ่มทำงานไม่สำเร็จ\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1176
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
 msgstr ""
-"\n"
-"การเชื่อมต่อ VPN '%s' เริ่มทำงานไม่สำเร็จ\n"
-"\n"
-"%s"
-
-#: ../src/applet.c:1496
-msgid "device not ready (firmware missing)"
-msgstr "อุปกรณ์ไม่พร้อม (ขาดเฟิร์มแวร์)"
 
-#: ../src/applet.c:1498
-msgid "device not ready"
-msgstr "อุปกรณ์ไม่พร้อม"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1524
-msgid "Disconnect"
-msgstr "ตัดการเชื่อมต่อ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1538
-msgid "device not managed"
-msgstr "อุปกรณ์ไม่มีการจัดการ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.c:1582
-msgid "No network devices available"
-msgstr "ไม่มีอุปกรณ์เครือข่ายในระบบ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.c:1670
-msgid "_VPN Connections"
-msgstr "_การเชื่อมต่อ VPN"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.c:1727
-msgid "_Configure VPN..."
-msgstr "_ตั้งค่า VPN..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.c:1731
-msgid "_Disconnect VPN"
-msgstr "ตั_ดการเชื่อมต่อ VPN"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.c:1825
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager ไม่ได้ทำงานอยู่..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.c:1830 ../src/applet.c:2631
-msgid "Networking disabled"
-msgstr "ปิดการใช้งานเครือข่ายอยู่"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2051
-msgid "Enable _Networking"
-msgstr "เปิดใช้เ_ครือข่าย"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2060
-msgid "Enable _Wireless"
-msgstr "เปิดใช้ไ_ร้สาย"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2069
-msgid "Enable _Mobile Broadband"
-msgstr "เปิดใช้บรอดแบนด์_มือถือ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2078
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "เปิดใช้บรอดแบนด์มือถือ WiMA_X"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#. Toggle notifications item
-#: ../src/applet.c:2089
-msgid "Enable N_otifications"
-msgstr "เปิดใช้การแ_จ้งเหตุ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2100
-msgid "Connection _Information"
-msgstr "_ข้อมูลการเชื่อมต่อ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2110
-msgid "Edit Connections..."
-msgstr "แก้ไขการเชื่อมต่อ..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2124
-msgid "_Help"
-msgstr "_วิธีใช้"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2133
-msgid "_About"
-msgstr "เ_กี่ยวกับ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.c:2310
-msgid "Disconnected"
-msgstr "ตัดการเชื่อมต่อแล้ว"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2311
-msgid "The network connection has been disconnected."
-msgstr "การเชื่อมต่อเครือข่ายถูกตัดแล้ว"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2494
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "กำลังเตรียมเชื่อมต่อเครือข่าย '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2497
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่าย '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:2503
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "การเชื่อมต่อเครือข่าย '%s' เปิดทำงานแล้ว"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:2586
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "กำลังเปิดการเชื่อมต่อ VPN '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.c:2589
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "ต้องยืนยันตัวบุคคลสำหรับการเชื่อมต่อเครือข่าย VPN '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
 
-#: ../src/applet.c:2592
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "กำลังขอที่อยู่ VPN สำหรับ '%s'..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
 
-#: ../src/applet.c:2595
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "การเชื่อมต่อ VPN '%s' เปิดทำงานแล้ว"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
 
-#: ../src/applet.c:2636
-msgid "No network connection"
-msgstr "ไม่ได้เชื่อมกับเครือข่าย"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.c:3336
-msgid "NetworkManager Applet"
-msgstr "แอพเพล็ต NetworkManager"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "ปลดล็อคอุปกรณ์นี้โดยอัตโนมัติ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "_ปลดล็อค"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Connection Information"
-msgstr "ข้อมูลการเชื่อมต่อ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Active Network Connections"
-msgstr "การเชื่อมต่อเครือข่ายที่เปิดทำงานอยู่"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "การยืนยันตัวบุคคลกับเครือข่ายโยงสาย 802.1X"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
-msgstr "_ชื่อเครือข่าย:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "อัตโนมัติ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:318
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "ไม่สามารถปรับข้อมูลข้อมูลลับของการเชื่อมต่อเนื่องจากเกิดข้อผิดพลาดไม่ทราบสาเหตุ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 msgstr ""
-"ที่อยู่ไอพีเป็นหมายเลขประจำเครื่องของคุณสำหรับอ้างถึงในเครือข่าย คลิกที่ปุ่ม \"เพิ่ม\" "
-"เพื่อเพิ่มที่อยู่ไอพี"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-msgid "Ig_nore automatically obtained routes"
-msgstr "ไ_ม่สนใจเส้นทางเครือข่ายที่ได้รับมาแบบอัตโนมัติ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "_Use this connection only for resources on its network"
-msgstr "ใ_ช้การเชื่อมต่อนี้เพื่อเก็บข้อมูลของตัวเครือข่ายเท่านั้น"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
-msgstr "ถ้าเปิดใช้ การเชื่อมต่อนี้จะไม่มีการใช้งานเป็นการเชื่อมต่อปริยาย"
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:8
+#: ../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
@@ -1129,15 +1523,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 msgid "Sho_w password"
 msgstr "แ_สดงรหัสผ่าน"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../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
@@ -1145,15 +1541,168 @@ msgstr "แ_สดงรหัสผ่าน"
 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-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#: ../src/connection-editor/page-ip6.c:142
+#: ../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
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Twisted Pair (TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Attachment Unit Interface (AUI)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Media Independent Interface (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Mb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Gb/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "_พอร์ต:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "ความเ_ร็ว:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "สื่อสาร_สองทางเต็มอัตรา"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "ตกลงแ_ลกเปลี่ยนอัตโนมัติ"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "_บริการ:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+msgid "C_loned MAC address:"
+msgstr "หมายเลข MAC ฉบับ_จำลอง:"
+
+#: ../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 ""
+"หมายเลข MAC ที่ป้อนที่นี่จะถูกใช้เป็นหมายเลขฮาร์ดแวร์สำหรับอุปกรณ์เครือข่ายที่การเชื่อมต่อนี้ทำงานอยู่ "
+"ความสามารถนี้เรียกกันว่าการปลอม MAC (MAC cloning หรือ spoofing) ตัวอย่าง: "
+"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.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "ปริยาย"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "ไม่ใช้"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "ที่อยู่บรอดแคสต์:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_รหัสผ่านกุญแจส่วนตัว:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "เ_ชื่อมต่อ"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1161,8 +1710,8 @@ msgstr "อัตโนมัติโดยกำหนด DNS เอง"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "กำหนดเอง"
 
@@ -1173,22 +1722,22 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "แบ่งปันให้เครื่องอื่น"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_วิธีการ:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "ที่อยู่"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1197,33 +1746,32 @@ msgstr ""
 "ชื่อของลูกข่าย DHCP จะเปิดให้ผู้ดูแลเครือข่ายสามารถปรับแต่งค่าสำหรับเครื่องของคุณโดยเฉพาะได้ "
 "ถ้าคุณต้องการใช้ชื่อลูกข่าย DHCP ก็ป้อนได้ที่นี่"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 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.h:13
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "โดเมนที่_ค้นหา:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "เซิร์ฟเวอร์ _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1231,27 +1779,54 @@ msgstr ""
 "รายชื่อที่อยู่ไอพีของเซิร์ฟเวอร์โดเมนเนมที่จะใช้เปิดหาที่อยู่ของชื่อโฮสต์ "
 "ใช้จุลภาคคั่นระหว่างที่อยู่ของเซิร์ฟเวอร์ต่างๆ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 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:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "เ_ส้นทาง…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "ปิดใช้งาน"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "บังคับใช้ที่อยู่ IPv_6 สำหรับการเชื่อมต่อนี้"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1259,63 +1834,38 @@ msgstr ""
 "เมื่อเชื่อมต่อกับเครือข่ายที่รองรับ IPv4 จะยอมเชื่อมต่อถ้าตั้งค่า IPv6 ไม่ผ่านแต่ตั้งค่า IPv4 ได้สำเร็จ"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "เครือข่ายใดๆ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "เน้น 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "เน้น 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "Basic"
 msgstr "พื้นฐาน"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "เ_ลขหมาย:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "ขั้นสูง"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "ชื่อเ_ครือข่าย:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "ช_นิด:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "เปลี่ยน..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "เปิดใช้บริการ_ข้ามเครือข่ายถ้าออกนอกเครือข่ายเหย้า"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "แ_สดงรหัสผ่าน"
 
@@ -1367,194 +1917,177 @@ msgstr "การสะท้อนข้อมูล"
 msgid "Send PPP _echo packets"
 msgstr "ส่งแพ็กเก็ตสะ_ท้อนของ PPP"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "Twisted Pair (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Attachment Unit Interface (AUI)"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "Media Independent Interface (MII)"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "การเชื่อมต่อฐาน:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 Mb/s"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Mb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "อินเทอร์เฟซ:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "หมายเลข MAC ฉบับ_จำลอง:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "_พอร์ต:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "ความเ_ร็ว:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "สื่อสาร_สองทางเต็มอัตรา"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "ตกลงแ_ลกเปลี่ยนอัตโนมัติ"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "_Device MAC address:"
-msgstr "_หมายเลข MAC ของอุปกรณ์:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "C_loned MAC address:"
-msgstr "หมายเลข MAC ฉบับ_จำลอง:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-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"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
 msgstr ""
-"หมายเลข MAC ที่ป้อนที่นี่จะถูกใช้เป็นหมายเลขฮาร์ดแวร์สำหรับอุปกรณ์เครือข่ายที่การเชื่อมต่อนี้ทำงานอยู่ "
-"ความสามารถนี้เรียกกันว่าการปลอม MAC (MAC cloning หรือ spoofing) ตัวอย่าง: "
-"00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "ไบต์"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr "การรักษาความ_ปลอดภัย:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "Infrastructure"
-msgstr "โครงสร้างพื้นฐาน"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "เฉพาะกิจ"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "_กำลังส่ง:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_อัตรา:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"ตัวเลือกนี้จะล็อคการเชื่อมต่อนี้เข้ากับ access point (AP) ที่ระบุโดย BSSID ที่ป้อนนี้ ตัวอย่าง: "
-"00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_ช่องสัญญาณ:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "ย่านความ_ถี่:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "M_ode:"
-msgstr "โห_มด:"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "S_ecurity:"
-msgstr "การรักษาความ_ปลอดภัย:"
+#: ../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:1
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
 msgid "Allowed Authentication Methods"
 msgstr "วิธียืนยันตัวบุคคลที่เปิดใช้:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol รุ่นที่ 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1562,600 +2095,906 @@ msgstr ""
 "โดยทั่วไปแล้ว เซิร์ฟเวอร์ PPP ของผู้ให้บริการจะรองรับวิธียืนยันตัวบุคคลทั้งหมด "
 "แต่ถ้าการเชื่อมต่อไม่สำเร็จ ก็ลองปิดการรองรับบางวิธีดู"
 
-#: ../src/connection-editor/ce-vpn-wizard.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/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+#, fuzzy
+msgid "Ethernet"
+msgstr "อีเทอร์เน็ตอัตโนมัติ"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "เลือกชนิดการเชื่อมต่อ VPN"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-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."
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
 msgstr ""
-"เลือกชนิดของ VPN ที่คุณต้องการใช้สำหรับการเชื่อมต่อใหม่นี้ ถ้าชนิดของการเชื่อมต่อ VPN "
-"ที่คุณต้องการสร้างไม่มีอยู่ในรายชื่อนี้ ก็แปลว่าคุณอาจไม่ได้ติดตั้งปลั๊กอิน VPN ที่ถูกต้องไว้"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Create…"
-msgstr "สร้าง…"
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr "DSL"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:911
-#: ../src/connection-editor/page-ip6.c:877
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "หมายเลขฮาร์ดแวร์:"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "ส่งออกการเชื่อมต่อ VPN..."
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "ไม่สามารถตั้งต้นกล่องโต้ตอบแก้ไขการเชื่อมต่อ เนื่องจากความผิดพลาดที่ไม่ทราบสาเหตุ"
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "ไม่สามารถสร้างการเชื่อมต่อรายการใหม่"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "ลบการเชื่อมต่อไม่สำเร็จ"
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "แน่ใจหรือไม่ว่าคุณต้องการลบการเชื่อมต่อ %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
 msgid "Address"
 msgstr "ที่อยู่"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:928
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "เน็ตแมสก์"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:945
-#: ../src/connection-editor/page-ip6.c:911
+#: ../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
 msgid "Gateway"
 msgstr "เกตเวย์"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metric"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:894
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Prefix"
 
-#: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1518
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "แก้ไข %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "แก้ไขการเชื่อมต่อไม่มีชื่อ"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_ชื่อการเชื่อมต่อ:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "เกิดข้อผิดพลาดขณะตั้งต้นเครื่องมือแก้ไข"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "เพิ่มการเชื่อมต่อไม่สำเร็จ"
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+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:419
+msgid "_Save"
+msgstr "_บันทึก"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "บันทึกการเปลี่ยนแปลงใดๆ ที่ได้ทำไว้กับการเชื่อมต่อนี้"
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "ยืนยันตัวบุคคลเพื่อบันทึกการเปลี่ยนแปลงใดๆ ที่ได้ทำไว้กับการเชื่อมต่อนี้"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "ไม่สามารถสร้างการเชื่อมต่อรายการใหม่"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "ไม่สามารถแก้ไขการเชื่อมต่อ"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+msgid "Unknown error creating connection editor dialog."
+msgstr "เกิดข้อผิดพลาดขณะสร้างกล่องโต้ตอบแก้ไขการเชื่อมต่อ"
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "เกิดข้อผิดพลาดขณะตั้งต้นเครื่องมือแก้ไข"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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
+msgid "Connection _name:"
+msgstr "_ชื่อการเชื่อมต่อ:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "_ส่งออก"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "ไม่เคยใช้"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "เดี๋ยวนี้"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d นาทีที่แล้ว"
+
+#: ../src/connection-editor/nm-connection-list.c:160
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d ชั่วโมงที่แล้ว"
+
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d วันที่แล้ว"
+
+#: ../src/connection-editor/nm-connection-list.c:178
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d เดือนที่แล้ว"
+
+#: ../src/connection-editor/nm-connection-list.c:182
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d ปีที่แล้ว"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "ชื่อ"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "ใช้ล่าสุด"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "แก้ไขการเชื่อมต่อที่เลือก"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "ยืนยันตัวบุคคลเพื่อแก้ไขการเชื่อมต่อที่เลือก"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "ลบการเชื่อมต่อที่เลือก"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "ยืนยันตัวบุคคลเพื่อลบการเชื่อมต่อที่เลือก"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "ไม่ทราบว่าจะสร้างการเชื่อมต่อ '%s' อย่างไร"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "เกิดข้อผิดพลาดขณะสร้างการเชื่อมต่อ"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr "เกิดข้อผิดพลาดขณะแก้ไขการเชื่อมต่อ"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "ไม่พบการเชื่อมต่อที่มี UUID '%s'"
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "การรักษาความปลอดภัย 802.1x"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับการรักษาความปลอดภัย WiFi"
+
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr "ใช้การรักษาความปลอดภัย 802.1_X สำหรับการเชื่อมต่อนี้"
+
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "หาอุปกรณ์บลูทูทไม่พบ"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "การเชื่อมต่อโยงสาย %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "เปิดใช้เ_ครือข่าย"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "เครือข่ายไร้สาย"
+
+#: ../src/connection-editor/page-bond.c:447
+#, fuzzy
+msgid "Could not load bond user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "DNS แรก:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "การเชื่อมต่อโยงสาย %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "การเชื่อมต่อโยงสาย %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ DSL"
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ DSL"
 
-#: ../src/connection-editor/page-dsl.c:232
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "การเชื่อมต่อ DSL %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"ตัวเลือกนี้จะล็อคการเชื่อมต่อไว้กับอุปกรณ์เครือข่ายที่ระบุโดยหมายเลข MAC นี้ ตัวอย่าง: "
+"00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "อีเทอร์เน็ต (%s)"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "หมายเลข MAC ฉบับ_จำลอง:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "ปริยาย"
+
+#: ../src/connection-editor/page-general.c:52
+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 ไม่ได้ทำงานอยู่..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+#, fuzzy
+msgid "Could not load InfiniBand user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ WiFi"
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "การเชื่อมต่อโยงสาย %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "อัตโนมัติ (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "อัตโนมัติ (VPN) เฉพาะที่อยู่"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "อัตโนมัติ (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "อัตโนมัติ (PPP) เฉพาะที่อยู่"
+msgid "Automatic, addresses only"
+msgstr "อัตโนมัติ เฉพาะที่อยู่"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "อัตโนมัติ (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "อัตโนมัติ (PPPoE) เฉพาะที่อยู่"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "อัตโนมัติ (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "อัตโนมัติ (DHCP) เฉพาะที่อยู่"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "เชื่อมภายในเท่านั้น"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "ปิดใช้งาน"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "เซิร์ฟเวอร์ _DNS เพิ่มเติม:"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "โดเมน_ค้นหาเพิ่มเติม:"
 
-#: ../src/connection-editor/page-ip4.c:843
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "แก้ไขเส้นทาง IPv4 สำหรับ %s"
 
-#: ../src/connection-editor/page-ip4.c:992
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "ตั้งค่า IPv4"
 
-#: ../src/connection-editor/page-ip4.c:994
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ IPv4"
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "อัตโนมัติ เฉพาะที่อยู่"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "ไม่ใช้"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "อัตโนมัติ ใช้ DHCP เท่านั้น"
 
-#: ../src/connection-editor/page-ip6.c:809
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "แก้ไขเส้นทาง IPv6 สำหรับ %s"
 
-#: ../src/connection-editor/page-ip6.c:956
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "ตั้งค่า IPv6"
 
-#: ../src/connection-editor/page-ip6.c:958
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ IPv6"
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับบรอดแบนด์มือถือ"
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "ไม่รองรับการเชื่อมต่อบรอดแบนด์มือถือชนิดนี้"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:639
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "เลือกชนิดของผู้ให้บริการบรอดแบนด์มือถือ"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr ""
 "เลือกเทคโนโลยีที่ผู้ให้บริการบรอดแบนด์มือถือของคุณใช้ ถ้าคุณไม่แน่ใจ ขอให้สอบถามผู้ให้บริการของคุณ"
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยีที่มี _GSM เป็นพื้นฐาน (คือ GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "ผู้ให้บริการของฉันใช้เทคโนโลยีที่มี C_DMA เป็นพื้นฐาน (คือ 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "ไม่มี"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:282
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "ตั้งค่า PPP"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ PPP"
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-#: ../src/connection-editor/nm-connection-list.c:1514
-msgid "VPN"
-msgstr "VPN"
+#: ../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 "เลือกแฟ้มที่จะนำเข้า"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "การเชื่อมต่อโยงสาย %d"
 
-#: ../src/connection-editor/page-vpn.c:111
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "ไม่ได้เชื่อมกับเครือข่าย"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ IPv4"
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "การเชื่อมต่อ %d"
+
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ VPN"
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "หาปลั๊กอินบริการ VPN สำหรับ '%s' ไม่พบ"
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:899
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "การเชื่อมต่อ %d"
 
-#: ../src/connection-editor/page-wired.c:89
-#: ../src/connection-editor/page-wireless.c:94
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 msgstr ""
-"ตัวเลือกนี้จะล็อคการเชื่อมต่อไว้กับอุปกรณ์เครือข่ายที่ระบุโดยหมายเลข MAC นี้ ตัวอย่าง: "
-"00:11:22:33:44:55"
-
-#: ../src/connection-editor/page-wired.c:272
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:1502
-msgid "Wired"
-msgstr "โยงสาย"
-
-#: ../src/connection-editor/page-wired.c:274
-msgid "Could not load wired user interface."
-msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับเครือข่ายโยงสาย"
-
-#: ../src/connection-editor/page-wired.c:449
-#, c-format
-msgid "Wired connection %d"
-msgstr "การเชื่อมต่อโยงสาย %d"
+"ปลั๊กอิน VPN ไม่สามารถนำเข้าการเชื่อมต่อ VPN ได้อย่างถูกต้อง\n"
+"\n"
+"ข้อผิดพลาด: ไม่มีชนิดของบริการ VPN"
 
-#: ../src/connection-editor/page-wired-security.c:119
-msgid "802.1x Security"
-msgstr "การรักษาความปลอดภัย 802.1x"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "เลือกชนิดการเชื่อมต่อ VPN"
 
-#: ../src/connection-editor/page-wired-security.c:121
-msgid "Could not load Wired Security security user interface."
-msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับการรักษาความปลอดภัยเครือข่ายโยงสาย"
+#: ../src/connection-editor/page-vpn.c:255
+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 ที่ถูกต้องไว้"
 
-#: ../src/connection-editor/page-wired-security.c:139
-msgid "Use 802.1_X security for this connection"
-msgstr "ใช้การรักษาความปลอดภัย 802.1_X สำหรับการเชื่อมต่อนี้"
+#: ../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 ""
+"ตัวเลือกนี้จะล็อคการเชื่อมต่อนี้เข้ากับ access point (AP) ที่ระบุโดย BSSID ที่ป้อนนี้ ตัวอย่าง: "
+"00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
-#, c-format
-msgid "default"
-msgstr "ปริยาย"
+#: ../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)\""
+msgstr ""
+"ตัวเลือกนี้จะล็อคการเชื่อมต่อไว้กับอุปกรณ์เครือข่ายที่ระบุโดยหมายเลข MAC นี้ ตัวอย่าง: "
+"00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:457
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:1506
-msgid "Wireless"
-msgstr "ไร้สาย"
-
-#: ../src/connection-editor/page-wireless.c:459
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับ WiFi"
 
-#: ../src/connection-editor/page-wireless.c:663
-#, c-format
-msgid "Wireless connection %d"
-msgstr "การเชื่อมต่อไร้สาย %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "อุปกรณ์ใดๆ"
+
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "การเชื่อมต่อโยงสาย %d"
 
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/libnm-gtk/nm-wireless-dialog.c:922
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:300
-#: ../src/libnm-gtk/nm-wireless-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 บิต แบบวลีรหัสผ่าน"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:961
+#: ../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)"
 msgstr "WEP แบบผันแปร (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:340
-#: ../src/libnm-gtk/nm-wireless-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ส่วนบุคคล"
 
-#: ../src/connection-editor/page-wireless-security.c:354
-#: ../src/libnm-gtk/nm-wireless-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 เอนเทอร์ไพรส์"
 
-#: ../src/connection-editor/page-wireless-security.c:395
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับการรักษาความปลอดภัย WiFi; ไม่ได้ตั้งค่า WiFi ไว้"
 
-#: ../src/connection-editor/page-wireless-security.c:405
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "การรักษาความปลอดภัยเครือข่ายไร้สาย"
 
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
 msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับการรักษาความปลอดภัย WiFi"
 
-#: ../src/connection-editor/nm-connection-editor.c:102
-#, c-format
-msgid "Editing %s"
-msgstr "แก้ไข %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:106
-msgid "Editing un-named connection"
-msgstr "แก้ไขการเชื่อมต่อไม่มีชื่อ"
-
-#: ../src/connection-editor/nm-connection-editor.c:292
-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:395
-msgid "Error creating connection editor dialog."
-msgstr "เกิดข้อผิดพลาดขณะสร้างกล่องโต้ตอบแก้ไขการเชื่อมต่อ"
-
-#: ../src/connection-editor/nm-connection-editor.c:407
-msgid "_Save"
-msgstr "_บันทึก"
-
-#: ../src/connection-editor/nm-connection-editor.c:408
-msgid "Save any changes made to this connection."
-msgstr "บันทึกการเปลี่ยนแปลงใดๆ ที่ได้ทำไว้กับการเชื่อมต่อนี้"
-
-#: ../src/connection-editor/nm-connection-editor.c:409
-msgid "_Save..."
-msgstr "_บันทึก..."
-
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "ยืนยันตัวบุคคลเพื่อบันทึกการเปลี่ยนแปลงใดๆ ที่ได้ทำไว้กับการเชื่อมต่อนี้"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "_Import"
-msgstr "_นำเข้า"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "E_xport"
-msgstr "_ส่งออก"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-msgid "Connection _name:"
-msgstr "_ชื่อการเชื่อมต่อ:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-msgid "Connect _automatically"
-msgstr "เชื่อมต่อโดย_อัตโนมัติ"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "A_vailable to all users"
-msgstr "เปิดให้ผู้ใช้ทุกคนสามารถใช้ได้"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "ไม่เคยใช้"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "เดี๋ยวนี้"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d นาทีที่แล้ว"
-
-#: ../src/connection-editor/nm-connection-list.c:249
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d ชั่วโมงที่แล้ว"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d วันที่แล้ว"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d เดือนที่แล้ว"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d ปีที่แล้ว"
-
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "เพิ่มการเชื่อมต่อไม่สำเร็จ"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "เกิดข้อผิดพลาดขณะบันทึกข้อมูลการเชื่อมต่อ"
-
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "คุณสมบัติ '%s' / '%s' ไม่ถูกต้อง: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-msgstr "เกิดข้อผิดพลาดขณะตั้งต้นเครื่องมือแก้ไข"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:719
-#: ../src/connection-editor/nm-connection-list.c:885
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
-msgstr "ไม่สามารถตั้งต้นกล่องโต้ตอบแก้ไขการเชื่อมต่อ เนื่องจากความผิดพลาดที่ไม่ทราบสาเหตุ"
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "ไม่สามารถสร้างการเชื่อมต่อรายการใหม่"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "ไม่สามารถแก้ไขการเชื่อมต่อรายการใหม่"
-
-#: ../src/connection-editor/nm-connection-list.c:733
-msgid "Could not edit connection"
-msgstr "ไม่สามารถแก้ไขการเชื่อมต่อ"
-
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "ลบการเชื่อมต่อไม่สำเร็จ"
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:795
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "แน่ใจหรือไม่ว่าคุณต้องการลบการเชื่อมต่อ %s?"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:929
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "ไม่สามารถนำเข้าการเชื่อมต่อ VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:931
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"ปลั๊กอิน VPN ไม่สามารถนำเข้าการเชื่อมต่อ VPN ได้อย่างถูกต้อง\n"
-"\n"
-"ข้อผิดพลาด: ไม่มีชนิดของบริการ VPN"
-
-#: ../src/connection-editor/nm-connection-list.c:944
-msgid "Could not edit imported connection"
-msgstr "ไม่สามารถแก้ไขการเชื่อมต่อที่นำเข้า"
-
-#: ../src/connection-editor/nm-connection-list.c:1125
-msgid "Name"
-msgstr "ชื่อ"
-
-#: ../src/connection-editor/nm-connection-list.c:1137
-msgid "Last Used"
-msgstr "ใช้ล่าสุด"
-
-#: ../src/connection-editor/nm-connection-list.c:1263
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr "ไม่มีปลั๊กอิน VPN ติดตั้งอยู่ กรุณาติดตั้งปลั๊กอินเพื่อเปิดใช้งานปุ่มนี้"
-
-#: ../src/connection-editor/nm-connection-list.c:1274
-msgid "_Edit"
-msgstr "แ_ก้ไข"
-
-#: ../src/connection-editor/nm-connection-list.c:1275
-msgid "Edit the selected connection"
-msgstr "แก้ไขการเชื่อมต่อที่เลือก"
-
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "_Edit..."
-msgstr "แ_ก้ไข..."
-
-#: ../src/connection-editor/nm-connection-list.c:1277
-msgid "Authenticate to edit the selected connection"
-msgstr "ยืนยันตัวบุคคลเพื่อแก้ไขการเชื่อมต่อที่เลือก"
-
-#: ../src/connection-editor/nm-connection-list.c:1292
-msgid "_Delete"
-msgstr "_ลบ"
-
-#: ../src/connection-editor/nm-connection-list.c:1293
-msgid "Delete the selected connection"
-msgstr "ลบการเชื่อมต่อที่เลือก"
-
-#: ../src/connection-editor/nm-connection-list.c:1294
-msgid "_Delete..."
-msgstr "_ลบ..."
-
-#: ../src/connection-editor/nm-connection-list.c:1295
-msgid "Authenticate to delete the selected connection"
-msgstr "ยืนยันตัวบุคคลเพื่อลบการเชื่อมต่อที่เลือก"
-
-#: ../src/connection-editor/nm-connection-list.c:1574
-msgid "Error creating connection"
-msgstr "เกิดข้อผิดพลาดขณะสร้างการเชื่อมต่อ"
-
-#: ../src/connection-editor/nm-connection-list.c:1575
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "ไม่ทราบว่าจะสร้างการเชื่อมต่อ '%s' อย่างไร"
-
-#: ../src/connection-editor/nm-connection-list.c:1630
-#: ../src/connection-editor/nm-connection-list.c:1642
-msgid "Error editing connection"
-msgstr "เกิดข้อผิดพลาดขณะแก้ไขการเชื่อมต่อ"
-
-#: ../src/connection-editor/nm-connection-list.c:1631
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "ไม่ทราบว่าจะแก้ไขการเชื่อมต่อ '%s' อย่างไร"
-
-#: ../src/connection-editor/nm-connection-list.c:1643
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "ไม่พบการเชื่อมต่อที่มี UUID '%s'"
-
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2167,29 +3006,30 @@ msgstr ""
 "\n"
 "ข้อผิดพลาด: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:263
-msgid "Select file to import"
-msgstr "เลือกแฟ้มที่จะนำเข้า"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "ข้อผิดพลาดไม่ทราบสาเหตุ"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "แฟ้มชื่อ \"%s\" มีอยู่ก่อนแล้ว"
 
-#: ../src/connection-editor/vpn-helpers.c:316
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "แ_ทนที่"
 
-#: ../src/connection-editor/vpn-helpers.c:318
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:354
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "ไม่สามารถส่งออกการเชื่อมต่อ VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:356
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2200,111 +3040,58 @@ msgstr ""
 "\n"
 "ข้อผิดพลาด: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:391
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "ส่งออกการเชื่อมต่อ VPN..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "ไม่สามารถตั้งต่าบลูทูทได้ (เชื่อมต่อกับ D-Bus ไม่สำเร็จ: (%s) %s)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "ไม่สามารถตั้งต่าบลูทูทได้ (เกิดข้อผิดพลาดขณะหา NetworkManager: (%s) %s)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:445
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "ใช้โทรศัพท์มือถือของคุณเป็นอุปกรณ์เครือข่าย (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:454
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "เข้าถึงอินเทอร์เน็ตโดยใช้โทรศัพท์มือถือของคุณ (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:318
-#, c-format
-msgid "Error: %s"
-msgstr "ความผิดพลาด: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:425
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "สร้างการเชื่อมต่อ DUN ไม่สำเร็จ: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:427
-#: ../src/gnome-bluetooth/nma-bt-device.c:833
-msgid "Your phone is now ready to use!"
-msgstr "โทรศัพท์ของคุณพร้อมใช้งานแล้ว!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:450
-msgid "Mobile wizard was canceled"
-msgstr "เครื่องมือวิเศษสำหรับมือถือถูกยกเลิก"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:459
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "ไม่รู้จักชนิดของอุปกรณ์โทรศัพท์ (ไม่ใช่ GSM หรือ CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:567
-msgid "unknown modem type."
-msgstr "ไม่ทราบชนิดของโมเด็ม"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:639
-#: ../src/gnome-bluetooth/nma-bt-device.c:645
-msgid "failed to connect to the phone."
-msgstr "เชื่อมต่อกับโทรศัพท์ไม่สำเร็จ"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:676
-msgid "unexpectedly disconnected from the phone."
-msgstr "การเชื่อมต่อกับโทรศัพท์ถูกตัดกะทันหัน"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:686
-msgid "timed out detecting phone details."
-msgstr "หมดเวลาคอยขณะตรวจหารายละเอียดของโทรศัพท์"
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr "แอพเพล็ต NetworkManager ไม่พบข้อมูลบางอย่างที่ต้องใช้ (ไม่พบแฟ้ม .ui)"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:697
-msgid "Detecting phone configuration..."
-msgstr "กำลังตรวจหาการตั้งค่าของโทรศัพท์..."
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "_ปลดล็อค"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr "ต้องเปิดใช้การติดต่อบลูทูทก่อนที่จะตั้งค่าการเชื่อมต่อเครือข่ายแบบหมุนโทรศัพท์"
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "ปลดล็อคอุปกรณ์นี้โดยอัตโนมัติ"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:831
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "สร้างการเชื่อมต่อ PAN ไม่สำเร็จ: %s"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "ข้อมูลการเชื่อมต่อ"
 
-#: ../src/gnome-bluetooth/nma-bt-device.c:852
-#, c-format
-msgid "%s Network"
-msgstr "เครือข่าย %s"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "การเชื่อมต่อเครือข่ายที่เปิดทำงานอยู่"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:205
+#: ../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/libnm-gtk/nm-mobile-wizard.c:212
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "อุปกรณ์ของคุณ:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:223
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "ผู้ให้บริการของคุณ:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:234
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "แผนของคุณ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:259
+#: ../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 "
@@ -2317,23 +3104,28 @@ msgstr ""
 "ก็กรุณาตรวจสอบการตั้งค่าของคุณใหม่ การแก้ไขค่าตั้งบรอดแบนด์มือถือ ทำได้โดยเลือก "
 "\"การเชื่อมต่อเครือข่าย\" จากเมนู \"ระบบ\" >> \"ปรับแต่งพื้นโต๊ะ\""
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:271
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "ยืนยันการตั้งค่าบรอดแบนด์มือถือ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:332
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "ไม่ระบุ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:487
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "เ_ลือกแผนของคุณ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:511
+#: ../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/libnm-gtk/nm-mobile-wizard.c:535
+#: ../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"
@@ -2345,302 +3137,450 @@ msgstr ""
 "\n"
 "ถ้าคุณไม่แน่ใจเกี่ยวกับแผนของคุณ กรุณาสอบถามผู้ให้บริการของคุณเกี่ยวกับ APN สำหรับแผนที่คุณใช้"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:542
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "เลือกแผนการจ่ายเงินของคุณ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:590
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "แผนที่ฉันใช้ไม่มีในรายชื่อ..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:747
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "เลือกผู้ให้บริการของคุณจาก_รายชื่อ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:760
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "ผู้ให้บริการ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:785
+#: ../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/libnm-gtk/nm-mobile-wizard.c:796
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "ผู้ให้บริการ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:820
+#: ../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/libnm-gtk/nm-mobile-wizard.c:826
+#: ../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/libnm-gtk/nm-mobile-wizard.c:837
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "เลือกผู้ให้บริการของคุณ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1088
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "รายชื่อประเทศหรือภูมิภาค:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "ประเทศหรือภูมิภาค"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1107
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "ไม่มีประเทศของฉันในรายชื่อ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1153
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1207
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ติดตั้งอุปกรณ์ GSM แล้ว"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1210
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ติดตั้งอุปกรณ์ CDMA แล้ว"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1382
+#: ../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 "เครื่องมือช่วยนี้จะช่วยคุณตั้งค่าการเชื่อมต่อบรอดแบนด์มือถือกับเครือข่ายมือถืออย่างง่ายดาย"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1387
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "คุณจะต้องใช้ข้อมูลต่อไปนี้:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "ผู้ให้บริการบรอดแบนด์ของคุณ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1408
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "ชื่อแผนการจ่ายเงินที่คุณใช้"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1414
+#: ../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) สำหรับแผนการจ่ายเงินบรอดแบนด์ที่คุณใช้"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
+#: ../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 "สร้างการเชื่อมต่อสำหรับอุปกรณ์บรอดแบนด์มือถือ_นี้:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1456
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "อุปกรณ์ใดๆ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1469
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "ตั้งค่าการเชื่อมต่อบรอดแบนด์มือถือ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1633
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "การเชื่อมต่อบรอดแบนด์มือถือรายการใหม่"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_รหัสผ่าน:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_รหัสผ่าน:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "แ_สดงรหัสผ่าน"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "ใหม่..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1076
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "ไม่มี"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_สร้าง"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "ต้องใช้รหัสผ่านหรือกุญแจเข้ารหัสลับในการเข้าใช้เครือข่ายไร้สาย '%s'"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1162
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "ต้องยืนยันตัวบุคคลกับเครือข่ายไร้สาย"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "เครือข่ายไร้สายต้องการการยืนยันตัวบุคคล"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "สร้างเครือข่ายไร้สายใหม่"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1171
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "เครือข่ายไร้สายรายการใหม่"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "ป้อนชื่อเครือข่ายไร้สายที่ต้องการสร้าง"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1174
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "เชื่อมต่อไปยังเครือข่ายไร้สายที่ซ่อนอยู่"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1176
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "เครือข่ายไร้สายที่ซ่อนอยู่"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr "ป้อนชื่อและรายละเอียดการรักษาความปลอดภัยของเครือข่ายไร้สายที่ซ่อนอยู่ที่คุณต้องการเชื่อมต่อ"
 
-#: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
 msgstr "การรักษา_ความปลอดภัยเครือข่ายไร้สาย:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "การเชื่อม_ต่อ:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
 msgstr "อุปกรณ์ไ_ร้สาย:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "วิธีใช้:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"โปรแกรมนี้เป็นองค์ประกอบหนึ่งของ NetworkManager (https://wiki.gnome.org/"
-"Projects/NetworkManager/)"
+"โปรแกรมนี้เป็นองค์ประกอบหนึ่งของ NetworkManager (https://wiki.gnome.org/Projects/"
+"NetworkManager/)"
 
-#: ../src/main.c:76
+#: ../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:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "ไม่ได้เปิดใช้"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "ไม่ได้ลงทะเบียน"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "เครือข่ายเหย้า (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "เครือข่ายเหย้า"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "กำลังค้นหา"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "การลงทะเบียนถูกปฏิเสธ"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../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:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (ข้ามเขต)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "เครือข่ายบริการข้ามเขต (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "เครือข่ายบริการข้ามเขต"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "ปริยาย"
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "รหัส PIN สำหรับการ์ด SIM '%s' ใน '%s'"
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "ต้องใช้รหัส PIN"
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "ต้องใช้รหัส PIN สำหรับอุปกรณ์บรอดแบนด์มือถือ"
+
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "เครือข่ายบรอดแบนด์มือถือ '%s' ทำงานอยู่: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "ข้ามเขต"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:325
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "การเชื่อมต่อ %s"
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr "แอพเพล็ต NetworkManager ไม่พบข้อมูลบางอย่างที่ต้องใช้ (ไม่พบแฟ้ม .ui)"
-
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "ไม่ได้เลือกใบรับรองจากองค์กรออกใบรับรอง"
-
-#: ../src/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"การไม่ใช้ใบรับรองจากองค์กรออกใบรับรอง (CA) อาจทำให้การเชื่อมต่อไม่มีความปลอดภัย "
-"หรือเป็นเครือข่ายไร้สายเถื่อน คุณต้องการจะเลือกใบรับรองจากองค์กรออกใบรับรองหรือไม่?"
 
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "เลือกใบรับรอง CA"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:648
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "ใบรับรองแบบ DER หรือ PEM (*.der, *.pem, *.crt, *.cer)"
 
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr "GTC"
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr "เลือกแฟ้ม PAC..."
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr "แฟ้ม PAC (*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr "ทุกแฟ้ม"
+
 #: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "นิรนาม"
@@ -2664,8 +3604,8 @@ msgid "PAC _file:"
 msgstr "แ_ฟ้ม PAC:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "การยืนยันตัวบุคคลชั้นใ_น:"
 
@@ -2673,31 +3613,32 @@ msgstr "การยืนยันตัวบุคคลชั้นใ_น:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "เปิดรับการใช้ PAC อัตโนมัติ"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
-msgid "GTC"
-msgstr "GTC"
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "เลือกแฟ้ม PAC..."
+#: ../src/wireless-security/eap-method-leap.c:69
+msgid "missing EAP-LEAP password"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:406
-msgid "PAC files (*.pac)"
-msgstr "แฟ้ม PAC (*.pac)"
+#: ../src/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:410
-msgid "All files"
-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:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "เลือกใบรับรองจากองค์กรออกใบรับรอง..."
 
@@ -2715,19 +3656,57 @@ msgstr "รุ่น 1"
 msgid "C_A certificate:"
 msgstr "ใ_บรับรอง CA:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "ปิดคำเตือนใบรับรอง CA"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "รุ่_นของ PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "_ถามรหัสผ่านทุกครั้ง"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "ใ_บรับรอง CA:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "กุญแจส่วนตัวที่ไม่เข้ารหัสลับนั้นไม่มีความปลอดภัย"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../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 "
@@ -2741,11 +3720,11 @@ msgstr ""
 "\n"
 "(คุณสามารถปกป้องกุญแจส่วนตัวของคุณด้วยรหัสผ่านได้ โดยใช้ openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "เลือกใบรับรองส่วนตัวของคุณ..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "เลือกกุญแจส่วนตัวของคุณ..."
 
@@ -2757,27 +3736,44 @@ msgstr "_ชื่อในระบบ:"
 msgid "_User certificate:"
 msgstr "_ใบรับรองของผู้ใช้:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "กุญแจ_ส่วนตัว:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "_รหัสผ่านกุญแจส่วนตัว:"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "TLS ผ่านทันเนล"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP ที่มีการปกป้อง (PEAP)"
 
@@ -2787,29 +3783,55 @@ msgstr "EAP ที่มีการปกป้อง (PEAP)"
 msgid "Au_thentication:"
 msgstr "การ_ยืนยันตัวบุคคล:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "ระบบเปิด"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "ใช้กุญแจร่วมกัน"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:4
-msgid "2"
-msgstr "2"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "3"
+msgid "Open System"
+msgstr "ระบบเปิด"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "4"
+msgid "Shared Key"
+msgstr "ใช้กุญแจร่วมกัน"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -2823,15 +3845,259 @@ msgstr "แ_สดงกุญแจ"
 msgid "WEP inde_x:"
 msgstr "_ดัชนี WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "ช_นิด:"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "เครือข่ายบรอดแบนด์มือถือ (CDMA) ใหม่..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "คุณเชื่อมต่อกับเครือข่าย CDMA แล้ว"
+
+#~ msgid "CDMA network."
+#~ msgstr "เครือข่าย CDMA"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "เครือข่ายบรอดแบนด์มือถือ (GSM) ใหม่"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "คุณเชื่อมต่อกับเครือข่าย GSM แล้ว"
+
+#~ msgid "GSM network."
+#~ msgstr "เครือข่าย GSM"
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "เครือข่ายไร้สาย (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "เครือข่ายไร้สาย (%s)"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "ปิดการใช้งานเครือข่ายไร้สายอยู่"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "เครือข่ายไร้สายถูกปิดไว้ด้วยสวิตช์ฮาร์ดแวร์"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "กำลังเตรียมการเชื่อมต่อเครือข่ายไร้สาย '%s'..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "กำลังตั้งค่าการเชื่อมต่อเครือข่ายไร้สาย '%s'..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "กำลังขอที่อยู่จากเครือข่ายไร้สาย '%s'..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "เครือข่ายไร้สาย '%s' ทำงานอยู่"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "เครือข่ายบรอดแบนด์มือถือ WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "เครือข่ายบรอดแบนด์มือถือ WiMAX"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "คุณเชื่อมต่อกับเครือข่าย WiMAX แล้ว"
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "ไม่ทราบ"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "ไม่ทราบ"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "DNS ที่สอง:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "DNS ที่สาม:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "เปิดใช้บรอดแบนด์มือถือ WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "_วิธีใช้"
+
+#~ msgid "Any"
+#~ msgstr "เครือข่ายใดๆ"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "เน้น 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "เน้น 2G (GPRS/EDGE)"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "_หมายเลข MAC ของอุปกรณ์:"
+
+#~ msgid "Infrastructure"
+#~ msgstr "โครงสร้างพื้นฐาน"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "อัตโนมัติ (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "อัตโนมัติ (PPP) เฉพาะที่อยู่"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "ไม่สามารถโหลดส่วนติดต่อผู้ใช้สำหรับการรักษาความปลอดภัยเครือข่ายโยงสาย"
+
+#~ msgid "Wireless"
+#~ msgstr "ไร้สาย"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "การเชื่อมต่อไร้สาย %d"
+
+#~ msgid "_Save..."
+#~ msgstr "_บันทึก..."
+
+#~ msgid "_Import"
+#~ msgstr "_นำเข้า"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "เชื่อมต่อโดย_อัตโนมัติ"
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "เปิดให้ผู้ใช้ทุกคนสามารถใช้ได้"
+
+#~ msgid "Error saving connection"
+#~ msgstr "เกิดข้อผิดพลาดขณะบันทึกข้อมูลการเชื่อมต่อ"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "คุณสมบัติ '%s' / '%s' ไม่ถูกต้อง: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุ"
+
+#~ msgid "Could not edit new connection"
+#~ msgstr "ไม่สามารถแก้ไขการเชื่อมต่อรายการใหม่"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "ไม่สามารถแก้ไขการเชื่อมต่อที่นำเข้า"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr "ไม่มีปลั๊กอิน VPN ติดตั้งอยู่ กรุณาติดตั้งปลั๊กอินเพื่อเปิดใช้งานปุ่มนี้"
+
+#~ msgid "_Edit..."
+#~ msgstr "แ_ก้ไข..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_ลบ..."
+
+#~ msgid "Don't know how to edit '%s' connections"
+#~ msgstr "ไม่ทราบว่าจะแก้ไขการเชื่อมต่อ '%s' อย่างไร"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: (%s) "
+#~ "%s)."
+#~ msgstr "ไม่สามารถตั้งต่าบลูทูทได้ (เชื่อมต่อกับ D-Bus ไม่สำเร็จ: (%s) %s)"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "ไม่สามารถตั้งต่าบลูทูทได้ (เกิดข้อผิดพลาดขณะหา NetworkManager: (%s) %s)"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "ใช้โทรศัพท์มือถือของคุณเป็นอุปกรณ์เครือข่าย (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "เข้าถึงอินเทอร์เน็ตโดยใช้โทรศัพท์มือถือของคุณ (DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "ความผิดพลาด: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "สร้างการเชื่อมต่อ DUN ไม่สำเร็จ: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "โทรศัพท์ของคุณพร้อมใช้งานแล้ว!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "เครื่องมือวิเศษสำหรับมือถือถูกยกเลิก"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "ไม่รู้จักชนิดของอุปกรณ์โทรศัพท์ (ไม่ใช่ GSM หรือ CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "ไม่ทราบชนิดของโมเด็ม"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "เชื่อมต่อกับโทรศัพท์ไม่สำเร็จ"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "การเชื่อมต่อกับโทรศัพท์ถูกตัดกะทันหัน"
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "หมดเวลาคอยขณะตรวจหารายละเอียดของโทรศัพท์"
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "กำลังตรวจหาการตั้งค่าของโทรศัพท์..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr "ต้องเปิดใช้การติดต่อบลูทูทก่อนที่จะตั้งค่าการเชื่อมต่อเครือข่ายแบบหมุนโทรศัพท์"
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "สร้างการเชื่อมต่อ PAN ไม่สำเร็จ: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "เครือข่าย %s"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "ไม่ได้เลือกใบรับรองจากองค์กรออกใบรับรอง"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "การไม่ใช้ใบรับรองจากองค์กรออกใบรับรอง (CA) อาจทำให้การเชื่อมต่อไม่มีความปลอดภัย "
+#~ "หรือเป็นเครือข่ายไร้สายเถื่อน คุณต้องการจะเลือกใบรับรองจากองค์กรออกใบรับรองหรือไม่?"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "เลือกใบรับรอง CA"
+
 #~ msgid "Click on this icon to connect to a wireless network"
 #~ msgstr "คลิกที่ไอคอนเพื่อเชื่อมต่อกับเครือข่ายไร้สาย"
 
 #~ msgid "_Security:"
 #~ msgstr "การรักษา_ความปลอดภัย:"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "หาอุปกรณ์บลูทูทไม่พบ"
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "ไม่สามารถตั้งต่าบลูทูทได้ (สร้างพร็อกซี D-Bus ไม่สำเร็จ: %s)"
 
@@ -2848,9 +4114,6 @@ msgstr "_ดัชนี WEP:"
 #~ "cannot continue.\n"
 #~ msgstr "แอพเพล็ต NetworkManager หาข้อมูลที่ต้องการไม่สำเร็จ ไม่สามารถดำเนินการต่อได้\n"
 
-#~ msgid "C_onnect"
-#~ msgstr "เ_ชื่อมต่อ"
-
 #~ msgid ""
 #~ "Open System\n"
 #~ "Shared Key"
diff --git a/po/tr.po b/po/tr.po
index 60ac666d..29e93a01 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,9 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2016-01-09 17:19+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2016-01-09 21:06+0200\n"
 "Last-Translator: Muhammet Kara <muhammetk@gmail.com>\n"
 "Language-Team: Türkçe <gnome-turk@gnome.org>\n"
@@ -24,7 +23,7 @@ msgstr ""
 "X-Generator: Gtranslator 2.91.7\n"
 "X-POOTLE-MTIME: 1434872144.000000\n"
 
-#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3258
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Ağ"
 
@@ -137,12 +136,10 @@ msgstr ""
 "uyarıları görmek istemiyorsanız bu seçeneği doğru olarak işaretleyin."
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
-#| msgid "Network Manager"
 msgid "NetworkManager"
 msgstr "Ağ Yöneticisi"
 
 #: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
-#| msgid "Network Manager"
 msgid "NetworkManager for GNOME"
 msgstr "GNOME için Ağ Yöneticisi"
 
@@ -163,7 +160,7 @@ msgstr ""
 "oluşturmak ve mevcut olanları düzenlemek için Ağ Yöneticisi ile birlikte "
 "çalışır."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:102
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X kimlik doğrulaması"
 
@@ -185,45 +182,45 @@ msgstr "B_ağlan"
 msgid "_Network name:"
 msgstr "_Ağ adı:"
 
-#: ../src/ap-menu-item.c:87
+#: ../src/ap-menu-item.c:82
 msgid "ad-hoc"
 msgstr "ad-hoc"
 
-#: ../src/ap-menu-item.c:92
+#: ../src/ap-menu-item.c:87
 msgid "secure."
 msgstr "güvenli."
 
-#: ../src/applet.c:471
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Bağlantı ekleme/etkinleştirme başarısız oldu"
 
-#: ../src/applet.c:473 ../src/applet.c:527 ../src/applet.c:562
-#: ../src/applet-device-wifi.c:1314 ../src/applet-device-wifi.c:1337
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
-#: ../src/applet.c:476 ../src/applet.c:565 ../src/applet-device-wifi.c:1317
-#: ../src/applet-device-wifi.c:1340
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Bağlantı başarısız"
 
-#: ../src/applet.c:525
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Aygıt bağlantısı kesilemedi"
 
-#: ../src/applet.c:530
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Bağlantı kesilemedi"
 
-#: ../src/applet.c:560
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Bağlantı etkinleştirilemedi"
 
-#: ../src/applet.c:884 ../src/applet-device-wifi.c:1039
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Bu uyarıyı tekrar gösterme"
 
-#: ../src/applet.c:971
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -233,7 +230,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu çünkü ağ bağlantısı el ile kesildi."
 
-#: ../src/applet.c:974
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -243,7 +240,7 @@ msgstr ""
 "'%s' VPN bağlantısı başarısız oldu çünkü VPN hizmeti beklenmedik bir şekilde "
 "durdu."
 
-#: ../src/applet.c:977
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -254,7 +251,7 @@ msgstr ""
 "'%s' VPN bağlantısı başarısız oldu çünkü VPN hizmeti geçersiz yapılandırma "
 "hatası bildirdi."
 
-#: ../src/applet.c:980
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -264,7 +261,7 @@ msgstr ""
 "'%s' VPN bağlantısı başarısız oldu çünkü bağlantı girişimi zaman aşımına "
 "uğradı."
 
-#: ../src/applet.c:983
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -273,7 +270,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu çünkü VPN hizmeti zamanında başlamadı."
 
-#: ../src/applet.c:986
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -282,7 +279,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu çünkü VPN hizmeti başlatılamadı."
 
-#: ../src/applet.c:989
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -292,7 +289,7 @@ msgstr ""
 "'%s' VPN bağlantısı başarısız oldu çünkü geçerli VPN parola dosyası (secret) "
 "yok."
 
-#: ../src/applet.c:992
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -302,7 +299,7 @@ msgstr ""
 "'%s' VPN bağlantısı başarısız oldu çünkü VPN parola dosyaları (secrets) "
 "geçersiz."
 
-#: ../src/applet.c:999
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -311,7 +308,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı başarısız oldu."
 
-#: ../src/applet.c:1015
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -321,7 +318,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı kesildi çünkü ağ bağlantısına el ile müdahale edildi."
 
-#: ../src/applet.c:1018
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -330,7 +327,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı kesildi çünkü VPN hizmeti durdu."
 
-#: ../src/applet.c:1024
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +336,7 @@ msgstr ""
 "\n"
 "'%s' VPN bağlantısı kesildi."
 
-#: ../src/applet.c:1054
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -350,19 +347,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1056
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN bağlantısı başarıyla kuruldu.\n"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN Giriş İletisi"
 
-#: ../src/applet.c:1064 ../src/applet.c:1072 ../src/applet.c:1113
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN Bağlantısı Başarısız"
 
-#: ../src/applet.c:1120
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -375,7 +372,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1123
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -388,547 +385,541 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1412
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "aygıt hazır değil (ürün bilgisi eksik)"
 
-#: ../src/applet.c:1414
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "aygıt hazır değil"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1424 ../src/applet-device-ethernet.c:114
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "bağlantı kesildi"
 
-#: ../src/applet.c:1440
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Bağlantıyı Kes"
 
-#: ../src/applet.c:1454
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "aygıt yönetilmiyor"
 
-#: ../src/applet.c:1524
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Ağ aygıtı bulunamadı"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN Bağlantıları"
 
-#: ../src/applet.c:1632
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "VPN _Ayarları..."
 
-#: ../src/applet.c:1637
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "VPN Bağlantısını _Kes"
 
-#: ../src/applet.c:1747
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager çalışmıyor..."
 
-#: ../src/applet.c:1752 ../src/applet.c:2749
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Ağ yönetimi etkin değil"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:1961
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "_Ağ Yönetimini Etkinleştir"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:1970
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "_Kablosuz Bağlantıyı Etkinleştir"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1979
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "_Mobil Geniş Bant Ağları Etkinleştir"
 
 #. Toggle notifications item
-#: ../src/applet.c:1991
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "_Bildirimleri Etkinleştir"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2003
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Bağlantı _Bilgileri"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2013
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Bağlantıları Düzenle..."
 
-#. Help item
-#: ../src/applet.c:2028
-msgid "_Help"
-msgstr "_Yardım"
-
-#. About item
-#: ../src/applet.c:2037
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Hakkında"
 
-#: ../src/applet.c:2318
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Şimdi '%s' bağlantısına bağlandınız."
 
-#: ../src/applet.c:2361
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Bağlı değil"
 
-#: ../src/applet.c:2362
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Ağ bağlantısı kesildi."
 
-#: ../src/applet.c:2617
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "'%s' ağ bağlantısı hazırlanıyor..."
 
-#: ../src/applet.c:2620
+#: ../src/applet.c:2477
 #, 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:2623 ../src/applet-device-bt.c:127
-#: ../src/mobile-helpers.c:599
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "'%s' için bir ağ adresi isteniyor..."
 
-#: ../src/applet.c:2626
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "'%s' ağ bağlantısı etkin"
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "'%s' VPN bağlantısı başlatılıyor..."
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2560
 #, 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:2706
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "'%s' için VPN adresi isteniyor..."
 
-#: ../src/applet.c:2709
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "'%s' VPN bağlantısı etkin"
 
-#: ../src/applet.c:2753
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Ağ bağlantısı yok"
 
-#: ../src/applet.c:3384
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager Programcığı"
 
-#: ../src/applet-device-broadband.c:164
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Yanlış PUK kodu; lütfen hizmet sağlayıcınızla görüşün."
 
-#: ../src/applet-device-broadband.c:206
+#: ../src/applet-device-broadband.c:201
 msgid "Wrong PIN code; please contact your provider."
 msgstr "Yanlış PIN kodu; lütfen hizmet sağlayıcınızla görüşün."
 
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-broadband.c:257
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Kilit açma kodu gönderiliyor..."
 
-#: ../src/applet-device-broadband.c:736 ../src/applet-dialogs.c:509
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Mobil Geniş Bant (%s)"
 
-#: ../src/applet-device-broadband.c:738
-#: ../src/connection-editor/connection-helpers.c:102
-#: ../src/connection-editor/page-mobile.c:311
-#: ../src/libnm-gtk/nm-ui-utils.c:332
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Mobil Geniş Bant"
 
-#: ../src/applet-device-broadband.c:790 ../src/applet-device-bt.c:80
-#: ../src/applet-device-ethernet.c:122 ../src/applet-device-wifi.c:826
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "Mevcut"
 
 #. Default connection item
-#: ../src/applet-device-broadband.c:803
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "Yeni Mobil Geniş Bant bağlantısı..."
 
-#: ../src/applet-device-broadband.c:817 ../src/applet-device-bt.c:92
-#: ../src/applet-device-ethernet.c:137 ../src/applet-device-wifi.c:1238
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "Bağlantı Kuruldu"
 
-#: ../src/applet-device-broadband.c:818
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "Şuanda Mobil Geniş Bant ağına bağlısınız."
 
-#: ../src/applet-device-broadband.c:955 ../src/applet-device-broadband.c:961
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mobil Geniş Bant ağı."
 
-#: ../src/applet-device-broadband.c:956
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Şimdi ev ağında kayıtlısınız."
 
-#: ../src/applet-device-broadband.c:962
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "Şimdi bir dolaşım ağında kayıtlısınız."
 
-#: ../src/applet-device-bt.c:93
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "Şimdi mobil geniş bant ağına bağlandınız."
 
-#: ../src/applet-device-bt.c:118 ../src/mobile-helpers.c:590
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "Mobil geniş bant bağlantısı '%s' hazırlanıyor..."
 
-#: ../src/applet-device-bt.c:121 ../src/mobile-helpers.c:593
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "Mobil geniş bant bağlantısı '%s' yapılandırılıyor..."
 
-#: ../src/applet-device-bt.c:124 ../src/mobile-helpers.c:596
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "Mobil geniş bant bağlantısı '%s' için kimlik doğrulama gerekiyor..."
 
-#: ../src/applet-device-bt.c:131 ../src/mobile-helpers.c:615
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "Mobil geniş bant bağlantısı '%s' etkin"
 
-#: ../src/applet-device-ethernet.c:35
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Otomatik Ethernet"
 
-#: ../src/applet-device-ethernet.c:87
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Ethernet Ağları (%s)"
 
-#: ../src/applet-device-ethernet.c:89
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Ethernet Ağı (%s)"
 
-#: ../src/applet-device-ethernet.c:92
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Ethernet Ağları"
 
-#: ../src/applet-device-ethernet.c:94
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Ethernet Ağı"
 
-#: ../src/applet-device-ethernet.c:138
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "Şu anda ethernet ağına bağlısınız."
 
-#: ../src/applet-device-ethernet.c:163
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "'%s' ethernet ağ bağlantısı hazırlanıyor..."
 
-#: ../src/applet-device-ethernet.c:166
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "'%s' ethernet ağ bağlantısı yapılandırılıyor..."
 
-#: ../src/applet-device-ethernet.c:169
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr ""
 "'%s' ethernet ağ bağlantısı için kullanıcı kimlik doğrulaması gerekli..."
 
-#: ../src/applet-device-ethernet.c:172
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "'%s' için bir ethernet ağ adresi isteniyor..."
 
-#: ../src/applet-device-ethernet.c:176
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "'%s' ethernet ağ bağlantısı etkin"
 
-#: ../src/applet-device-ethernet.c:348
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL kimlik doğrulama"
 
-#: ../src/applet-device-wifi.c:87
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Gizli Kablosuz Ağlara _Bağlan..."
 
-#: ../src/applet-device-wifi.c:138
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "_Yeni Kablosuz Ağ Oluştur..."
 
-#: ../src/applet-device-wifi.c:288
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: ../src/applet-device-wifi.c:758
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Kablosuz Ağlar (%s)"
 
-#: ../src/applet-device-wifi.c:760
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Kablosuz Ağ (%s)"
 
-#: ../src/applet-device-wifi.c:762
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Kablosuz Ağ"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Kablosuz Ağ kapalı"
 
-#: ../src/applet-device-wifi.c:792
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Donanım anahtarı ile kablosuz bağlantı kapatıldı"
 
-#: ../src/applet-device-wifi.c:853
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Daha fazla ağ"
 
-#: ../src/applet-device-wifi.c:1035
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Kullanılabilir Kablosuz Ağlar"
 
-#: ../src/applet-device-wifi.c:1036
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Kablosuz ağa bağlanmak için ağ menüsü kullanın"
 
-#: ../src/applet-device-wifi.c:1237
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Şu anda '%s' kablosuz ağına bağlısınız."
 
-#: ../src/applet-device-wifi.c:1269
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "'%s' kablosuz ağ bağlantısı hazırlanıyor..."
 
-#: ../src/applet-device-wifi.c:1272
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "'%s' kablosuz ağ bağlantısı yapılandırılıyor..."
 
-#: ../src/applet-device-wifi.c:1275
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "'%s' kablosuz ağı için kullanıcı kimlik doğrulaması gerekli..."
 
-#: ../src/applet-device-wifi.c:1278
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "'%s' için bir kablosuz ağ adresi isteniyor..."
 
-#: ../src/applet-device-wifi.c:1289
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "'%s' kablosuz ağ bağlantısı etkin: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1293
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "'%s' kablosuz ağ bağlantısı etkin"
 
-#: ../src/applet-device-wifi.c:1312
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Bağlantı etkinleştirilemedi"
 
-#: ../src/applet-device-wifi.c:1335
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Yeni bağlantı eklenemedi"
 
-#: ../src/applet-dialogs.c:44
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Bağlantı bilgilerini gösterirken hata oluştu:"
 
-#: ../src/applet-dialogs.c:75 ../src/connection-editor/page-wifi-security.c:335
-#: ../src/libnma/nma-wifi-dialog.c:935 ../src/libnm-gtk/nm-wifi-dialog.c:951
-#: ../src/wireless-security/wireless-security.c:452
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:77
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Dinamik WEP"
 
-#: ../src/applet-dialogs.c:79 ../src/applet-dialogs.c:231
-#: ../src/applet-dialogs.c:233
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
 #. Create the expander
-#: ../src/applet-dialogs.c:154
+#: ../src/applet-dialogs.c:151
 msgid "More addresses"
 msgstr "Daha fazla adres"
 
-#: ../src/applet-dialogs.c:229
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:237 ../src/applet-dialogs.c:246
-#: ../src/connection-editor/page-wifi-security.c:286
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Hiçbiri"
 
-#: ../src/applet-dialogs.c:263
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (öntanımlı)"
 
-#: ../src/applet-dialogs.c:332 ../src/applet-dialogs.c:583
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:334 ../src/applet-dialogs.c:585
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
 #. Address
-#: ../src/applet-dialogs.c:349 ../src/applet-dialogs.c:371
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: ../src/applet-dialogs.c:350 ../src/applet-dialogs.c:423
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
 msgid "IP Address:"
 msgstr "IP Adresi:"
 
-#: ../src/applet-dialogs.c:372
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Broadcast Adresi:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: ../src/applet-dialogs.c:385
+#: ../src/applet-dialogs.c:382
 msgid "Subnet Mask:"
 msgstr "Alt Ağ Maskesi:"
 
-#: ../src/applet-dialogs.c:495
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Kablolu Bağlantı (%s)"
 
-#: ../src/applet-dialogs.c:498
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 Kablosuz (%s)"
 
-#: ../src/applet-dialogs.c:505
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:507
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
 #. --- General ---
-#: ../src/applet-dialogs.c:515 ../src/applet-dialogs.c:802
-#: ../src/connection-editor/page-general.c:351
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Genel"
 
-#: ../src/applet-dialogs.c:519
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Arayüz:"
 
-#: ../src/applet-dialogs.c:539
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Donanım Adresi:"
 
 #. Driver
-#: ../src/applet-dialogs.c:553
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Sürücü:"
 
-#: ../src/applet-dialogs.c:588
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Hız:"
 
-#: ../src/applet-dialogs.c:603
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Güvenlik:"
 
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:621 ../src/applet-dialogs.c:843
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#: ../src/applet-dialogs.c:635 ../src/applet-dialogs.c:681
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Öntanımlı Rota:"
 
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:655 ../src/applet-dialogs.c:865
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:664 ../src/applet-dialogs.c:874
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Yoksayılmış"
 
-#: ../src/applet-dialogs.c:807
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN Türü:"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN Geçidi:"
 
-#: ../src/applet-dialogs.c:820
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN Kullanıcı Adı:"
 
-#: ../src/applet-dialogs.c:826
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN Afişi:"
 
-#: ../src/applet-dialogs.c:832
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Temel Bağlantı:"
 
-#: ../src/applet-dialogs.c:834 ../src/libnm-gtk/nm-ui-utils.c:346
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:949
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Geçerli etkin bağlantı bulunamadı!"
 
-#: ../src/applet-dialogs.c:977
+#: ../src/applet-dialogs.c:985
 msgid ""
 "Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
@@ -938,43 +929,43 @@ msgstr ""
 "Telif Hakkı © 2005-2008 Novell, Inc.\n"
 "ve diğer birçok topluluk katkıcısı ve çevirmenler"
 
-#: ../src/applet-dialogs.c:980
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr ""
 "Ağ aygıtlarını ve bağlantılarını yönetmek için sistem tepsisi programcığı."
 
-#: ../src/applet-dialogs.c:982
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager Web Sayfası"
 
-#: ../src/applet-dialogs.c:997
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Eksik özkaynaklar"
 
-#: ../src/applet-dialogs.c:1022
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Mobil geniş bant ağ parolası"
 
-#: ../src/applet-dialogs.c:1031
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "'%s' bağlantısına bağlanmak için parola gerekli."
 
-#: ../src/applet-dialogs.c:1046
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../src/applet-dialogs.c:1328
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN kilidinin açılması gerekiyor"
 
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN Kilidinin açılması gerekiyor"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -983,25 +974,25 @@ msgstr ""
 "'%s' mobil geniş bant aygıtının kullanılabilmesi için SIM PIN kodu gerekiyor."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1333
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN kodu:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "PIN kodunu göster"
 
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK kilinin açılması gerekiyor"
 
-#: ../src/applet-dialogs.c:1340
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK Kilinin açılması gerekiyor"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1342
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1010,22 +1001,22 @@ msgstr ""
 "'%s' mobil geniş bant aygıtının kullanılabilmesi için SIM PUK kodu gerekiyor."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1344
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK kodu:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1347
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Yeni PIN kodu:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1349
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Yeni PIN kodunu tekrar girin:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1354
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK kodlarını göster"
 
@@ -1066,7 +1057,7 @@ msgstr "_Ekle"
 #: ../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:697
+#: ../src/connection-editor/nm-connection-list.c:699
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -1167,7 +1158,7 @@ msgstr "M_od:"
 #: ../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:681
+#: ../src/connection-editor/nm-connection-list.c:683
 msgid "_Edit"
 msgstr "Düz_enle"
 
@@ -1284,60 +1275,57 @@ msgstr "_Azami yaş:"
 msgid "_Aging time:"
 msgstr "_Yaşama süresi:"
 
-#: ../src/connection-editor/ce-page.c:80
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "otomatik"
 
-#: ../src/connection-editor/ce-page.c:88
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "öntanımlı"
 
-#: ../src/connection-editor/ce-page.c:134
+#: ../src/connection-editor/ce-page.c:132
 msgid "unspecified error"
 msgstr "belirtilmemiş hata"
 
-#: ../src/connection-editor/ce-page.c:247
-#| msgid "Address"
+#: ../src/connection-editor/ce-page.c:245
 msgid "MAC address"
 msgstr "MAC Adresi"
 
-#: ../src/connection-editor/ce-page.c:247
-#| msgid "Address"
+#: ../src/connection-editor/ce-page.c:245
 msgid "HW address"
 msgstr "HW Adresi"
 
-#: ../src/connection-editor/ce-page.c:250
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
 msgid "invalid %s for %s (%s)"
 msgstr "%2$s için geçersiz %1$s (%3$s)"
 
-#: ../src/connection-editor/ce-page.c:254
-#: ../src/connection-editor/ce-page.c:486
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
 msgid "invalid %s (%s)"
 msgstr "geçersiz %s (%s)"
 
-#: ../src/connection-editor/ce-page.c:270
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
 msgid "invalid interface-name for %s (%s)"
 msgstr "%s için geçersiz arayüz adı (%s)"
 
-#: ../src/connection-editor/ce-page.c:274
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
 msgid "invalid interface-name (%s)"
 msgstr "geçersiz arayüz adı (%s)"
 
-#: ../src/connection-editor/ce-page.c:487
-#| msgid "Any device"
+#: ../src/connection-editor/ce-page.c:485
 msgid "device"
 msgstr "aygıt"
 
-#: ../src/connection-editor/ce-page.c:593
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr ""
 "Bilinmeyen bir sorun sebebiyle bağlantı parola dosyaları güncellenemedi."
@@ -1555,8 +1543,8 @@ msgstr "Parola_yı gö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:100
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:100
+#: ../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
@@ -1568,8 +1556,8 @@ msgstr "Pa_rola:"
 #: ../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:133
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Otomatik"
@@ -1649,41 +1637,43 @@ msgid "Wake on LAN:"
 msgstr "Ağdan Uyandırma:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:20
-#| msgid "Default"
 msgid "De_fault"
 msgstr "Ö_ntanımlı"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Yok say"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
 msgid "_Phy"
 msgstr "_Fiz"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
 msgid "_Unicast"
 msgstr "_Teknoktayayım"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
 msgid "Mul_ticast"
 msgstr "_Çoknoktayayım"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:24
-#| msgid "Broadcast"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
 msgid "_Broadcast"
 msgstr "_Yayım"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
 msgid "_Arp"
 msgstr "_Arp"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
 msgid "Ma_gic"
 msgstr "Ma_gic"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:27
-#| msgid "_Private key password:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
 msgid "_Wake on LAN password:"
 msgstr "Ağdan _uyandırma parolası:"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
 msgid ""
 "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets."
 msgstr ""
@@ -1727,8 +1717,8 @@ msgstr "Elle yapılandırılmış DNS ayarları ile otomatik"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:188
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Elle"
 
@@ -1739,8 +1729,8 @@ msgstr "Yerel Bağlantı (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:190
-#: ../src/connection-editor/page-ip6.c:208
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Diğer bilgisayarlar ile paylaşımlı"
 
@@ -1779,15 +1769,15 @@ msgstr "D_HCP istemci ID:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:14
 #: ../src/connection-editor/ce-page-ip6.ui.h:15
-#: ../src/connection-editor/page-ip4.c:312
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip4.c:308
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "A_rama alanları:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:15
 #: ../src/connection-editor/ce-page-ip6.ui.h:16
-#: ../src/connection-editor/page-ip4.c:303
-#: ../src/connection-editor/page-ip6.c:301
+#: ../src/connection-editor/page-ip4.c:299
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS sunucuları:"
 
@@ -1818,7 +1808,7 @@ msgid "_Routes…"
 msgstr "_Rotalar…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:200
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "Pasifleştirilmiş"
 
@@ -1955,7 +1945,6 @@ msgid "_Teamed connections:"
 msgstr "_Takımlanmış bağlantılar:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-#| msgid "_Import team configuration from a file..."
 msgid "Im_port team configuration from a file..."
 msgstr "Bir dosyadan takım yapılandırmasını _içe aktarın..."
 
@@ -1964,12 +1953,10 @@ msgid "_Parent interface:"
 msgstr "_Üst arayüz:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-#| msgid "VLAN interface _name:"
 msgid "VLAN inter_face name:"
 msgstr "VLAN aray_üz adı:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-#| msgid "_Cloned MAC address:"
 msgid "Cloned MAC _address:"
 msgstr "Bire bir kopyalanan MAC _adresi:"
 
@@ -2063,7 +2050,7 @@ msgstr "Ban_t:"
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-polkit-button.c:75
+#: ../src/connection-editor/ce-polkit-button.c:74
 msgid "No polkit authorization to perform the action"
 msgstr "Eylemi gerçekleştirmek için polkit yetkilendirmesi yok"
 
@@ -2120,157 +2107,154 @@ msgstr ""
 "destekleyecektir. Eğer bağlantı başarısız olursa, bazı yöntemlerin "
 "desteklenmesini devre dışı bırakmayı deneyin."
 
-#: ../src/connection-editor/connection-helpers.c:99
-#: ../src/connection-editor/page-ethernet.c:318
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:100
-#: ../src/connection-editor/page-wifi.c:450 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Kablosuz Bağlantı"
 
-#: ../src/connection-editor/connection-helpers.c:108
-#: ../src/connection-editor/page-bluetooth.c:126
-#: ../src/libnm-gtk/nm-ui-utils.c:328
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:109
-#: ../src/connection-editor/page-dsl.c:130
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:110
-#: ../src/connection-editor/page-infiniband.c:153
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:111
-#: ../src/connection-editor/page-bond.c:446 ../src/libnm-gtk/nm-ui-utils.c:336
-#: ../src/libnm-gtk/nm-ui-utils.c:580
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:112
-#: ../src/connection-editor/page-team.c:269 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Team"
 msgstr "Takım"
 
-#: ../src/connection-editor/connection-helpers.c:113
-#: ../src/connection-editor/page-bridge.c:212
-#: ../src/libnm-gtk/nm-ui-utils.c:340 ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Bridge"
 msgstr "Köprü"
 
-#: ../src/connection-editor/connection-helpers.c:114
-#: ../src/connection-editor/page-vlan.c:597 ../src/libnm-gtk/nm-ui-utils.c:342
-#: ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:118
-#: ../src/connection-editor/connection-helpers.c:256
-#: ../src/connection-editor/page-vpn.c:105
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:198
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Donanım"
 
-#: ../src/connection-editor/connection-helpers.c:225
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Sanal"
 
+#: ../src/connection-editor/connection-helpers.c:292
 #: ../src/connection-editor/connection-helpers.c:294
-#: ../src/connection-editor/connection-helpers.c:296
 msgid "Import a saved VPN configuration..."
 msgstr "Kayıtlı bir VPN yapılandırmasını içeri aktar..."
 
-#: ../src/connection-editor/connection-helpers.c:325
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr ""
 "Bağlantı düzenleme diyaloğu bilinmeyen bir hata nedeniyle başlatılamadı."
 
-#: ../src/connection-editor/connection-helpers.c:334
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Yeni bağlantı oluşturulamadı"
 
-#: ../src/connection-editor/connection-helpers.c:471
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Bağlantı silme işlemi başarısız"
 
-#: ../src/connection-editor/connection-helpers.c:519
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "%s bağlantısını silmek istediğinizden emin misiniz?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:805
-#: ../src/connection-editor/ip6-routes-dialog.c:747
-#: ../src/connection-editor/page-ip4.c:1072
-#: ../src/connection-editor/page-ip6.c:1070
+#: ../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
 msgid "Address"
 msgstr "Adres"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:824
-#: ../src/connection-editor/page-ip4.c:1091
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Ağ maskesi"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:843
-#: ../src/connection-editor/ip6-routes-dialog.c:785
-#: ../src/connection-editor/page-ip4.c:1110
-#: ../src/connection-editor/page-ip6.c:1108
+#: ../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
 msgid "Gateway"
 msgstr "Ağ geçidi"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:862
-#: ../src/connection-editor/ip6-routes-dialog.c:804
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Metrik"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:766
-#: ../src/connection-editor/page-ip6.c:1089
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Ön ek"
 
-#: ../src/connection-editor/nm-connection-editor.c:103
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "%s düzenleniyor"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "İsimsiz bağlantı düzenleniyor"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
-#| msgid "Connection _name:"
+#: ../src/connection-editor/nm-connection-editor.c:124
 msgid "Missing connection name"
 msgstr "Eksik bağlantı adı"
 
-#: ../src/connection-editor/nm-connection-editor.c:190
-#| msgid "Error initializing editor"
+#: ../src/connection-editor/nm-connection-editor.c:187
 msgid "Editor initializing..."
 msgstr "Düzenleyici ilklendiriliyor..."
 
-#: ../src/connection-editor/nm-connection-editor.c:197
-#: ../src/connection-editor/nm-connection-list.c:399
-#| msgid "Connection add failed"
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
 msgid "Connection cannot be modified"
 msgstr "Bağlantı değiştirilemiyor"
 
-#: ../src/connection-editor/nm-connection-editor.c:210
+#: ../src/connection-editor/nm-connection-editor.c:207
 #, c-format
 msgid "Invalid setting %s: %s"
 msgstr "Geçersiz ayar %s: %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:286
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2278,37 +2262,37 @@ msgstr ""
 "Bağlantı yöneticisi bazı gerekli kaynakları bulamadı (.ui dosyası "
 "bulunamadı)."
 
-#: ../src/connection-editor/nm-connection-editor.c:422
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "_Kaydet"
 
-#: ../src/connection-editor/nm-connection-editor.c:423
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "Bu bağlantı üzerinde yapılan tüm değişiklikleri kaydet."
 
-#: ../src/connection-editor/nm-connection-editor.c:424
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr ""
 "Bu bağlantıyı bu makinedeki tüm kullanıcılar için kaydedebilmek için yetki "
 "al."
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "Bağlantı oluşturulamadı"
 
-#: ../src/connection-editor/nm-connection-editor.c:440
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "Bağlantı düzenlenemedi"
 
-#: ../src/connection-editor/nm-connection-editor.c:442
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "Bağlantı düzenleme penceresi oluşturulurken bilinmeyen hata."
 
-#: ../src/connection-editor/nm-connection-editor.c:584
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "Düzenleyici başlatılırken hata"
 
-#: ../src/connection-editor/nm-connection-editor.c:924
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Bağlantı ekleme başarısız"
 
@@ -2324,158 +2308,156 @@ msgstr "Bağlantı _adı:"
 msgid "_Export..."
 msgstr "_Dışa Aktar..."
 
-#: ../src/connection-editor/nm-connection-list.c:129
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "hiçbir zaman"
 
-#: ../src/connection-editor/nm-connection-list.c:140
-#: ../src/connection-editor/nm-connection-list.c:151
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "şimdi"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:158
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d dakika önce"
 
-#: ../src/connection-editor/nm-connection-list.c:162
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d saat önce"
 
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d gün önce"
 
-#: ../src/connection-editor/nm-connection-list.c:180
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ay önce"
 
-#: ../src/connection-editor/nm-connection-list.c:184
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d yıl önce"
 
-#: ../src/connection-editor/nm-connection-list.c:625
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "İsim"
 
-#: ../src/connection-editor/nm-connection-list.c:638
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Son Kullanılan"
 
-#: ../src/connection-editor/nm-connection-list.c:682
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Seçili bağlantıyı düzenle"
 
-#: ../src/connection-editor/nm-connection-list.c:683
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "Seçili bağlantıyı düzenlemek için yetki al"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Seçili bağlantıyı sil"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "Seçili bağlantıyı silmek için yetki al"
 
-#: ../src/connection-editor/nm-connection-list.c:924
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Kurulu VPN eklentisi yok."
 
-#: ../src/connection-editor/nm-connection-list.c:926
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "'%s' bağlantılarının nasıl oluşturulacağı bilinmiyor"
 
-#: ../src/connection-editor/nm-connection-list.c:928
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Bağlantı oluşturulurken hata oluştu"
 
-#: ../src/connection-editor/nm-connection-list.c:950
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Bağlantı düzenlenirken hata oluştu"
 
-#: ../src/connection-editor/nm-connection-list.c:951
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "'%s' UUID ile bağlantı bulunamadı."
 
-#: ../src/connection-editor/page-8021x-security.c:112
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x Güvenliği"
 
-#: ../src/connection-editor/page-8021x-security.c:114
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "802.1x Güvenlik kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-8021x-security.c:128
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "Bu bağlantı için 802.1_X güvenliği kullan"
 
-#: ../src/connection-editor/page-bluetooth.c:61
+#: ../src/connection-editor/page-bluetooth.c:58
 msgid "MAC address of the Bluetooth device. Example: 00:11:22:33:44:55"
 msgstr "Bluetooth aygıtının MAC adresi. Örnek: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-bluetooth.c:128
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Bluetooth kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-bluetooth.c:178
+#: ../src/connection-editor/page-bluetooth.c:175
 #, c-format
-#| msgid "could not find the Bluetooth device."
 msgid "invalid Bluetooth device (%s)"
 msgstr "geçersiz Bluetooth aygıtı (%s)"
 
-#: ../src/connection-editor/page-bluetooth.c:261
+#: ../src/connection-editor/page-bluetooth.c:258
 #, c-format
 msgid "Bluetooth connection %d"
 msgstr "Bluetooth bağlantısı %d"
 
-#: ../src/connection-editor/page-bluetooth.c:305
+#: ../src/connection-editor/page-bluetooth.c:302
 msgid "Bluetooth Type"
 msgstr "Bluetooth Türü"
 
-#: ../src/connection-editor/page-bluetooth.c:323
+#: ../src/connection-editor/page-bluetooth.c:320
 msgid "Select the type of the Bluetooth connection profile."
 msgstr "Bluetooth bağlantı profili türü seçin."
 
-#: ../src/connection-editor/page-bluetooth.c:328
+#: ../src/connection-editor/page-bluetooth.c:325
 msgid "_Personal Area Network"
 msgstr "_Kişisel Alan Ağı"
 
-#: ../src/connection-editor/page-bluetooth.c:333
+#: ../src/connection-editor/page-bluetooth.c:330
 msgid "_Dial-Up Network"
 msgstr "_Çevirmeli Ağ"
 
-#: ../src/connection-editor/page-bond.c:449
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Bond kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-bond.c:568
-#| msgid "_Primary:"
+#: ../src/connection-editor/page-bond.c:566
 msgid "primary"
 msgstr "birincil"
 
-#: ../src/connection-editor/page-bond.c:618
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bond bağlantısı %d"
 
-#: ../src/connection-editor/page-bridge.c:215
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Köprü kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-bridge.c:312
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Köprü bağlantısı %d"
@@ -2483,32 +2465,32 @@ msgstr "Köprü 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:111
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Köprü Bağlantı Noktası"
 
-#: ../src/connection-editor/page-bridge-port.c:113
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "Köprü bağlantı noktası kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "DCB kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-dsl.c:132
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL kullanıcı arayüzü yüklenemiyor."
 
-#: ../src/connection-editor/page-dsl.c:217
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL bağlantısı %d"
 
-#: ../src/connection-editor/page-ethernet.c:77
+#: ../src/connection-editor/page-ethernet.c:74
 msgid ""
 "This option locks this connection to the network device specified either by "
 "its interface name or permanent MAC or both. Examples: \"em1\", "
@@ -2518,39 +2500,37 @@ msgstr ""
 "adresi ya da her ikisi ile bağlar. Örnekler: \"em1\", \"3C:97:0E:42:1A:19\", "
 "\"em1 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-ethernet.c:320
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Ethernet kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-ethernet.c:447
-#| msgid "Ethernet"
+#: ../src/connection-editor/page-ethernet.c:457
 msgid "Ethernet device"
 msgstr "Kablolu ağ (ethernet) aygıtı"
 
-#: ../src/connection-editor/page-ethernet.c:451
-#: ../src/connection-editor/page-vlan.c:744
-#: ../src/connection-editor/page-wifi.c:583
-#| msgid "C_loned MAC address:"
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
 msgid "cloned MAC"
 msgstr "birebir kopyalanmış MAC"
 
-#: ../src/connection-editor/page-ethernet.c:455
+#: ../src/connection-editor/page-ethernet.c:465
 msgid "Wake-on-LAN password"
 msgstr "Ağdan Uyandırma parolası"
 
-#: ../src/connection-editor/page-ethernet.c:490
+#: ../src/connection-editor/page-ethernet.c:500
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "Ethernet bağlantısı %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:808
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Ön tanımlı"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2561,15 +2541,15 @@ msgstr ""
 "bölgenin kullanılmasıyla sonuçlanır. Sadece firewalld etkin ise "
 "kullanılabilir."
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD çalışmıyor."
 
-#: ../src/connection-editor/page-general.c:354
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Genel kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-infiniband.c:60
+#: ../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\", "
@@ -2581,152 +2561,152 @@ 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:156
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-infiniband.c:219
+#: ../src/connection-editor/page-infiniband.c:216
 msgid "infiniband device"
 msgstr "infiniband aygıtı"
 
-#: ../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-ip4.c:129
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Otomatik (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:130
-#: ../src/connection-editor/page-ip6.c:134
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Sadece otomatik (VPN) adresler"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Otomatik, sadece adresler"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:136
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Otomatik (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:137
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Sadece otomatik (PPPoE) adresler"
 
-#: ../src/connection-editor/page-ip4.c:139
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Otomatik (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:140
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Sadece otomatik (DHCP) adresler"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:201
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Sadece Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:301
-#: ../src/connection-editor/page-ip6.c:299
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "_Ek DNS sunucuları:"
 
-#: ../src/connection-editor/page-ip4.c:310
-#: ../src/connection-editor/page-ip6.c:308
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Ek a_rama alanları:"
 
-#: ../src/connection-editor/page-ip4.c:969
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s için IPv4 yolları düzenleniyor"
 
-#: ../src/connection-editor/page-ip4.c:1162
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 Ayarları"
 
-#: ../src/connection-editor/page-ip4.c:1164
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 kullanıcı arayüzü yüklenemiyor."
 
-#: ../src/connection-editor/page-ip4.c:1257
+#: ../src/connection-editor/page-ip4.c:1253
 #, c-format
 msgid "IPv4 address \"%s\" invalid"
 msgstr "IPv4 adresi \"%s\" geçersiz"
 
-#: ../src/connection-editor/page-ip4.c:1265
+#: ../src/connection-editor/page-ip4.c:1261
 #, c-format
 msgid "IPv4 address netmask \"%s\" invalid"
 msgstr "IPv4 adresi ağ maskesi (netmask) \"%s\" geçersiz"
 
-#: ../src/connection-editor/page-ip4.c:1274
+#: ../src/connection-editor/page-ip4.c:1270
 #, c-format
 msgid "IPv4 gateway \"%s\" invalid"
 msgstr "IPv4 ağ geçidi (gateway) \"%s\" geçersiz"
 
-#: ../src/connection-editor/page-ip4.c:1317
+#: ../src/connection-editor/page-ip4.c:1313
 #, c-format
 msgid "IPv4 DNS server \"%s\" invalid"
 msgstr "IPv4 DNS sunucusu \"%s\" geçersiz"
 
-#: ../src/connection-editor/page-ip6.c:152
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Yok say"
 
-#: ../src/connection-editor/page-ip6.c:176
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Otomatik, sadece DHCP"
 
-#: ../src/connection-editor/page-ip6.c:968
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s için IPv6 yolları düzenleniyor"
 
-#: ../src/connection-editor/page-ip6.c:1159
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 Ayarları"
 
-#: ../src/connection-editor/page-ip6.c:1161
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 kullanıcı arayüzü yüklenemiyor."
 
-#: ../src/connection-editor/page-ip6.c:1252
+#: ../src/connection-editor/page-ip6.c:1248
 #, c-format
 msgid "IPv6 address \"%s\" invalid"
 msgstr "IPv6 adresi \"%s\" geçersiz"
 
-#: ../src/connection-editor/page-ip6.c:1260
+#: ../src/connection-editor/page-ip6.c:1256
 #, c-format
 msgid "IPv6 prefix \"%s\" invalid"
 msgstr "IPv6 öneki \"%s\" geçersiz"
 
-#: ../src/connection-editor/page-ip6.c:1269
+#: ../src/connection-editor/page-ip6.c:1265
 #, c-format
 msgid "IPv6 gateway \"%s\" invalid"
 msgstr "IPv6 ağ geçidi \"%s\" geçersiz"
 
-#: ../src/connection-editor/page-ip6.c:1311
+#: ../src/connection-editor/page-ip6.c:1307
 #, c-format
 msgid "IPv6 DNS server \"%s\" invalid"
 msgstr "IPv6 DNS sunucusu \"%s\" geçersiz"
 
-#: ../src/connection-editor/page-master.c:250
-#: ../src/connection-editor/page-master.c:261
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Bağımlıları çoğalt"
 
-#: ../src/connection-editor/page-master.c:251
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "Hem '%s' hem '%s' slave'i '%s' aygıtına başvuruyor"
 
-#: ../src/connection-editor/page-master.c:262
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2735,25 +2715,25 @@ msgstr ""
 "'%s' ve '%s' slave'i aynı fiziksel aygıtın farklı sanal portlarına ('%s' ve "
 "'%s') başvuruyor."
 
-#: ../src/connection-editor/page-master.c:387
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s %d'ye bağımlı"
 
-#: ../src/connection-editor/page-mobile.c:313
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Mobil geniş bant kullanıcı arayüzü yüklenemiyor."
 
-#: ../src/connection-editor/page-mobile.c:330
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Desteklenmeyen mobil geniş bant bağlantı tipi."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:532
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Mobil Geniş Bant Sağlayıcı Tipi Seç"
 
-#: ../src/connection-editor/page-mobile.c:559
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2761,85 +2741,85 @@ msgstr ""
 "Mobil geniş bant sağlayıcınızın kullandığı teknolojiyi seçin. Emin "
 "değilseniz sağlayıcınıza sorun."
 
-#: ../src/connection-editor/page-mobile.c:564
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Sağlayıcım _GSM-tabanlı teknoloji kullanıyor (i.e. GPRS, EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:571
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "Sağlayıcım C_DMA-tabanlı teknoloji kullanıyor (i.e. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:55
-#: ../src/mobile-helpers.c:277
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:584 ../src/mb-menu-item.c:59
-#: ../src/mobile-helpers.c:275
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:133
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:259
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:304
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:273
-#: ../src/wireless-security/eap-method-ttls.c:289
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:274
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:140
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "yok"
 
-#: ../src/connection-editor/page-ppp.c:200
+#: ../src/connection-editor/page-ppp.c:196
 #, c-format
 msgid "Editing PPP authentication methods for %s"
 msgstr "%s için PPP yetkilendirme yöntemleri düzenleniyor"
 
-#: ../src/connection-editor/page-ppp.c:283
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP Ayarları"
 
-#: ../src/connection-editor/page-ppp.c:285
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-team.c:100
-#: ../src/connection-editor/page-team-port.c:74
-#: ../src/connection-editor/vpn-helpers.c:168
+#: ../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 "İçeri aktarılacak dosyayı seç"
 
-#: ../src/connection-editor/page-team.c:120
-#: ../src/connection-editor/page-team-port.c:94
+#: ../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"
 msgstr "Hata: dosya geçerli bir JSON yapılandırması içermiyor"
 
-#: ../src/connection-editor/page-team.c:272
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "Takım kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-team.c:379
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Takım bağlantısı %d"
@@ -2847,57 +2827,56 @@ msgstr "Takım bağlantısı %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:154
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Takım Bağlantı Noktası"
 
-#: ../src/connection-editor/page-team-port.c:156
+#: ../src/connection-editor/page-team-port.c:153
 msgid "Could not load team port user interface."
 msgstr "Takım bağlantı noktası kullanıcı arayüzü yüklenemedi."
 
 #. 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:417
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (\"%s\" yoluyla)"
 
-#: ../src/connection-editor/page-vlan.c:429
+#: ../src/connection-editor/page-vlan.c:426
 #, c-format
-#| msgid "No network connection"
 msgid "New connection..."
 msgstr "Yeni bağlantı..."
 
-#: ../src/connection-editor/page-vlan.c:599
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Vlan kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-vlan.c:737
+#: ../src/connection-editor/page-vlan.c:734
 msgid "vlan parent"
 msgstr "vlan ebeveyni"
 
-#: ../src/connection-editor/page-vlan.c:800
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN bağlantısı %d"
 
-#: ../src/connection-editor/page-vpn.c:107
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-vpn.c:122
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' için VPN eklenti servisi bulunamadı."
 
-#: ../src/connection-editor/page-vpn.c:209
-#: ../src/connection-editor/page-vpn.c:304
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN bağlantısı %d"
 
-#: ../src/connection-editor/page-vpn.c:233
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2907,11 +2886,11 @@ msgstr ""
 "\n"
 "Hata: VPN servis tipi yok."
 
-#: ../src/connection-editor/page-vpn.c:258
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "VPN Bağlantı Türünü Seçin"
 
-#: ../src/connection-editor/page-vpn.c:259
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2921,7 +2900,7 @@ msgstr ""
 "istediğiniz VPN bağlantı türü listede görünmüyorsa, uygun VPN eklentisi "
 "kurulu olmayabilir."
 
-#: ../src/connection-editor/page-wifi.c:80
+#: ../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"
@@ -2929,7 +2908,7 @@ msgstr ""
 "Bu seçenek bu bağlantıyı girilen BSSID ile belirtilen kablosuz erişim "
 "noktasına (AP) kilitler.  Örnek: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:91
+#: ../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\", "
@@ -2939,83 +2918,82 @@ msgstr ""
 "adresi ya da her ikisi ile bağlar. Örnekler: \"wlan0\", "
 "\"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\""
 
-#: ../src/connection-editor/page-wifi.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:452
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "Kablosuz bağlantı kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-wifi.c:573
+#: ../src/connection-editor/page-wifi.c:571
 msgid "bssid"
 msgstr "bssid"
 
-#: ../src/connection-editor/page-wifi.c:579
-#| msgid "Any device"
+#: ../src/connection-editor/page-wifi.c:577
 msgid "Wi-Fi device"
 msgstr "Wi-Fi aygıtı"
 
-#: ../src/connection-editor/page-wifi.c:621
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Kablosuz bağlantı %d"
 
-#: ../src/connection-editor/page-wifi-security.c:312
-#: ../src/libnma/nma-wifi-dialog.c:909 ../src/libnm-gtk/nm-wifi-dialog.c:925
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922
 msgid "WEP 40/128-bit Key (Hex or ASCII)"
 msgstr "WEP 40/128-bit Anahtar (Hex ya da ASCII)"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnma/nma-wifi-dialog.c:918 ../src/libnm-gtk/nm-wifi-dialog.c:934
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Parola"
 
-#: ../src/connection-editor/page-wifi-security.c:348
-#: ../src/libnma/nma-wifi-dialog.c:948 ../src/libnm-gtk/nm-wifi-dialog.c:964
+#: ../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)"
 msgstr "Dinamik WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:361
-#: ../src/libnma/nma-wifi-dialog.c:962 ../src/libnm-gtk/nm-wifi-dialog.c:978
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Kişisel"
 
-#: ../src/connection-editor/page-wifi-security.c:374
-#: ../src/libnma/nma-wifi-dialog.c:976 ../src/libnm-gtk/nm-wifi-dialog.c:992
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wifi-security.c:416
+#: ../src/connection-editor/page-wifi-security.c:413
 msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Kablosuz bağlantı güvenlik kullanıcı arayüzü yüklenemedi; eksik kablosuz "
 "bağlantı ayarı."
 
-#: ../src/connection-editor/page-wifi-security.c:427
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Kablosuz Bağlantı Güvenliği"
 
-#: ../src/connection-editor/page-wifi-security.c:429
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "Kablosuz bağlantı güvenlik kullanıcı arayüzü yüklenemedi."
 
-#: ../src/connection-editor/page-wifi-security.c:509
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
 msgid "missing SSID"
 msgstr "SSID eksik"
 
-#: ../src/connection-editor/page-wifi-security.c:515
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
 msgid "Security not compatible with Ad-Hoc mode"
 msgstr "Güvenlik Ad-Hoc kipiyle uyumlu değil"
 
-#: ../src/connection-editor/vpn-helpers.c:141
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN bağlantısı içeri aktarılamıyor"
 
-#: ../src/connection-editor/vpn-helpers.c:143
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -3027,30 +3005,29 @@ msgstr ""
 "\n"
 "Hata: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:144
-#| msgid "Unknown error"
+#: ../src/connection-editor/vpn-helpers.c:141
 msgid "unknown error"
 msgstr "bilinmeyen hata"
 
-#: ../src/connection-editor/vpn-helpers.c:218
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "\"%s\" adında bir dosya zaten var."
 
-#: ../src/connection-editor/vpn-helpers.c:220
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Değiştir"
 
-#: ../src/connection-editor/vpn-helpers.c:222
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Kaydedeceğiniz VPN bağlantısını %s ile değiştirmek istiyor musunuz?"
 
-#: ../src/connection-editor/vpn-helpers.c:258
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "VPN bağlantısı dışarı aktarılamıyor"
 
-#: ../src/connection-editor/vpn-helpers.c:260
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -3061,11 +3038,11 @@ msgstr ""
 "\n"
 "Hata: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:295
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "VPN bağlantısını dışarı aktar..."
 
-#: ../src/ethernet-dialog.c:89 ../src/ethernet-dialog.c:97
+#: ../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)."
@@ -3089,32 +3066,32 @@ msgstr "Bağlantı Bilgileri"
 msgid "Active Network Connections"
 msgstr "Etkin Ağ Bağlantıları"
 
-#: ../src/libnma/nma-mobile-wizard.c:203
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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 geniş bant bağlantınız aşağıdaki ayarlarla yapılandırıldı:"
 
 #. Device
-#: ../src/libnma/nma-mobile-wizard.c:210
-#: ../src/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Aygıtınız:"
 
 #. Provider
-#: ../src/libnma/nma-mobile-wizard.c:221
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Sağlayıcınız:"
 
 #. Plan and APN
-#: ../src/libnma/nma-mobile-wizard.c:232
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "Planınız:"
 
-#: ../src/libnma/nma-mobile-wizard.c:253
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3128,28 +3105,28 @@ msgstr ""
 "düzenlemek için, \"Sistem >> Tercihler menüsünden \"Ağ Bağlantıları\"nı "
 "seçin."
 
-#: ../src/libnma/nma-mobile-wizard.c:266
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Mobil Geniş Bant Ayarlarını Doğrula"
 
-#: ../src/libnma/nma-mobile-wizard.c:330
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Listelenmemiş"
 
-#: ../src/libnma/nma-mobile-wizard.c:461
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Planınızı seçin:"
 
-#: ../src/libnma/nma-mobile-wizard.c:485
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../src/libnma/nma-mobile-wizard.c:480
+#: ../src/libnm-gtk/nm-mobile-wizard.c:481
 msgid "Selected plan _APN (Access Point Name):"
 msgstr "Seçili plan _APN (Access Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.c:505
-#: ../src/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3161,83 +3138,83 @@ msgstr ""
 "\n"
 "Planınızdan emin değilseniz planınızın APN sorun."
 
-#: ../src/libnma/nma-mobile-wizard.c:513
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Ödeme Planınızı Seçin"
 
-#: ../src/libnma/nma-mobile-wizard.c:562
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Planım listede değil..."
 
-#: ../src/libnma/nma-mobile-wizard.c:715
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "_Listeden sağlayıcınızı seçin:"
 
-#: ../src/libnma/nma-mobile-wizard.c:728
-#: ../src/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Sağlayıcı"
 
-#: ../src/libnma/nma-mobile-wizard.c:753
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Sağlayıcımı bulamıyorum ve _elle girmek istiyorum:"
 
-#: ../src/libnma/nma-mobile-wizard.c:766
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Sağlayıcı:"
 
-#: ../src/libnma/nma-mobile-wizard.c:783
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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 "Sağlayıcım GSM teknolojisini kullanıyor (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/libnma/nma-mobile-wizard.c:785
-#: ../src/libnm-gtk/nm-mobile-wizard.c:786
+#: ../src/libnma/nma-mobile-wizard.c:780
+#: ../src/libnm-gtk/nm-mobile-wizard.c:781
 msgid "My provider uses CDMA technology (1xRTT, EVDO)"
 msgstr "Sağlayıcım CDMA teknolojisini kullanıyor (1xRTT, EVDO)"
 
-#: ../src/libnma/nma-mobile-wizard.c:796
-#: ../src/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Sağlayıcınızı Seçin"
 
-#: ../src/libnma/nma-mobile-wizard.c:1058
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "Ülke veya Bölge Listesi:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1071
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Ülke veya bölge"
 
-#: ../src/libnma/nma-mobile-wizard.c:1081
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Ülkem listede değil"
 
-#: ../src/libnma/nma-mobile-wizard.c:1131
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../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.c:1188
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Yüklenilen GSM aygıtı"
 
-#: ../src/libnma/nma-mobile-wizard.c:1191
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Yüklenilen CDMA aygıtı"
 
-#: ../src/libnma/nma-mobile-wizard.c:1359
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3245,88 +3222,82 @@ msgstr ""
 "Bu yardımcı kolayca hücresel ağa (3G) mobil geniş bant bağlantı kurmanıza "
 "yardımcı olacak."
 
-#: ../src/libnma/nma-mobile-wizard.c:1365
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Aşağıdaki bilgilere ihtiyacınız olacak:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1376
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Geniş bant sağlayıcınızın adı"
 
-#: ../src/libnma/nma-mobile-wizard.c:1382
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Geniş bant ödeme planınızın adı"
 
-#: ../src/libnma/nma-mobile-wizard.c:1388
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 "(bazı durumlarda) Geniş bant ödeme planı APN (Access Point Name)"
 
-#: ../src/libnma/nma-mobile-wizard.c:1417
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Bu mobil _geniş bant aygıtı için bir bağlantı oluştur:"
 
-#: ../src/libnma/nma-mobile-wizard.c:1432
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Herhangi bir aygıt"
 
-#: ../src/libnma/nma-mobile-wizard.c:1445
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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.c:1618
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Yeni Mobil Geniş Bant Bağlantı"
 
-#: ../src/libnma/nma-ui-utils.c:53 ../src/libnm-gtk/nm-ui-utils.c:618
-#| msgid "Store the password only for this _user"
+#: ../src/libnma/nma-ui-utils.c:49 ../src/libnm-gtk/nm-ui-utils.c:615
 msgid "Store the password only for this user"
 msgstr "Parolayı sadece bu kullanıcı için depola"
 
-#: ../src/libnma/nma-ui-utils.c:54 ../src/libnm-gtk/nm-ui-utils.c:619
-#| msgid "Store the password for _all users"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
 msgid "Store the password for all users"
 msgstr "Parolayı bütün kullanıcılar için depola"
 
-#: ../src/libnma/nma-ui-utils.c:55 ../src/libnm-gtk/nm-ui-utils.c:620
-#| msgid "As_k for this password every time"
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
 msgid "Ask for this password every time"
 msgstr "Bu parolayı her zaman sor"
 
-#: ../src/libnma/nma-ui-utils.c:56 ../src/libnm-gtk/nm-ui-utils.c:621
-#| msgid "A password is required to connect to '%s'."
+#: ../src/libnma/nma-ui-utils.c:52 ../src/libnm-gtk/nm-ui-utils.c:618
 msgid "The password is not required"
 msgstr "Parola gerekli değil"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:102
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
 msgid "_Secondary Password:"
 msgstr "_İkincil Parola:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:105
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:105
-#| msgid "_Secondary Password:"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
 msgid "_Ternary Password:"
 msgstr "_Üçüncül Parola:"
 
-#: ../src/libnma/nma-vpn-password-dialog.c:250
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:250
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
 msgid "Sh_ow passwords"
 msgstr "Parolayı Gö_ster"
 
-#: ../src/libnma/nma-wifi-dialog.c:135 ../src/libnm-gtk/nm-wifi-dialog.c:144
-#| msgid "Disconnect"
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
 msgid "Click to connect"
 msgstr "Bağlanmak için tıklayın"
 
-#: ../src/libnma/nma-wifi-dialog.c:136 ../src/libnm-gtk/nm-wifi-dialog.c:145
+#: ../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"
@@ -3334,55 +3305,55 @@ msgstr ""
 "Ya bir parola eksik ya da bağlantı geçersiz. İkinci durumda, önce bağlantıyı "
 "nm-connection-editor ile düzenlemelisiniz"
 
-#: ../src/libnma/nma-wifi-dialog.c:458 ../src/libnm-gtk/nm-wifi-dialog.c:468
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Yeni..."
 
-#: ../src/libnma/nma-wifi-dialog.c:892 ../src/libnm-gtk/nm-wifi-dialog.c:908
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Hiçbiri"
 
-#: ../src/libnma/nma-wifi-dialog.c:1060 ../src/libnm-gtk/nm-wifi-dialog.c:1078
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Oluştur"
 
-#: ../src/libnma/nma-wifi-dialog.c:1146 ../src/libnm-gtk/nm-wifi-dialog.c:1164
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "'%s' kablosuz ağına erişmek için parola ya da şifreleme anahtarı gereklidir."
 
-#: ../src/libnma/nma-wifi-dialog.c:1148 ../src/libnm-gtk/nm-wifi-dialog.c:1166
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Kablosuz Ağ Kimlik Doğrulaması Gerekli"
 
-#: ../src/libnma/nma-wifi-dialog.c:1150 ../src/libnm-gtk/nm-wifi-dialog.c:1168
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Kablosuz ağ için kimlik doğrulaması gerekli"
 
-#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Yeni Kablosuz Ağ Oluştur"
 
-#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Yeni Kablosuz Ağ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1158 ../src/libnm-gtk/nm-wifi-dialog.c:1176
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Oluşturmak istediğiniz Kablosuz ağ için bir ad girin."
 
-#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Gizli Kablosuz Ağa Bağlan"
 
-#: ../src/libnma/nma-wifi-dialog.c:1162 ../src/libnm-gtk/nm-wifi-dialog.c:1180
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Gizli Kablosuz ağ"
 
-#: ../src/libnma/nma-wifi-dialog.c:1163 ../src/libnm-gtk/nm-wifi-dialog.c:1181
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
@@ -3402,23 +3373,23 @@ msgstr "B_ağlantı:"
 msgid "Wi-Fi _adapter:"
 msgstr "Kablosuz _bağdaştırıcı:"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:372
+#: ../src/libnm-gtk/nm-ui-utils.c:302 ../src/libnm-gtk/nm-ui-utils.c:369
 msgid "Wired"
 msgstr "Kablolu"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:330
+#: ../src/libnm-gtk/nm-ui-utils.c:327
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:344
+#: ../src/libnm-gtk/nm-ui-utils.c:341
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
+#: ../src/libnm-gtk/nm-ui-utils.c:404
 msgid "PCI"
 msgstr "PCI"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:409
+#: ../src/libnm-gtk/nm-ui-utils.c:406
 msgid "USB"
 msgstr "USB"
 
@@ -3428,17 +3399,17 @@ msgstr "USB"
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #.
-#: ../src/libnm-gtk/nm-ui-utils.c:485 ../src/libnm-gtk/nm-ui-utils.c:505
+#: ../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:50
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Kullanım:"
 
-#: ../src/main.c:52
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3446,157 +3417,157 @@ msgstr ""
 "Bu program NetworkManager programının bir bileşenidir (https://wiki.gnome."
 "org/Projects/NetworkManager/)."
 
-#: ../src/main.c:53
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
 msgstr "Komut satırının aksine GNOME masaüstü ortamında çalışmaya uygundur."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:75
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:126
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "etkin değil"
 
-#: ../src/mb-menu-item.c:132
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "kayıtlı değil"
 
-#: ../src/mb-menu-item.c:150
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Ev ağı (%s)"
 
-#: ../src/mb-menu-item.c:152
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Ev ağı"
 
-#: ../src/mb-menu-item.c:160
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "aranıyor"
 
-#: ../src/mb-menu-item.c:163
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "kayıt işlemi reddedildi"
 
-#: ../src/mb-menu-item.c:168 ../src/mb-menu-item.c:174
+#: ../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:170 ../src/mb-menu-item.c:176
+#: ../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:179
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Ağ dolaşımı (%s)"
 
-#: ../src/mb-menu-item.c:181
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Ağ dolaşımı"
 
-#: ../src/mobile-helpers.c:325
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "'%2$s' üzerindeki '%1$s' SIM kartının PIN kodu"
 
-#: ../src/mobile-helpers.c:458
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN kodu gerekli"
 
-#: ../src/mobile-helpers.c:466
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "Mobil geniş bant aygıtı için PIN kodu gerekli"
 
-#: ../src/mobile-helpers.c:610
+#: ../src/mobile-helpers.c:619
 #, c-format
 msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
 msgstr "Mobil geniş bant bağlantısı '%s' etkin: (%d%%%s%s)"
 
-#: ../src/mobile-helpers.c:613
+#: ../src/mobile-helpers.c:622
 msgid "roaming"
 msgstr "dolaşım"
 
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:181
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s bağlantısı"
 
-#: ../src/wireless-security/eap-method.c:59
+#: ../src/wireless-security/eap-method.c:56
 msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr "802.1x güvenliğinde (wpa-eap) tanımlanmamış hata"
 
-#: ../src/wireless-security/eap-method.c:258
+#: ../src/wireless-security/eap-method.c:255
 msgid "unspecified error validating eap-method file"
 msgstr "eap-method dosyası doğrulamada belirtilmemiş hata"
 
-#: ../src/wireless-security/eap-method.c:455
+#: ../src/wireless-security/eap-method.c:452
 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
 msgstr "DER, PEM, veya PKCS#12 özel anahtarları (*.der, *.pem, *.p12, *.key)"
 
-#: ../src/wireless-security/eap-method.c:458
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER veya PEM sertifikaları (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:71
+#: ../src/wireless-security/eap-method-fast.c:70
 msgid "missing EAP-FAST PAC file"
 msgstr "EAP-FAST PAC dosyası eksik"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:303
-#: ../src/wireless-security/eap-method-ttls.c:334
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Bir PAC dosyası seçin..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC dosyaları (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Tüm dosyalar"
 
@@ -3632,32 +3603,32 @@ msgstr "_Dahili kimlik doğrulaması:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Otomatik PAC ön _hazırlığına izin ver"
 
-#: ../src/wireless-security/eap-method-leap.c:62
+#: ../src/wireless-security/eap-method-leap.c:63
 msgid "missing EAP-LEAP username"
 msgstr "EAP-LEAP kullanıcı adı eksik"
 
-#: ../src/wireless-security/eap-method-leap.c:68
+#: ../src/wireless-security/eap-method-leap.c:69
 msgid "missing EAP-LEAP password"
 msgstr "EAP-LEAP parolası eksik"
 
-#: ../src/wireless-security/eap-method-peap.c:64
+#: ../src/wireless-security/eap-method-peap.c:63
 #, c-format
 msgid "invalid EAP-PEAP CA certificate: %s"
 msgstr "geçersiz EAP-PEAP CA sertifikası: %s"
 
-#: ../src/wireless-security/eap-method-peap.c:69
+#: ../src/wireless-security/eap-method-peap.c:68
 msgid "invalid EAP-PEAP CA certificate: no certificate specified"
 msgstr "geçersiz EAP-PEAP CA sertifikası: sertifika belirtilmedi"
 
-#: ../src/wireless-security/eap-method-peap.c:288
-#: ../src/wireless-security/eap-method-ttls.c:319
-#: ../src/wireless-security/wireless-security.c:428
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:382
-#: ../src/wireless-security/eap-method-tls.c:482
-#: ../src/wireless-security/eap-method-ttls.c:413
+#: ../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 "Sertifika Makamı sertifikası seçin..."
 
@@ -3685,47 +3656,46 @@ msgstr "CA sertifikası ge_rekli değildir"
 msgid "PEAP _version:"
 msgstr "PEAP _sürümü:"
 
-#: ../src/wireless-security/eap-method-simple.c:71
+#: ../src/wireless-security/eap-method-simple.c:72
 msgid "missing EAP username"
 msgstr "eksik EAP kullanıcı adı"
 
-#: ../src/wireless-security/eap-method-simple.c:81
+#: ../src/wireless-security/eap-method-simple.c:82
 msgid "missing EAP password"
 msgstr "eksik EAP parolası"
 
-#: ../src/wireless-security/eap-method-tls.c:67
+#: ../src/wireless-security/eap-method-tls.c:66
 msgid "missing EAP-TLS identity"
 msgstr "eksik EAP-TLS kimliği"
 
-#: ../src/wireless-security/eap-method-tls.c:72
+#: ../src/wireless-security/eap-method-tls.c:71
 #, c-format
-#| msgid "C_A certificate:"
 msgid "invalid EAP-TLS CA certificate: %s"
 msgstr "geçersiz EAP-TLS CA sertifikası: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:77
+#: ../src/wireless-security/eap-method-tls.c:76
 msgid "invalid EAP-TLS CA certificate: no certificate specified"
 msgstr "geçersiz EAP-TLS CA sertifikası: sertifika belirtilmedi"
 
-#: ../src/wireless-security/eap-method-tls.c:85
+#: ../src/wireless-security/eap-method-tls.c:84
 msgid "invalid EAP-TLS password: missing"
 msgstr "geçersiz EAP-TLS parolası: eksik"
 
-#: ../src/wireless-security/eap-method-tls.c:95
+#: ../src/wireless-security/eap-method-tls.c:94
 #, c-format
 msgid "invalid EAP-TLS private-key: %s"
 msgstr "geçersiz EAP-TLS gizli-anahtarı: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:102
+#: ../src/wireless-security/eap-method-tls.c:101
 #, c-format
 msgid "invalid EAP-TLS user-certificate: %s"
 msgstr "geçersiz EAP-TLS kullanıcı-sertifikası: %s"
 
-#: ../src/wireless-security/eap-method-tls.c:297
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Şifrelenmemiş özel anahtarlar güvenli değildir"
 
-#: ../src/wireless-security/eap-method-tls.c:300
+#: ../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 "
@@ -3739,11 +3709,11 @@ msgstr ""
 "\n"
 "(Özel anahtarınızı openssl ile parola korumalı yapabilirsiniz)"
 
-#: ../src/wireless-security/eap-method-tls.c:476
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Kişisel sertifikanızı seçin..."
 
-#: ../src/wireless-security/eap-method-tls.c:488
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Özel anahtarınızı seçin..."
 
@@ -3763,36 +3733,36 @@ msgstr "Özel _anahtar:"
 msgid "_Private key password:"
 msgstr "Ö_zel anahtar parolası:"
 
-#: ../src/wireless-security/eap-method-ttls.c:64
+#: ../src/wireless-security/eap-method-ttls.c:63
 #, c-format
 msgid "invalid EAP-TTLS CA certificate: %s"
 msgstr "geçersiz EAP-TTLS CA sertifikası: %s"
 
-#: ../src/wireless-security/eap-method-ttls.c:69
+#: ../src/wireless-security/eap-method-ttls.c:68
 msgid "invalid EAP-TTLS CA certificate: no certificate specified"
 msgstr "geçersiz EAP-TTLS CA sertifikası: sertifika belirtilmedi"
 
-#: ../src/wireless-security/wireless-security.c:76
+#: ../src/wireless-security/wireless-security.c:72
 msgid "Unknown error validating 802.1x security"
 msgstr "802.1x güvenliğini doğrulamada bilinmeyen hata"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:464
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:475
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "HIZLI"
 
-#: ../src/wireless-security/wireless-security.c:486
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tünelli TLS"
 
-#: ../src/wireless-security/wireless-security.c:497
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Korumalı EAP (PEAP)"
 
@@ -3802,11 +3772,11 @@ msgstr "Korumalı EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Ki_mlik doğrulaması:"
 
-#: ../src/wireless-security/ws-leap.c:60
+#: ../src/wireless-security/ws-leap.c:61
 msgid "missing leap-username"
 msgstr "leap-kullanıcı adı eksik"
 
-#: ../src/wireless-security/ws-leap.c:68
+#: ../src/wireless-security/ws-leap.c:69
 msgid "missing leap-password"
 msgstr "leap-parolası eksik"
 
@@ -3870,7 +3840,7 @@ msgstr "Anahtarı _göster:"
 msgid "WEP inde_x:"
 msgstr "WEP indek_si:"
 
-#: ../src/wireless-security/ws-wpa-psk.c:68
+#: ../src/wireless-security/ws-wpa-psk.c:69
 #, c-format
 msgid ""
 "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex "
@@ -3879,7 +3849,7 @@ msgstr ""
 "geçersiz wpa-psk: geçersiz anahtar uzunluğu %zu. [8,63] bayt ya da 64 "
 "onaltılık rakam olmalıdır"
 
-#: ../src/wireless-security/ws-wpa-psk.c:76
+#: ../src/wireless-security/ws-wpa-psk.c:77
 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
 msgstr "geçersiz wpa-psk: 64 baytlık anahtar onaltılık olarak yorumlanamıyor"
 
@@ -3887,6 +3857,9 @@ msgstr "geçersiz wpa-psk: 64 baytlık anahtar onaltılık olarak yorumlanamıyo
 msgid "_Type:"
 msgstr "_Tür:"
 
+#~ msgid "_Help"
+#~ msgstr "_Yardım"
+
 #~ msgid "Enable WiMA_X Mobile Broadband"
 #~ msgstr "WiMA_X Mobil Geniş Bant Ağları Etkinleştir"
 
diff --git a/po/ug.po b/po/ug.po
index 664985ff..b7b648f6 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2013-01-31 17:17+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "تور"
 
@@ -41,7 +41,9 @@ msgstr "باغلىنىش ئۇقتۇرۇشىنى ئىناۋەتسىز قىل"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:2
 msgid "Set this to true to disable notifications when connecting to a network."
-msgstr "بىر تورغا باغلىنىۋاتقاندا ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ تاللاشنى TRUE غا تەڭشەڭ."
+msgstr ""
+"بىر تورغا باغلىنىۋاتقاندا ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ تاللاشنى "
+"TRUE غا تەڭشەڭ."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
@@ -50,7 +52,9 @@ msgstr "باغلىنىش ئۈزۈلگەنلىك ئۇقتۇرۇشىنى ئىنا�
 #: ../org.gnome.nm-applet.gschema.xml.in.h:4
 msgid ""
 "Set this to true to disable notifications when disconnecting from a network."
-msgstr "بىر تور باغلىنىشىنى ئۈزۈۋاتقاندا ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ تاللاشنى TRUE غا تەڭشەڭ."
+msgstr ""
+"بىر تور باغلىنىشىنى ئۈزۈۋاتقاندا ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ "
+"تاللاشنى TRUE غا تەڭشەڭ."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:5
 msgid "Disable VPN notifications"
@@ -60,7 +64,9 @@ msgstr "ۋ پ ن(VPN) ئۇقتۇرۇشىنى ئىناۋەتسىز قىل"
 msgid ""
 "Set this to true to disable notifications when connecting to or "
 "disconnecting from a VPN."
-msgstr "ۋ پ ن(VPN) تورىغا  باغلىنىۋاتقاندا ياكى باغلىنىش ئۈزۈلۈۋاتقاندا ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ تاللاشنى TRUE غا تەڭشەڭ."
+msgstr ""
+"ۋ پ ن(VPN) تورىغا  باغلىنىۋاتقاندا ياكى باغلىنىش ئۈزۈلۈۋاتقاندا "
+"ئۇقتۇرۇشلارنىڭ چىقماسلىقىنى ئىستىسىڭىز بۇ تاللاشنى TRUE غا تەڭشەڭ."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:7
 msgid "Suppress networks available notifications"
@@ -69,7 +75,9 @@ msgstr "تور ئىشلىتىلىشچان ئۇقتۇرۇشلىرىنى چەكل�
 #: ../org.gnome.nm-applet.gschema.xml.in.h:8
 msgid ""
 "Set this to true to disable notifications when Wi-Fi networks are available."
-msgstr "ئەگەر بۇ true قىلىپ بەلگىلەنسە، ئىشلەتكىلى بولىدىغان Wi-Fi بار بولغاندا چىقىرىدىغان ئۇقتۇرۇش ئىناۋەتسىز قىلىنىدۇ."
+msgstr ""
+"ئەگەر بۇ true قىلىپ بەلگىلەنسە، ئىشلەتكىلى بولىدىغان Wi-Fi بار بولغاندا "
+"چىقىرىدىغان ئۇقتۇرۇش ئىناۋەتسىز قىلىنىدۇ."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
@@ -77,7 +85,8 @@ msgstr "تامغا"
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:10
 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 WiFi Create"
@@ -86,983 +95,990 @@ msgstr "سىمسىز تور WiFi قۇرۇشنى تاقا"
 #: ../org.gnome.nm-applet.gschema.xml.in.h:12
 msgid ""
 "Set to true to disable creation of adhoc networks when using the applet."
-msgstr "قوللانچاقلارنى ئىشلەتكەندە adhoc تورلىرىنى قۇرماسلىقنى ئىستىسىڭىز بۇ تاللاشنى TRUE غا تەڭشەڭ."
+msgstr ""
+"قوللانچاقلارنى ئىشلەتكەندە adhoc تورلىرىنى قۇرماسلىقنى ئىستىسىڭىز بۇ "
+"تاللاشنى TRUE غا تەڭشەڭ."
 
 #: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
 msgid "Ignore CA certificate"
 msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
 msgid ""
 "Set this to true to disable warnings about CA certificates in EAP "
 "authentication."
-msgstr "EAP دىكى كىملىك دەلىللەشتە CA گۇۋاھنامىسىنىڭ ئاگاھلاندۇرۇشلىرىنى خالىمىسىڭىز بۇنى true غا تەڭشەڭ."
+msgstr ""
+"EAP دىكى كىملىك دەلىللەشتە CA گۇۋاھنامىسىنىڭ ئاگاھلاندۇرۇشلىرىنى خالىمىسىڭىز "
+"بۇنى true غا تەڭشەڭ."
 
-#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
 msgid ""
 "Set this to true to disable warnings about CA certificates in phase 2 of EAP "
 "authentication."
-msgstr "EAP دىكى كىملىك دەلىللەشنىڭ ئىككىنچى باسقۇچىدىكى CA گۇۋاھنامىسىنىڭ ئاگاھلاندۇرۇشلىرىنى خالىمىسىڭىز بۇنى true غا تەڭشەڭ."
+msgstr ""
+"EAP دىكى كىملىك دەلىللەشنىڭ ئىككىنچى باسقۇچىدىكى CA گۇۋاھنامىسىنىڭ "
+"ئاگاھلاندۇرۇشلىرىنى خالىمىسىڭىز بۇنى true غا تەڭشەڭ."
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "تور باشقۇرغۇچ"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:104
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "تور باشقۇرغۇچ"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X كىملىك دەلىللەش"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+#, fuzzy
+msgid "C_onnect"
+msgstr "باغلاندى"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "تور ئاتى(_N)"
 
-#: ../src/applet.c:545
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "باغلىنىشنى قوشۇش/ئاكتىپلاش مەغلۇپ بولدى"
 
-#: ../src/applet.c:547 ../src/applet.c:591 ../src/applet.c:617
-#: ../src/applet-device-wifi.c:1376 ../src/applet-device-wifi.c:1395
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "نامەلۇم خاتالىق"
 
-#: ../src/applet.c:550 ../src/applet.c:620 ../src/applet-device-wifi.c:1379
-#: ../src/applet-device-wifi.c:1398
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "باغلىنىش مەغلۇپ بولدى"
 
-#: ../src/applet.c:589
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "ئۈسكۈنە ئۈزۈش مەغلۇپ بولدى"
 
-#: ../src/applet.c:594
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "ئۈزۈش مەغلۇپ بولدى"
 
-#: ../src/applet.c:615
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "باغلىنىشنى ئاكتىپلاش مەغلۇپ بولدى"
 
-#: ../src/applet.c:986 ../src/applet-device-wifi.c:1069
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "بۇ ئۇچۇرنى قايتا كۆرسەتمە"
 
-#: ../src/applet.c:1075
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the network connection was "
 "interrupted."
-msgstr "\n"
+msgstr ""
+"\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى تور باغلىنىشى ئۈزۈلدى."
 
-#: ../src/applet.c:1078
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service stopped unexpectedly."
-msgstr "\n"
+msgstr ""
+"\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمىتى بىنورمال توختىدى."
 
-#: ../src/applet.c:1081
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service returned invalid "
 "configuration."
-msgstr "\n"
-"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمىتى ئىناۋەتسىز سەپلىمىگە قايتتى."
+msgstr ""
+"\n"
+"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمىتى ئىناۋەتسىز "
+"سەپلىمىگە قايتتى."
 
-#: ../src/applet.c:1084
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the connection attempt timed out."
-msgstr "\n"
+msgstr ""
+"\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى باغلىنىش ۋاقتى ئېشىپ كەتتى."
 
-#: ../src/applet.c:1087
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service did not start in time."
-msgstr "\n"
-"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمىتى ۋاقتىدا باشلانمىدى."
+msgstr ""
+"\n"
+"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمىتى ۋاقتىدا "
+"باشلانمىدى."
 
-#: ../src/applet.c:1090
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service failed to start."
-msgstr "\n"
-"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمەت باشلاش مەغلۇپ بولدى."
+msgstr ""
+"\n"
+"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمەت باشلاش مەغلۇپ "
+"بولدى."
 
-#: ../src/applet.c:1093
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because there were no valid VPN secrets."
-msgstr "\n"
-"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى ئىناۋەتلىك VPN ئىم ھۆججەتلىرى(secret) يوق."
+msgstr ""
+"\n"
+"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى ئىناۋەتلىك VPN ئىم "
+"ھۆججەتلىرى(secret) يوق."
 
-#: ../src/applet.c:1096
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because of invalid VPN secrets."
-msgstr "\n"
-"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN ئىم ھۆججەتلىرى(secret) ئىناۋەتسىز."
+msgstr ""
+"\n"
+"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN ئىم ھۆججەتلىرى(secret) "
+"ئىناۋەتسىز."
 
-#: ../src/applet.c:1103
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed."
-msgstr "\n"
+msgstr ""
+"\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى."
 
-#: ../src/applet.c:1121
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected because the network connection was "
 "interrupted."
-msgstr "\n"
+msgstr ""
+"\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› ئۈزۈلۈپ قالدى، چۈنكى تور باغلىنىشى ئۈزۈلدى."
 
-#: ../src/applet.c:1124
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected because the VPN service stopped."
-msgstr "\n"
+msgstr ""
+"\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› ئۈزۈلۈپ قالدى، چۈنكى VPN مۇلازىمىتى توختىدى."
 
-#: ../src/applet.c:1130
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' disconnected."
-msgstr "\n"
+msgstr ""
+"\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› ئۈزۈلدى."
 
-#: ../src/applet.c:1160
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
 "\n"
 "%s\n"
-msgstr "ۋ پ ن (VPN) باغلىنىشى مۇۋەپپەقىيەتلىك بولدى.\n"
+msgstr ""
+"ۋ پ ن (VPN) باغلىنىشى مۇۋەپپەقىيەتلىك بولدى.\n"
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1162
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "ۋ پ ن (VPN) باغلىنىشى مۇۋەپپەقىيەتلىك بولدى.\n"
 
-#: ../src/applet.c:1164
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "ۋ پ ن(VPN) كىرىش ئۇچۇرى"
 
-#: ../src/applet.c:1170 ../src/applet.c:1178 ../src/applet.c:1228
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "ۋ پ ن(VPN) باغلىنىشى مەغلۇپ بولدى"
 
-#: ../src/applet.c:1235
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed because the VPN service failed to start.\n"
 "\n"
 "%s"
-msgstr "\n"
-"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمەت باشلاش مەغلۇپ بولدى.\n"
+msgstr ""
+"\n"
+"ۋ پ ن(VPN) باغلىنىشى ‹%s› مەغلۇپ بولدى چۈنكى VPN مۇلازىمەت باشلاش مەغلۇپ "
+"بولدى.\n"
 "\n"
 "%s"
 
-#: ../src/applet.c:1238
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
 "The VPN connection '%s' failed to start.\n"
 "\n"
 "%s"
-msgstr "\n"
+msgstr ""
+"\n"
 "ۋ پ ن(VPN) باغلىنىشى ‹%s› نى باشلاش مەغلۇپ بولدى.\n"
 "\n"
 "%s"
 
-#: ../src/applet.c:1553
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "ئۈسكۈنە تەييارلانمىدى(قۇيما دېتال كەم)"
 
-#: ../src/applet.c:1555
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "ئۈسكۈنە تەييارلانمىدى"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1565 ../src/applet-device-ethernet.c:229
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "ئۈزۈلدى"
 
-#: ../src/applet.c:1581
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "ئۈز"
 
-#: ../src/applet.c:1595
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "ئۈسكۈنە باشقۇرۇلمىدى"
 
-#: ../src/applet.c:1639
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "تور ئۈسكۈنىسى يوق"
 
-#: ../src/applet.c:1727
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "ۋ پ ن(VPN) باغلىنىشلىرى(_V)"
 
-#: ../src/applet.c:1784
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "ۋ پ ن(VPN) نى سەپلە(_C)…"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "ۋ پ ن(VPN) باغلىنىشىنى ئۈز(_D)"
 
-#: ../src/applet.c:1882
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "تور باشقۇرغۇچ ئىجرا قىلىنمايۋاتىدۇ…"
 
-#: ../src/applet.c:1887 ../src/applet.c:2739
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "تور باغلىنىشى چەكلەنگەن"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2108
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "تور ئۇلاشنى قوزغات(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2117
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "سىمسىز تورنى(Wi-Fi) ئىناۋەتلىك قىل(_W)"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2126
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "كۆچمە كەڭ بەلۋاغنى ئىناۋەتلىك قىل(_M)"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2135
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "WiMAX كۆچمە كەڭ بەلۋاغنى ئىناۋەتلىك قىل(_X)"
-
 #. Toggle notifications item
-#: ../src/applet.c:2146
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "ئۇقتۇرۇشلارنى قوزغات(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2157
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "باغلىنىش ئۇچۇرلىرى(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2167
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "باغلىنىشلارنى تەھرىرلە…"
 
-#. Help item
-#: ../src/applet.c:2181
-msgid "_Help"
-msgstr "ياردەم(_H)"
-
-#. About item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "ھەققىدە(_A)"
 
-#: ../src/applet.c:2368
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "سىز ھازىر ‹%s› گە باغلاندىڭىز."
+
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "ئۈزۈلدى"
 
-#: ../src/applet.c:2369
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "تور باغلىنىشى ئۈزۈلگەن ئىدى."
 
-#: ../src/applet.c:2602
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "‹%s› تور باغلىنىشى تەييارلىنىۋاتىدۇ…"
 
-#: ../src/applet.c:2605
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "تور باغلىنىشى ‹%s› ئۈچۈن ئىشلەتكۈچىنى تەكشۈرۈش كېرەكلىك…"
 
-#: ../src/applet.c:2608 ../src/applet-device-bt.c:235
-#: ../src/applet-device-wimax.c:469 ../src/mobile-helpers.c:615
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "‹%s› ئۈچۈن بىر تور ئادرېسى ئىلتىماس قىلىۋاتىدۇ..."
 
-#: ../src/applet.c:2611
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "‹%s› تور باغلىنىشى ئاكتىپ"
 
-#: ../src/applet.c:2694
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "ۋ پ ن(VPN) باغلىنىشى ‹%s› باشلىنىۋاتىدۇ"
 
-#: ../src/applet.c:2697
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "ۋ پ ن(VPN) باغلىنىشى ‹%s› ئۈچۈن ئىشلەتكۈچىنى تەكشۈرۈش كېرەكلىك..."
 
-#: ../src/applet.c:2700
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "‹%s› ئۈچۈن بىر VPN ئادرېسى ئىلتىماس قىلىۋاتىدۇ..."
 
-#: ../src/applet.c:2703
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "ۋ پ ن(VPN) باغلىنىشى ‹%s› ئاكتىپ"
 
-#: ../src/applet.c:2744
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "تور باغلىنىشى يوق"
 
-#: ../src/applet.c:3445
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager قوللانچاق"
 
-#: ../src/applet-device-bt.c:169 ../src/applet-device-cdma.c:303
-#: ../src/applet-device-ethernet.c:237 ../src/applet-device-broadband.c:767
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-wifi.c:859
-#: ../src/applet-device-wimax.c:275
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr "خاتا PUK كودى؛ تەمىنلىگۈچىڭىز بىلەن كۆرۈشۈڭ."
+
+#: ../src/applet-device-broadband.c:201
+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:252
+msgid "Sending unlock code..."
+msgstr "قۇلۇپسىزلاش كودى ئەۋەتىۋاتىدۇ..."
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "كۆچمە كەڭ بەلۋاغ(%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
+msgid "Mobile Broadband"
+msgstr "كۆچمە كەڭ بەلۋاغ"
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
 msgid "Available"
 msgstr "ئىشلەتكىلى بولىدۇ"
 
-#: ../src/applet-device-bt.c:195 ../src/applet-device-cdma.c:345
-#: ../src/applet-device-ethernet.c:266 ../src/applet-device-broadband.c:811
-#: ../src/applet-device-gsm.c:399 ../src/applet-device-wimax.c:419
-#, c-format
-msgid "You are now connected to '%s'."
-msgstr "سىز ھازىر ‹%s› گە باغلاندىڭىز."
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشى…"
 
-#: ../src/applet-device-bt.c:199 ../src/applet-device-cdma.c:349
-#: ../src/applet-device-ethernet.c:270 ../src/applet-device-broadband.c:815
-#: ../src/applet-device-gsm.c:403 ../src/applet-device-wifi.c:1261
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
 msgid "Connection Established"
 msgstr "باغلىنىش تۇرغۇزۇلدى"
 
-#: ../src/applet-device-bt.c:200
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "سىز ھازىر يېڭى كۆچمە كەڭ بەلۋاغقا باغلاندىڭىز."
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr "كۆچمە كەڭ بەلۋاغ تورى."
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "سىز ھازىر ئائىلە تورىغا خەتلەتتىڭىز."
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "سىز ھازىر كەزمە تورغا خەتلەتتىڭىز."
+
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "ھازىر كۆچمە كەڭ بەلۋاغ تورىغا باغلاندىڭىز."
 
-#: ../src/applet-device-bt.c:226 ../src/applet-device-wimax.c:460
-#: ../src/mobile-helpers.c:606
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشى ‹%s› غا تەييارلىنىۋاتىدۇ..."
 
-#: ../src/applet-device-bt.c:229 ../src/applet-device-wimax.c:463
-#: ../src/mobile-helpers.c:609
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشى ‹%s› نى سەپلەۋاتىدۇ..."
 
-#: ../src/applet-device-bt.c:232 ../src/applet-device-wimax.c:466
-#: ../src/mobile-helpers.c:612
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشى ‹%s› ئۈچۈن ئىشلەتكۈچىنى تەكشۈرۈش كېرەك..."
 
-#: ../src/applet-device-bt.c:239 ../src/mobile-helpers.c:632
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشى ‹%s› ئاكتىپ"
 
-#: ../src/applet-device-cdma.c:249 ../src/applet-device-broadband.c:713
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:424
-#, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "كۆچمە كەڭ بەلۋاغ(%s)"
-
-#: ../src/applet-device-cdma.c:251 ../src/applet-device-broadband.c:715
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:113
-#: ../src/connection-editor/page-mobile.c:389
-#: ../src/libnm-gtk/nm-ui-utils.c:333
-msgid "Mobile Broadband"
-msgstr "كۆچمە كەڭ بەلۋاغ"
-
-#. Default connection item
-#: ../src/applet-device-cdma.c:316
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "يېڭى كۆچمە كەڭ بەلۋاغ(CDMA) باغلىنىشى..."
-
-#: ../src/applet-device-cdma.c:350
-msgid "You are now connected to the CDMA network."
-msgstr "ھازىر CDMA تورىغا باغلاندىڭىز."
-
-#: ../src/applet-device-cdma.c:417 ../src/applet-device-cdma.c:423
-msgid "CDMA network."
-msgstr "CDMA تورى."
-
-#: ../src/applet-device-cdma.c:418 ../src/applet-device-broadband.c:953
-#: ../src/applet-device-gsm.c:677
-msgid "You are now registered on the home network."
-msgstr "سىز ھازىر ئائىلە تورىغا خەتلەتتىڭىز."
-
-#: ../src/applet-device-cdma.c:424 ../src/applet-device-broadband.c:959
-#: ../src/applet-device-gsm.c:683
-msgid "You are now registered on a roaming network."
-msgstr "سىز ھازىر كەزمە تورغا خەتلەتتىڭىز."
-
-#: ../src/applet-device-ethernet.c:62
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "ئاپتوماتىك Ethernet"
 
-#: ../src/applet-device-ethernet.c:202
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "ئېزېرنېت (Ethernet) تورلىرى (%s)"
 
-#: ../src/applet-device-ethernet.c:204
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "ئېزېرنېت (Ethernet) تورلىرى (%s)"
 
-#: ../src/applet-device-ethernet.c:207
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "ئېزېرنېت (Ethernet) تورلىرى"
 
-#: ../src/applet-device-ethernet.c:209
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "ئېزېرنېت (Ethernet) تورى"
 
-#: ../src/applet-device-ethernet.c:271
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "سىز ھازىر ئېزېرنېت (Ethernet) تورىغا باغلاندىڭىز."
 
-#: ../src/applet-device-ethernet.c:297
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "ئېزېرنېت (Ethernet) تورى باغلىنىشى  ‹%s› غا تەييارلىنىۋاتىدۇ…"
 
-#: ../src/applet-device-ethernet.c:300
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "ئېزېرنېت (Ethernet) تورى باغلىنىشى  ‹%s› نى سەپلەۋاتىدۇ…"
 
-#: ../src/applet-device-ethernet.c:303
+#: ../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:306
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "‹%s› ئۈچۈن ئېزېرنېت (Ethernet) تور ئادرېسى ئىلتىماس قىلىۋاتىدۇ…"
 
-#: ../src/applet-device-ethernet.c:310
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "ئېزېرنېت (Ethernet) تورى باغلىنىشى  ‹%s› ئاكتىپ"
 
-#: ../src/applet-device-ethernet.c:491
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL دەلىللەش"
 
-#: ../src/applet-device-broadband.c:165 ../src/applet-device-gsm.c:518
-msgid "Wrong PUK code; please contact your provider."
-msgstr "خاتا PUK كودى؛ تەمىنلىگۈچىڭىز بىلەن كۆرۈشۈڭ."
-
-#: ../src/applet-device-broadband.c:207 ../src/applet-device-gsm.c:495
-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:258 ../src/applet-device-gsm.c:545
-msgid "Sending unlock code..."
-msgstr "قۇلۇپسىزلاش كودى ئەۋەتىۋاتىدۇ..."
-
-#. Default connection item
-#: ../src/applet-device-broadband.c:780
-msgid "New Mobile Broadband connection..."
-msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشى…"
-
-#: ../src/applet-device-broadband.c:816
-msgid "You are now connected to the Mobile Broadband network."
-msgstr "سىز ھازىر يېڭى كۆچمە كەڭ بەلۋاغقا باغلاندىڭىز."
-
-#: ../src/applet-device-broadband.c:952 ../src/applet-device-broadband.c:958
-msgid "Mobile Broadband network."
-msgstr "كۆچمە كەڭ بەلۋاغ تورى."
-
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "يېڭى كۆچمە كەڭ بەلۋاغ(GSM) باغلىنىشى..."
-
-#: ../src/applet-device-gsm.c:404
-msgid "You are now connected to the GSM network."
-msgstr "ھازىر GSM تورىغا باغلاندىڭىز."
-
-#: ../src/applet-device-gsm.c:676 ../src/applet-device-gsm.c:682
-msgid "GSM network."
-msgstr "GSM تورى."
-
-#: ../src/applet-device-wifi.c:98
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تورىغا باغلان…"
 
-#: ../src/applet-device-wifi.c:149
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "يېڭى سىمسىز(Wi-Fi) تور قۇر(_N)…"
 
-#: ../src/applet-device-wifi.c:293
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(يوق)"
 
-#: ../src/applet-device-wifi.c:787
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "سىمسىز(Wi-Fi) تورلار (%s)"
 
-#: ../src/applet-device-wifi.c:789
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "سىمسىز(Wi-Fi) تور (%s)"
 
-#: ../src/applet-device-wifi.c:791
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "سىمسىز(Wi-Fi) تورلار"
 
-#: ../src/applet-device-wifi.c:824
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "سىمسىز(Wi-Fi) تور ئىناۋەتسىز قىلىنغان"
 
-#: ../src/applet-device-wifi.c:825
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
-msgstr "سىمسىز(Wi-Fi) تور قاتتىق دېتالنىڭ ئۈزچاتىدا ئارقىلىق ئىناۋەتسىز قىلىنغان"
+msgstr ""
+"سىمسىز(Wi-Fi) تور قاتتىق دېتالنىڭ ئۈزچاتىدا ئارقىلىق ئىناۋەتسىز قىلىنغان"
 
-#: ../src/applet-device-wifi.c:886
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "تېخىمۇ كۆپ تور"
 
-#: ../src/applet-device-wifi.c:1065
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "سىمسىز(Wi-Fi) تورلارنى ئىشلەتكىلى بولىدۇ"
 
-#: ../src/applet-device-wifi.c:1066
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "سىمسىز(Wi-Fi) تورغا باغلىنىش ئۈچۈن تور تىزىملىكىنى ئىشلەتسۇن"
 
-#: ../src/applet-device-wifi.c:1260
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "سىز ھازىر سىمسىز(Wi-Fi) تور ‹%s› غا باغلاندىڭىز."
 
-#: ../src/applet-device-wifi.c:1291
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "سىمسىز(Wi-Fi) تور باغلىنىشى ‹%s› غا تەييارلىنىۋاتىدۇ…"
 
-#: ../src/applet-device-wifi.c:1294
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "سىمسىز(Wi-Fi) تور باغلىنىشى ‹%s› نى سەپلەۋاتىدۇ…"
 
-#: ../src/applet-device-wifi.c:1297
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "سىمسىز(Wi-Fi) تور باغلىنىشى ‹%s› ئۈچۈن كىملىك دەلىللەش زۆرۈر…"
 
-#: ../src/applet-device-wifi.c:1300
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "‹%s› ئۈچۈن بىر سىمسىز(Wi-Fi) تور ئادرېسى ئىلتىماس قىلىۋاتىدۇ…"
 
-#: ../src/applet-device-wifi.c:1321
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "سىمسىز(Wi-Fi) تور باغلىنىشى ‹%s› ئاكتىپ: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "سىمسىز(Wi-Fi) تور باغلىنىشى ‹%s› ئاكتىپ"
 
-#: ../src/applet-device-wifi.c:1374
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "باغلىنىشنى ئاكتىپلاش مەغلۇپ بولدى"
 
-#: ../src/applet-device-wifi.c:1393
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "يېڭى باغلىنىش قوشۇش مەغلۇپ بولدى"
 
-#: ../src/applet-device-wimax.c:227
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX كۆچمە كەڭ بەلۋاغ(%s)"
-
-#: ../src/applet-device-wimax.c:229
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX كۆچمە كەڭ بەلۋاغ"
-
-#: ../src/applet-device-wimax.c:255
-msgid "WiMAX is disabled"
-msgstr "WiMAX چەكلەنگەن"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX قاتتىق دېتال ئۈزچاتى تەرىپىدىن چەكلەنگەن"
-
-#: ../src/applet-device-wimax.c:424
-msgid "You are now connected to the WiMAX network."
-msgstr "ھازىر WiMAX تورىغا باغلاندىڭىز."
-
-#: ../src/applet-device-wimax.c:478 ../src/mobile-helpers.c:627
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشى ‹%s› ئاكتىپ:(%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:481 ../src/mobile-helpers.c:630
-msgid "roaming"
-msgstr "كەزمە"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "باغلىنىش ئۇچۇرلىرىنى كۆرسەتكەندە خاتالىق چىقتى:"
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:313
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "دىنامىكىلىق WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "ئادرېسلار"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "يوق"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (كۆڭۈلدىكى)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u مېگابايت/s"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: ../src/applet-dialogs.c:361
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:363
-msgctxt "WiMAX CINR"
-msgid "unknown"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: ../src/applet-dialogs.c:375
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP ئادرېسى:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "رادىئو ئادرېسى:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "تارماق تور ماسكىسى:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "ئادەتتىكى"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "ئارايۈز:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "قاتتىق دېتال ئادرېسى:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "قوزغاتقۇچ:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "سۈرئەت:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "بىخەتەرلىك:"
 
-#: ../src/applet-dialogs.c:512
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:525
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "IP ئادرېسى:"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "رادىئو ئادرېسى:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "تارماق تور ماسكىسى:"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "كۆڭۈلدىكى Route:"
 
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "بىرىنچى DNS:"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "ئىككىنچى DNS:"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "ئۈچىنچى DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "پەرۋا قىلمىدى"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN تىپى:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN ئۆتكىلى:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN ئىشلەتكۈچى ئاتى:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN لەۋھەسى:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "ئاساسىي باغلىنىش:"
 
-#: ../src/applet-dialogs.c:823 ../src/libnm-gtk/nm-ui-utils.c:345
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "نامەلۇم"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "ئىناۋەتلىك ئاكتىپ باغلىنىشلار تېپىلدى!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
-msgstr "نەشر ھوقۇقىغا ئىگە © 2004-2011 Red Hat شىركىتى.\n"
+msgstr ""
+"نەشر ھوقۇقىغا ئىگە © 2004-2011 Red Hat شىركىتى.\n"
 "نەشر ھوقۇقىغا ئىگە © 2005-2008 Novell شىركىتى\n"
 "ۋە باشقا جامائەت تۆھپىكارلىرى ۋە تەرجىمانلار"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
-msgstr "تور ئۈسكۈنىلىرىڭىزنى ۋە باغلىنىشلارنى باشقۇرىدىغان ئۇقتۇرۇش رايونى قوللانچىقى"
+msgstr ""
+"تور ئۈسكۈنىلىرىڭىزنى ۋە باغلىنىشلارنى باشقۇرىدىغان ئۇقتۇرۇش رايونى قوللانچىقى"
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager تور بېتى"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "بايلىق كەمچىل"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "كۆچمە كەڭ بەلۋاغ تور ئىمى"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "‹%s› كە باغلىنىش ئۈچۈن بىر ئىمغا ئېھتىياجلىق."
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "ئىم:"
 
-#: ../src/applet-dialogs.c:1310
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "SIM PIN قۇلۇپسىزلاش كېرەك"
 
-#: ../src/applet-dialogs.c:1311
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "SIM PIN قۇلۇپسىزلاش كېرەك"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1313
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
 "used."
-msgstr "كۆچمە كەڭ بەلۋاغ ئۈسكۈنىسى ‹%s› گە ئىشلىتىلىشتىن ئىلگىرى بىر SIM PIN كودى كېرەك."
+msgstr ""
+"كۆچمە كەڭ بەلۋاغ ئۈسكۈنىسى ‹%s› گە ئىشلىتىلىشتىن ئىلگىرى بىر SIM PIN كودى "
+"كېرەك."
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1315
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN نومۇرى:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1319
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "PIN نومۇرىنى كۆرسەت"
 
-#: ../src/applet-dialogs.c:1321
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "SIM PUK قۇلۇپسىزلاش كېرەك"
 
-#: ../src/applet-dialogs.c:1322
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "SIM PUK قۇلۇپسىزلاش كېرەك"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1324
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
 "used."
-msgstr "كۆچمە كەڭ بەلۋاغ ئۈسكۈنىسى ‹%s› گە ئىشلىتىلىشتىن ئىلگىرى بىر SIM PUK كودى كېرەك."
+msgstr ""
+"كۆچمە كەڭ بەلۋاغ ئۈسكۈنىسى ‹%s› گە ئىشلىتىلىشتىن ئىلگىرى بىر SIM PUK كودى "
+"كېرەك."
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1326
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK نومۇرى:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1329
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "يېڭى PUK نومۇرى:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1331
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "يېڭى PUK نومۇرىنى يەنە كىرگۈزۈڭ:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1336
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "PIN/PUK كودلىرىنى كۆرسەت"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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:8
+#: ../src/connection-editor/ce-page-ip6.ui.h:11
 msgid ""
 "IP addresses identify your computer on the network.  Click the \"Add\" "
 "button to add an IP address."
-msgstr "IP ئادرېسلىرى كومپيۇتېرىڭىزنى توردا كۆرسىتىپ بېرىدىغان بەلگە. \"قوش\" كۇنۇپكىسىنى چېكىپ بىر IP ئادرېسى قوشۇڭ."
+msgstr ""
+"IP ئادرېسلىرى كومپيۇتېرىڭىزنى توردا كۆرسىتىپ بېرىدىغان بەلگە. \"قوش\" "
+"كۇنۇپكىسىنى چېكىپ بىر IP ئادرېسى قوشۇڭ."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "ئۆچۈر(_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "ئاپتوماتىك ئېرىشكەن route لارنى نەزەرگە ئالمىسۇن(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
-msgstr "-پەقەت بۇ سىم ئۇلانغان سىمدا تورنى زىيارەت قىلغاندا، ئاندىن بۇ سىمنى ئىشلىتىدۇ."
+msgstr ""
+"-پەقەت بۇ سىم ئۇلانغان سىمدا تورنى زىيارەت قىلغاندا، ئاندىن بۇ سىمنى "
+"ئىشلىتىدۇ."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
-msgstr "قوزغىتىلغاندا، بۇ باغلىنىش مەڭگۈ كۆڭۈلدىكى تور باغلىنىشى قىلىپ قوللىنالمايدۇ."
+msgstr ""
+"قوزغىتىلغاندا، بۇ باغلىنىش مەڭگۈ كۆڭۈلدىكى تور باغلىنىشى قىلىپ قوللىنالمايدۇ."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1070,23 +1086,26 @@ msgstr "قوزغىتىلغاندا، بۇ باغلىنىش مەڭگۈ كۆڭۈل
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+msgid "Create…"
+msgstr "قۇر…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "باغلىنىش تىپىنى تاللاڭ"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
 "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."
-msgstr "ياسىماقچى بولغان باغلىنىشنىڭ تىپىنى تاللاڭ.\n"
+msgstr ""
+"ياسىماقچى بولغان باغلىنىشنىڭ تىپىنى تاللاڭ.\n"
 "\n"
-"ئەگەر VPN ياسىماقچى بولسىڭىز، بىراق تىزىمدا VPN باغلىنىشى يوق بولسا، بۇ سىزنىڭ VPN قىستۇرمىسىنى ئورناتمىغانلىقىڭىزنى ياكى توغرا ئورناتمىغانلىقىڭىزنى بىلدۈرىدۇ."
-
-#: ../src/connection-editor/ce-new-connection.ui.h:6
-msgid "Create…"
-msgstr "قۇر…"
+"ئەگەر VPN ياسىماقچى بولسىڭىز، بىراق تىزىمدا VPN باغلىنىشى يوق بولسا، بۇ "
+"سىزنىڭ VPN قىستۇرمىسىنى ئورناتمىغانلىقىڭىزنى ياكى توغرا ئورناتمىغانلىقىڭىزنى "
+"بىلدۈرىدۇ."
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
 msgid "Round-robin"
@@ -1129,64 +1148,91 @@ msgid "Bonded _connections:"
 msgstr "كېپىللىك قىلىنغان باغلىنىش(_C)"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "ھالەت(_M):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "شەكىل(_O):"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:685
-msgid "_Edit"
-msgstr "تەھرىر(_E)"
-
-#. Delete
 #: ../src/connection-editor/ce-page-bond.ui.h:13
 #: ../src/connection-editor/ce-page-bridge.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "_Delete"
-msgstr "ئۆچۈر(_D)"
+#: ../src/connection-editor/ce-page-team.ui.h:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "تەھرىر(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "كۆزىتىش چاستوتىسى (_F):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#: ../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:"
 msgstr "ئارايۈز ئاتى(_I):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "ئۇلانما كۆزىتىش(_L):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP نىشانلىرى(_T):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
-msgstr "ئۇلىنىش ھالىتىنى تەكشۈرگەندە ئىزدەش ئۈچۈن ئىشلىتىدىغان IP ئادرېس ياكى پەش بىلەن ئايرىلغان IP ئادرېسلارنىڭ تىزىمى."
+msgstr ""
+"ئۇلىنىش ھالىتىنى تەكشۈرگەندە ئىزدەش ئۈچۈن ئىشلىتىدىغان IP ئادرېس ياكى پەش "
+"بىلەن ئايرىلغان IP ئادرېسلارنىڭ تىزىمى."
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "ئۇلىنىشتىكى كېچىكتۈرۈش(_U):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "ئۇلىنىشنى ئۈزۈشتىكى كېچىكتۈرۈش(_D):"
 
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "بىرىنچى DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "بايت"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "يول تەننەرخى(_C):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "مەرتىۋىسى(_P):"
 
@@ -1198,40 +1244,287 @@ msgstr "چاچ قىسقۇچ ئۇسۇلى(_H):"
 msgid "Bridged _connections:"
 msgstr "كۆۋرۈكسىمان باغلىنىشلار(_C):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr ""
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "تور ئۇلاشنى قوزغات(_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "STP (Spanning Tree Protocol) ئىناۋەتلىك قىل(_S)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "ئەڭ چوڭ يېشى(_M):"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "قېرىش ۋاقتى(_A):"
 
-#: ../src/connection-editor/ce-page.c:72
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "ئاپتوماتىك"
 
-#: ../src/connection-editor/ce-page.c:356
+#: ../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
+msgid "default"
+msgstr "كۆڭۈلدىكى"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "ئادرېس"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "ئادرېس"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "ھەرقانداق بىر ئۈسكۈنە"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
-msgstr "نامەلۇم بىر خاتالىق سەۋەبلىك ئۇلاش مەخپىيەتلىك ھۆججىتىنى يېڭىلىيالمىدى."
+msgstr ""
+"نامەلۇم بىر خاتالىق سەۋەبلىك ئۇلاش مەخپىيەتلىك ھۆججىتىنى يېڭىلىيالمىدى."
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "مەزكۇر باغلىنىش ئۈچۈن 802.1_X بىخەتەرلىكنى ئىشلەتسۇن"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+#, fuzzy
+msgid "Enable"
+msgstr "سىمسىز تورنى(Wi-Fi) ئىناۋەتلىك قىل(_W)"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+#, fuzzy
+msgid "Priority"
+msgstr "مەرتىۋىسى(_P):"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+#, fuzzy
+msgid "Priority Groups"
+msgstr "مەرتىۋىسى(_P):"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#, fuzzy
+msgid "Priority:"
+msgstr "مەرتىۋىسى(_P):"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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
+#, fuzzy
+msgid "Priority Bandwidth:"
+msgstr "مەرتىۋىسى(_P):"
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:10
+#: ../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
@@ -1244,15 +1537,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 msgid "Sho_w password"
 msgstr "ئىمنى كۆرسەت(_W)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../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
@@ -1264,7 +1559,8 @@ msgstr "ئىم(_P):"
 #: ../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-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "ئاپتوماتىك"
@@ -1319,53 +1615,91 @@ msgstr "ئاپتوماتىك قول ئېلىشىش(_O)"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "ئۈسكۈنە MAC ئادرېسى(_D):"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "مۇلازىمەت(_S)"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "كۇلونلانغان MAC ئادرېس"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "بۇ يەرگە كىرگۈزگەن MAC ئادرېسى باغلىنىش قوزغىتىلغاندا تور ئۈسكۈنە قاتتىق دېتال ئادرېس قىلىپ ئىشلىتىلىدۇ. بۇ ئىقتىدار MAC نىڭ كىلونى دېيىلىدۇ. مىسال: 00:11:22:33:44:55"
+msgstr ""
+"بۇ يەرگە كىرگۈزگەن MAC ئادرېسى باغلىنىش قوزغىتىلغاندا تور ئۈسكۈنە قاتتىق "
+"دېتال ئادرېس قىلىپ ئىشلىتىلىدۇ. بۇ ئىقتىدار MAC نىڭ كىلونى دېيىلىدۇ. مىسال: "
+"00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "بايت"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "كۆڭۈلدىكى"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "پەرۋا قىلما"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "ئاڭلىتىش"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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 this network when it is available"
-msgstr "مەزكۇر تورنى ئىشلەتكىلى بولىدىغان چاغدا، ئاپتوماتىك باغلانسۇن(_A)"
+msgid "Automatically connect to _VPN when using this connection"
+msgstr "مەزكۇر باغلىنىشنى ئىشلەتكەندە VPN غا ئاپتوماتىك باغلانسۇن(_V)"
 
 #: ../src/connection-editor/ce-page-general.ui.h:2
 msgid "All _users may connect to this network"
 msgstr "بارلىق ئىشلەتكۈچىلەر مەزكۇر تورغا باغلىنىشى مۇمكىن(_U)"
 
 #: ../src/connection-editor/ce-page-general.ui.h:3
-msgid "Firewall _zone:"
-msgstr "تورتوسۇق(Firewall) رايونى(_Z):"
+msgid "_Automatically connect to this network when it is available"
+msgstr "مەزكۇر تورنى ئىشلەتكىلى بولىدىغان چاغدا، ئاپتوماتىك باغلانسۇن(_A)"
 
 #: ../src/connection-editor/ce-page-general.ui.h:4
-msgid "Automatically connect to _VPN when using this connection"
-msgstr "مەزكۇر باغلىنىشنى ئىشلەتكەندە VPN غا ئاپتوماتىك باغلانسۇن(_V)"
+msgid "Firewall _zone:"
+msgstr "تورتوسۇق(Firewall) رايونى(_Z):"
 
 #: ../src/connection-editor/ce-page-infiniband.ui.h:1
 msgid "_Transport mode:"
@@ -1388,8 +1722,8 @@ msgstr "قولىدا تەڭشەلگەن DNS تەڭشەكلىرىنى ئاپتو�
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "قولدا"
 
@@ -1400,151 +1734,155 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "باشقا كومپيۇتېرلار بىلەن ھەمبەھىرلەنگەن"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "ئۇسۇل(_M):"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "ئادرېسلار"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 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 خېرىدار ئايرىغۇچنى ئىشلىتىش ئۈچۈن ئۇنى بۇ يەرگە كىرگۈزۈڭ."
+msgstr ""
+"DHCP خېرىدار ئايرىغۇچ تور باشقۇرغۇچىنىڭ كومپيۇتېرىڭىزنىڭ سەپلىمىسىنى "
+"ئۆزلەشتۈرۈشىگە ئىجازەت بەرگەن. DHCP خېرىدار ئايرىغۇچنى ئىشلىتىش ئۈچۈن ئۇنى "
+"بۇ يەرگە كىرگۈزۈڭ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
-msgstr "باش ماشىنىنىڭ ئاتلىرىنى يېشىشكە ئىشلىتىدىغان دائىرىلەر. بىردىن كۆپ دائىرىلەرنى پەش بىلەن ئايرىڭ."
+msgstr ""
+"باش ماشىنىنىڭ ئاتلىرىنى يېشىشكە ئىشلىتىدىغان دائىرىلەر. بىردىن كۆپ "
+"دائىرىلەرنى پەش بىلەن ئايرىڭ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:10
+#: ../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:307
+#: ../src/connection-editor/page-ip6.c:306
 msgid "S_earch domains:"
 msgstr "دائىرىلەرنى ئىزدە(_E):"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:298
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "DNS مۇلازىمېتىرلىرى(_D)؛"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
-msgstr "باش ماشىنىنىڭ ئاتلىرىنى يېشىشكە ئىشلىتىدىغان دائىرە مۇلازىمېتىر(DNS)نىڭ IP ئادرېسى. بىردىن كۆپ دائىرە مۇلازىمېتىر ئادرېسىنى پەش بىلەن ئايرىڭ."
+msgstr ""
+"باش ماشىنىنىڭ ئاتلىرىنى يېشىشكە ئىشلىتىدىغان دائىرە مۇلازىمېتىر(DNS)نىڭ IP "
+"ئادرېسى. بىردىن كۆپ دائىرە مۇلازىمېتىر ئادرېسىنى پەش بىلەن ئايرىڭ."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
-msgstr "ئۇيغۇنلاشقان IPv6 تورلىرىغا باغلانغان ۋاقىتتا، ئەگەر IPv4 سەپلەش مەغلۇپ بولۇپ IPv6 سەپلەش مۇۋەپپەقىيەتلىك بولسا باغلىنىشنى تاماملاشقا ئىجازەت بەر."
+msgstr ""
+"ئۇيغۇنلاشقان IPv6 تورلىرىغا باغلانغان ۋاقىتتا، ئەگەر IPv4 سەپلەش مەغلۇپ "
+"بولۇپ IPv6 سەپلەش مۇۋەپپەقىيەتلىك بولسا باغلىنىشنى تاماملاشقا ئىجازەت بەر."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "يېتەكلە(_R)…"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "ئىناۋەتسىز قىلىنغان"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 ""
+"باش ماشىنىنىڭ ئاتلىرىنى يېشىشكە ئىشلىتىدىغان دائىرە مۇلازىمېتىر(DNS)نىڭ IP "
+"ئادرېسى. بىردىن كۆپ دائىرە مۇلازىمېتىر ئادرېسىنى پەش بىلەن ئايرىڭ."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "IPv_4 ئادرېس بولسا ئاندىن بۇ سىم ئۇلاش تاماملىنىدۇ."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
-msgstr "ئۇيغۇنلاشقان IPv4 تورلىرىغا باغلانغان ۋاقىتتا، ئەگەر IPv6 سەپلەش مەغلۇپ بولۇپ IPv4  سەپلەش مۇۋەپپەقىيەتلىك بولسا باغلىنىشنى تاماملاشقا ئىجازەت بەر."
+msgstr ""
+"ئۇيغۇنلاشقان IPv4 تورلىرىغا باغلانغان ۋاقىتتا، ئەگەر IPv6 سەپلەش مەغلۇپ "
+"بولۇپ IPv4  سەپلەش مۇۋەپپەقىيەتلىك بولسا باغلىنىشنى تاماملاشقا ئىجازەت بەر."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "خالىغان"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "ئالدىن 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "ئالدىن 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "ئالدىن 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "پەقەت 4G (LTE) نى ئىشلەت"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "ئاساس"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "نومۇر(_M):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "ئالىي"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "APN(_A):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "تور ID (_E):"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "تىپى(_T):"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "ئۆزگەرت…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "ئەگەر ئائىلە تورى ئىشلىمىسە، كەزمە ئىشلىتىڭ."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "ئىمنى كۆرسەت(_W)"
 
@@ -1596,29 +1934,71 @@ msgstr "ئەكس سادا"
 msgid "Send PPP _echo packets"
 msgstr "PPPPP echo بوغچىلىرىنى يوللا(_E)"
 
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+#, fuzzy
+msgid "_Import team configuration from a file..."
+msgstr "ساقلانغان VPN سەپلىمىسىنى ئىمپورت قىل…"
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "كېپىللىك قىلىنغان باغلىنىش(_C)"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "ساقلانغان VPN سەپلىمىسىنى ئىمپورت قىل…"
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "ئاتا ئارايۈز(_P):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN ئارايۈز ئاتى(_N):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "كۇلونلانغان MAC ئادرېسى(_C):"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN كىملىكى(_I):"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "ئۈسكۈنە ئاتى+نومۇر"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\"+ نومۇر"
 
@@ -1635,396 +2015,463 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "قۇرۇلما"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "يوللاش كۈچى(_W):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "مېگابايت/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "سۈرئەت(_R):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "BSSID (_B):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "قانال(_H):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "دولقۇن(_D):"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "شەكىل(_O):"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "ئىجازەت بېرىلگەن تەكشۈرۈش ئۇسۇللىرى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "EAP(_E)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "كېڭەيتكىلى بولىدىغان تەكشۈرۈش كېلىشىمى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "PAP (_P)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "ئىم تەكشۈرۈش كېلىشىمى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "جەڭ ئېلان قىلىش قول ئېلىشىش تەكشۈرۈش كېلىشىمى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "MSCHAP (_M)"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "مىكروسوفت جەڭ ئېلان قىلىش قول ئېلىشىش تەكشۈرۈش كېلىشىمى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "مىكروسوفت جەڭ ئېلان قىلىش قول ئېلىشىش تەكشۈرۈش كېلىشىمى ئىككىنچى نەشرى"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
-msgstr "كۆپ ئەھۋالدا، تەمىنلىگۈچىنىڭ PPP مۇلازىمېتىرلىرى بارلىق تەكشۈرۈش ئۇسۇللىرىنى قوللايدۇ. ئەگەر باغلىنىش مەغلۇپ بولسا، بەزى قوللاش ئۇسۇللىرىنى تاقاپ سىناڭ."
-
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip4.c:928
-#: ../src/connection-editor/page-ip6.c:894
-msgid "Address"
-msgstr "ئادرېس"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/page-ip4.c:945
-msgid "Netmask"
-msgstr "تور ماسكىسى"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
-#: ../src/connection-editor/page-ip4.c:962
-#: ../src/connection-editor/page-ip6.c:928
-msgid "Gateway"
-msgstr "تور ئۆتكىلى"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:813
-#: ../src/connection-editor/ip6-routes-dialog.c:755
-msgid "Metric"
-msgstr "مېترىك"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip6.c:911
-msgid "Prefix"
-msgstr "ئالدى قوشۇلغۇچى"
+msgstr ""
+"كۆپ ئەھۋالدا، تەمىنلىگۈچىنىڭ PPP مۇلازىمېتىرلىرى بارلىق تەكشۈرۈش ئۇسۇللىرىنى "
+"قوللايدۇ. ئەگەر باغلىنىش مەغلۇپ بولسا، بەزى قوللاش ئۇسۇللىرىنى تاقاپ سىناڭ."
 
-#: ../src/connection-editor/new-connection.c:101
-#: ../src/connection-editor/page-ethernet.c:251
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "ئېفىر تورى"
 
-#: ../src/connection-editor/new-connection.c:107
-#: ../src/connection-editor/page-wifi.c:471 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:119
-#: ../src/connection-editor/page-wimax.c:134
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "كۆكچىش"
 
-#: ../src/connection-editor/new-connection.c:125
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:131
-#: ../src/connection-editor/page-infiniband.c:168
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:137
-#: ../src/connection-editor/page-bond.c:419 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:559
+#: ../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
 msgid "Bond"
 msgstr ""
 
-#: ../src/connection-editor/new-connection.c:143
-#: ../src/connection-editor/page-bridge.c:211
-#: ../src/libnm-gtk/nm-ui-utils.c:339 ../src/libnm-gtk/nm-ui-utils.c:561
+#: ../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
+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
 msgid "Bridge"
 msgstr "كۆۋرۈك"
 
-#: ../src/connection-editor/new-connection.c:149
-#: ../src/connection-editor/page-vlan.c:480 ../src/libnm-gtk/nm-ui-utils.c:341
-#: ../src/libnm-gtk/nm-ui-utils.c:563
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:162
-#: ../src/connection-editor/new-connection.c:302
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:252
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "قاتتىق دېتال"
 
-#: ../src/connection-editor/new-connection.c:272
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "مەۋھۇم"
 
-#: ../src/connection-editor/new-connection.c:340
-#: ../src/connection-editor/new-connection.c:342
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "ساقلانغان VPN سەپلىمىسىنى ئىمپورت قىل…"
 
-#: ../src/connection-editor/new-connection.c:371
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
-msgstr "باغلىنىش تەھرىرلىگۈچ سۆزلەشكۈسى نامەلۇم خاتالىق سەۋەبىدىن دەسلەپلەشتۈرۈلمىدى."
+msgstr ""
+"باغلىنىش تەھرىرلىگۈچ سۆزلەشكۈسى نامەلۇم خاتالىق سەۋەبىدىن دەسلەپلەشتۈرۈلمىدى."
 
-#: ../src/connection-editor/new-connection.c:380
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "يېڭى باغلىنىش قۇرالمىدى"
 
-#: ../src/connection-editor/new-connection.c:515
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "باغلىنىشنى ئۆچۈرۈش مەغلۇپ بولدى"
 
-#: ../src/connection-editor/new-connection.c:562
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "%s باغلىنىشنى ئۆچۈرۈشنى راستلا ئۆچۈرەمسىز؟"
 
-#: ../src/connection-editor/nm-connection-editor.c:118
+#: ../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
+msgid "Address"
+msgstr "ئادرېس"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "تور ماسكىسى"
+
+#: ../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
+msgid "Gateway"
+msgstr "تور ئۆتكىلى"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "مېترىك"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "ئالدى قوشۇلغۇچى"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "‹%s› نى تەھرىرلەۋاتىدۇ"
 
-#: ../src/connection-editor/nm-connection-editor.c:122
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "ئات قويۇلمىغان باغلىنىشنى تەھرىرلەۋاتىدۇ"
 
-#: ../src/connection-editor/nm-connection-editor.c:282
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "باغلىنىش ئاتى(_N):"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "تەھرىرلىگۈچنى دەسلەپلەشتۈرگەندە خاتالىق كۆرۈلدى"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "باغلىنىش قوشۇش مەغلۇپ بولدى"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
-msgstr "باغلىنىشنى تەھرىرلىگۈچ بەزى ئېھتىياجلىق مەنبەلەرنى تاپالمىدى(ui. ھۆججىتى تېپىلمىدى)."
+msgstr ""
+"باغلىنىشنى تەھرىرلىگۈچ بەزى ئېھتىياجلىق مەنبەلەرنى تاپالمىدى(ui. ھۆججىتى "
+"تېپىلمىدى)."
 
-#: ../src/connection-editor/nm-connection-editor.c:408
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "ساقلا(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:409
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "بۇ باغلىنىشقا قىلغان ھەرقانداق ئۆزگىرىشلەرنى ساقلا."
 
-#: ../src/connection-editor/nm-connection-editor.c:410
-msgid "_Save..."
-msgstr "ساقلا...(_S)"
-
-#: ../src/connection-editor/nm-connection-editor.c:411
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
-msgstr "بۇ ماشىنىدىكى بارلىق ئىشلەتكۈچىلەرنىڭ بۇ باغلىنىشنى ساقلىشى ئۈچۈن تەكشۈر."
+msgstr ""
+"بۇ ماشىنىدىكى بارلىق ئىشلەتكۈچىلەرنىڭ بۇ باغلىنىشنى ساقلىشى ئۈچۈن تەكشۈر."
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "باغلىنىشنى قۇرالمىدى"
 
-#: ../src/connection-editor/nm-connection-editor.c:427
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "باغلىنىشنى تەھرىرلىيەلمىدى"
 
-#: ../src/connection-editor/nm-connection-editor.c:429
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "باغلىنىشنى تەھرىرلەش سۆزلەشكۈسىنى قۇرۇشتا خاتالىق كۆرۈلدى."
 
-#: ../src/connection-editor/nm-connection-editor.c:536
-msgid "Error saving connection"
-msgstr "باغلىنىشلارنى ساقلاۋاتقاندا خاتالىق كۆرۈلدى"
-
-#: ../src/connection-editor/nm-connection-editor.c:537
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "خاسلىق ‹%s›/‹%s› ئىناۋەتسىز:%d"
-
-#: ../src/connection-editor/nm-connection-editor.c:631
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "تەھرىرلىگۈچنى دەسلەپلەشتۈرگەندە خاتالىق كۆرۈلدى"
 
-#: ../src/connection-editor/nm-connection-editor.c:952
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "باغلىنىش قوشۇش مەغلۇپ بولدى"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
+#: ../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
 msgid "Connection _name:"
 msgstr "باغلىنىش ئاتى(_N):"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "ئېكسپورت قىل(_E)…"
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "ھەرگىز"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "ھازىر"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d مىنۇت ئىلگىرى"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d سائەت ئىلگىرى"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d كۈن ئىلگىرى"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ئاي ئىلگىرى"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d ئاي بۇرۇن"
 
-#: ../src/connection-editor/nm-connection-list.c:631
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "ئاتى"
 
-#: ../src/connection-editor/nm-connection-list.c:644
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "ئاخىرقى قېتىم ئىشلەتكەن"
 
-#: ../src/connection-editor/nm-connection-list.c:686
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "تاللانغان باغلىنىشنى تەھرىرلەيدۇ"
 
-#: ../src/connection-editor/nm-connection-list.c:687
-msgid "_Edit..."
-msgstr "تەھرىر(_E) ..."
-
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "تاللانغان باغلىنىشنى تەھرىرلەش ئۈچۈن تەكشۈر"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "تاللانغان باغلىنىشنى ئۆچۈر"
 
-#: ../src/connection-editor/nm-connection-list.c:704
-msgid "_Delete..."
-msgstr "ئۆچۈر(_D)..."
-
-#: ../src/connection-editor/nm-connection-list.c:705
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "تاللانغان باغلىنىشنى ئۆچۈرۈش ئۈچۈن تەكشۈر"
 
-#: ../src/connection-editor/nm-connection-list.c:942
-msgid "Error creating connection"
-msgstr "باغلىنىش قۇرۇۋاتقاندا خاتالىق كۆرۈلدى"
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:943
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "«%s» دېگەن باغلىنىشنى قانداق قۇرۇشنى بىلمىدى"
 
-#: ../src/connection-editor/nm-connection-list.c:998
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "باغلىنىش قۇرۇۋاتقاندا خاتالىق كۆرۈلدى"
+
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "باغلىنىشنى تەھرىرلەۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: ../src/connection-editor/nm-connection-list.c:999
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "UUID ‹%s› نىڭ باغلانمىسىنى تاپالمىدى"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x بىخەتەرلىكى"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "802.1x بىخەتەرلىك ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-8021x-security.c:141
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "مەزكۇر باغلىنىش ئۈچۈن 802.1_X بىخەتەرلىكنى ئىشلەتسۇن"
 
-#: ../src/connection-editor/page-bond.c:422
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "ئېزېرنېت ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "كۆكچىش ئۈسكۈنىسى تېپىلمىدى."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Bond باغلىنىشى %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "كۆكچىش"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "ئېزېرنېت (Ethernet) تورى"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "سىمسىز(Wi-Fi) تورلار"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "bond ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-bond.c:561
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "بىرىنچى DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Bond باغلىنىشى %d"
 
-#: ../src/connection-editor/page-bridge.c:214
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "كۆۋرۈك ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-bridge.c:309
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "كۆۋرۈك باغلىنىش %d"
@@ -2032,935 +2479,1117 @@ msgstr "كۆۋرۈك باغلىنىش %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "كۆۋرۈك ئېغىز"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "كۆۋرۈك ئېغىز ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-dsl.c:143
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "DSL ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
+
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "DSL ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-dsl.c:235
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL باغلىنىشى %d"
 
-#: ../src/connection-editor/page-ethernet.c:90
-#: ../src/connection-editor/page-infiniband.c:74
-#: ../src/connection-editor/page-wifi.c:113
-#: ../src/connection-editor/page-wimax.c:70
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
-msgstr "بۇ تاللاش بۇ باغلىنىشنى بۇ يەرگە كىرگۈزگەن MAC ئادرېسى بېكىتكەن تور ئۈسكۈنىسىگە بەلگىلەيدۇ. مىسال: 00:11:22:33:44:55"
+"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 ئادرېسى بېكىتكەن تور "
+"ئۈسكۈنىسىگە بەلگىلەيدۇ. مىسال: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:253
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "ئېزېرنېت ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-ethernet.c:396
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "ئېفىر تورى"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "كۇلونلانغان MAC ئادرېس"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:57
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "كۆڭۈلدىكى"
 
-#: ../src/connection-editor/page-general.c:58
+#: ../src/connection-editor/page-general.c:52
 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:59
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "پروگرامما FirewallD ئىجرا قىلىنماپتۇ."
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "ئاساسلىق(General) ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-infiniband.c:171
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "InfiniBand ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-infiniband.c:263
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand باغلىنىشى %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "ئاپتوماتىك (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "پەقەت ئاپتوماتىك(VPN) ئادرېسلار"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "ئاپتوماتىك (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "پەقەت ئاپتوماتىك(PPP) ئادرېسلار"
+msgid "Automatic, addresses only"
+msgstr "پەقەت ئاپتوماتىك ئادرېسلار"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "ئاپتوماتىك(PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "پەقەت ئاپتوماتىك(PPPoE) ئادرېسلار"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "ئاپتوماتىك(DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "پەقەت ئاپتوماتىك(DHCP) ئادرېسلار"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "پەقەت Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "ئىناۋەتسىز قىلىنغان"
-
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:296
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "قوشۇمچە DNS مۇلازىمېتىرلار(_V):"
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:305
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "باشقا ئىزدەيدىغان دائىرىلەر(_E):"
 
-#: ../src/connection-editor/page-ip4.c:860
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "%s نىڭ IPv4 routes نى تەھرىرلەۋاتىدۇ"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 تەڭشەكلىرى"
 
-#: ../src/connection-editor/page-ip4.c:1013
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "پەقەت ئاپتوماتىك ئادرېسلار"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:281
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "پەرۋا قىلما"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "ئاپتوماتىك، پەقەت DHCP"
 
-#: ../src/connection-editor/page-ip6.c:826
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "%s نىڭ IPv6 routes نى تەھرىرلەۋاتىدۇ"
 
-#: ../src/connection-editor/page-ip6.c:975
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 تەڭشەكلىرى"
 
-#: ../src/connection-editor/page-ip6.c:977
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-master.c:290
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
 #, c-format
 msgid "%s slave %d"
 msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:391
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "كۆچمە كەڭ بەلۋاغ ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-mobile.c:408
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "ئىشلەتكىلى بولمايدىغان كۆچمە باغلىنىش تىپى."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:658
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "كۆچمە كەڭ بەلۋاغ تەمىنلىگۈچى تىپىنى تاللا"
 
-#: ../src/connection-editor/page-mobile.c:693
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
-msgstr "كۆچمە كەڭ بەلۋاغ تەمىنلىگۈچىڭىز قوللانغان تېخنىكىنى تاللاڭ. جەزم قىلالمىسىڭىز، تەمىنلىگۈچىڭىزدىن سوراڭ."
+msgstr ""
+"كۆچمە كەڭ بەلۋاغ تەمىنلىگۈچىڭىز قوللانغان تېخنىكىنى تاللاڭ. جەزم "
+"قىلالمىسىڭىز، تەمىنلىگۈچىڭىزدىن سوراڭ."
 
-#: ../src/connection-editor/page-mobile.c:698
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
-msgstr "تەمىنلىگۈچىم G_SM-ئاساسىي تېخنىكىسىنى ئىشلىتىدۇ(i.e.GPRS، EDGE، UMTS، HSPA)"
+msgstr ""
+"تەمىنلىگۈچىم G_SM-ئاساسىي تېخنىكىسىنى ئىشلىتىدۇ(i.e.GPRS، EDGE، UMTS، HSPA)"
 
-#: ../src/connection-editor/page-mobile.c:705
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "تەمىنلىگۈچىم C_DMA -ئاساسىدىكى تېخنىكىنى ئىشلىتىدۇ(1xRTT، EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:715 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:718 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:266
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "يوق"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:284
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP تەڭشەكلىرى"
 
-#: ../src/connection-editor/page-ppp.c:286
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "PPP ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-vlan.c:482
+#: ../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 "ئىمپورت قىلىدىغان ھۆججەتنى تاللا"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "vlan ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "DSL باغلىنىشى %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+#, fuzzy
+msgid "Team Port"
+msgstr "كۆۋرۈك ئېغىز"
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "تور باغلىنىشى يوق"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "vlan ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-vlan.c:678
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN باغلىنىشى %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "VPN ئىشلەتكۈچى ئارايۈزنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "‹%s› ئۈچۈن VPN قىستۇرما مۇلازىمەت تاپالمايدۇ."
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN باغلىنىشى %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
 "Error: no VPN service type."
-msgstr "ۋ پ ن(VPN)  قىستۇرمىسى VPN باغلىنىشىنى توغرا ئىمپورت قىلالمىدى.\n"
+msgstr ""
+"ۋ پ ن(VPN)  قىستۇرمىسى VPN باغلىنىشىنى توغرا ئىمپورت قىلالمىدى.\n"
 "\n"
 "خاتالىق: VPN مۇلازىمەت تىپى يوق."
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "بىر VPN باغلىنىش تىپى تاللا"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 قىستۇرمىسىنى ئورۇنلاشتۇرمىغان بۆلىشىڭىز مۇمكىن."
+msgstr ""
+"سىز ئىشلىتىشنى ئىستەيدىغان يېڭى باغلىنىش ئۈچۈن VPN تىپىنى تاللاڭ. ئەگەر سىز "
+"قۇرۇشنى ئىستەيدىغان VPN باغلىنىش تىپى تىزىملىكتە بولمىسا، سىز بەلكىم توغرا "
+"VPN قىستۇرمىسىنى ئورۇنلاشتۇرمىغان بۆلىشىڭىز مۇمكىن."
 
-#: ../src/connection-editor/page-wifi.c:98
+#: ../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 "بۇ تاللاش بۇ باغلىنىشنى بۇ يەرگە كىرگۈزگەن BSSID بېكىتكەن سىمسىز(Wi-Fi) زىيارەت نۇقتىسى(AP)گە بەلگىلەيدۇ. مىسال: 00:11:22:33:44:55"
+msgstr ""
+"بۇ تاللاش بۇ باغلىنىشنى بۇ يەرگە كىرگۈزگەن BSSID بېكىتكەن سىمسىز(Wi-Fi) "
+"زىيارەت نۇقتىسى(AP)گە بەلگىلەيدۇ. مىسال: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:190
-#: ../src/connection-editor/page-wifi.c:194
-#: ../src/connection-editor/page-wifi.c:215
-#, c-format
-msgid "default"
-msgstr "كۆڭۈلدىكى"
+#: ../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)\""
+msgstr ""
+"بۇ تاللاش بۇ باغلىنىشنى بۇ يەرگە كىرگۈزگەن MAC ئادرېسى بېكىتكەن تور "
+"ئۈسكۈنىسىگە بەلگىلەيدۇ. مىسال: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:219
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:473
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "سىمسىز تور(Wi-Fi) ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-wifi.c:650
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "ھەرقانداق بىر ئۈسكۈنە"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "سىمسىز تور(Wi-Fi) باغلىنىشى %d"
 
-#: ../src/connection-editor/page-wifi-security.c:265
-msgctxt "Wi-Fi/Ethernet security"
-msgid "None"
-msgstr "يوق"
-
-#: ../src/connection-editor/page-wifi-security.c:290
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:300
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 بىتلىق شىفىر"
 
-#: ../src/connection-editor/page-wifi-security.c:326
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "دىنامىكىلىق WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:340
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA ۋە WPA2 كىشىلىك نۇسخىسى"
 
-#: ../src/connection-editor/page-wifi-security.c:354
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA ۋە WPA2 كارخانا نۇسخىسى"
 
-#: ../src/connection-editor/page-wifi-security.c:396
+#: ../src/connection-editor/page-wifi-security.c:413
 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:407
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "سىمسىز تور(Wi-Fi) بىخەتەرلىكى"
 
-#: ../src/connection-editor/page-wifi-security.c:409
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "سىمسىز تور(Wi-Fi) بىخەتەرلىك ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
 
-#: ../src/connection-editor/page-wimax.c:137
-msgid "Could not load WiMAX user interface."
-msgstr "WiMAX ئىشلەتكۈچى ئارايۈزىنى ئوقۇغىلى بولمىدى."
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:233
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX باغلىنىشى %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:207
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "VPN باغلىنىشىنى ئىمپورت قىلالمىدى"
 
-#: ../src/connection-editor/vpn-helpers.c:209
+#: ../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 "‹%s› ھۆججىتىنى ئوقۇيالمىدى ياكى تونۇلغان VPN باغلىنىش ئۇچۇرىنى ئۆز ئىچىگە ئالمىغان\n"
+msgstr ""
+"‹%s› ھۆججىتىنى ئوقۇيالمىدى ياكى تونۇلغان VPN باغلىنىش ئۇچۇرىنى ئۆز ئىچىگە "
+"ئالمىغان\n"
 "\n"
 "خاتالىق: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:241
-msgid "Select file to import"
-msgstr "ئىمپورت قىلىدىغان ھۆججەتنى تاللا"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "نامەلۇم خاتالىق"
 
-#: ../src/connection-editor/vpn-helpers.c:292
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "«%s» ئاتلىق بىر ھۆججەت ئەزەلدىن مەۋجۇت."
 
-#: ../src/connection-editor/vpn-helpers.c:294
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "ئالماشتۇر(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:296
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:332
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "ۋ پ ن (VPN)  باغلىنىشىنى ئېكسپورت قىلغىلى بولمىدى"
 
-#: ../src/connection-editor/vpn-helpers.c:334
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
 "\n"
 "Error: %s."
-msgstr "ۋ پ ن(VPN) باغلىنىشى ‹%s› نى %s گە ئېكسپورت قىلغىلى بولمىدى.\n"
+msgstr ""
+"ۋ پ ن(VPN) باغلىنىشى ‹%s› نى %s گە ئېكسپورت قىلغىلى بولمىدى.\n"
 "\n"
 "خاتالىق: %s"
 
-#: ../src/connection-editor/vpn-helpers.c:369
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "ۋ پ ن (VPN)  باغلىنىشىنى ئېكسپورت قىل..."
 
-#: ../src/ethernet-dialog.c:91 ../src/ethernet-dialog.c:99
+#: ../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 "تور باشقۇرغۇچ قوللانچاق بەزى ئېھتىياجلىق مەنبەلەرنى تاپالمىدى(ui. ھۆججىتى تېپىلمىدى)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "كۆكچىش سەپلىمىلىرىنى ئىشلەتكىلى بولمىدى(D-Bus كە باغلىنىش مەغلۇپ بولدى:(%s) %s)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "كۆكچىش سەپلىمىلىرىنى ئىشلەتكىلى بولمىدى(NetworkManagerنى ئىزدەۋاتقاندا خاتالىق كۆرۈلدى:(%s) %s)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:445
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "يانفونىڭىزنى بىر تور ئۈسكۈنىسى قىلىپ ئىشلىتىڭ(PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:454
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "يانفونىڭىزنى ئىشلىتىپ ئىنتېرنېتنى زىيارەت قىلىڭ(DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:336
-#, c-format
-msgid "Error: %s"
-msgstr "خاتالىق: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:443
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "DUN باغلىنىشىنى قۇرۇش مەغلۇپ بولدى: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:445
-#: ../src/gnome-bluetooth/nma-bt-device.c:959
-msgid "Your phone is now ready to use!"
-msgstr "تېلېفونىڭىز ئىشلىتىشكە ھازىرلاندى!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:468
-msgid "Mobile wizard was canceled"
-msgstr "كۆچمە يېتەكلىگۈچى بىكار قىلىندى"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:477
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "نامەلۇم تېلېفون ئۈسكۈنىسى تىپى( GSM ياكى CDMA ئەمەس)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:513
-msgid "unknown modem type."
-msgstr "مودېمنىڭ تىپى نامەلۇم."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:733
-#: ../src/gnome-bluetooth/nma-bt-device.c:739
-msgid "failed to connect to the phone."
-msgstr "تېلېفونغا باغلىنىش مەغلۇپ بولدى."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:770
-msgid "unexpectedly disconnected from the phone."
-msgstr "تېلېفون ئارقىلىق باغلىنىش تاسادىپىي ئۈزۈلدى."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:780
-msgid "timed out detecting phone details."
-msgstr "تېلېفون تەپسىلاتىنى تەكشۈرۈۋاتقاندا ۋاقىت چەكلىمىدىن ئاشتى."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:791
-msgid "Detecting phone configuration..."
-msgstr "تېلېفون سەپلىمىسىنى تەكشۈرۈۋاتىدۇ..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:823
-msgid "error getting bus connection"
-msgstr "باش لىنىيە باغلىنىشىنى ئوقۇشتا خاتالىق كۆرۈلدى"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:920
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr "تېلېفون تورىغا باغلىنىشنى تەڭشەشتىن ئىلگىرى كۆڭۈلدىكى كۆكچىش ماسلاشتۇرغۇچنى قوزغىتىشىڭىز زۆرۈر."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "PAN باغلىنىشىنى قۇرۇش مەغلۇپ بولدى: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:978
-#, c-format
-msgid "%s Network"
-msgstr "%s تورى"
-
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "بۇ ئۈسكۈنىنى ئاپتوماتىك قۇلۇپسىزلا"
+msgstr ""
+"تور باشقۇرغۇچ قوللانچاق بەزى ئېھتىياجلىق مەنبەلەرنى تاپالمىدى(ui. ھۆججىتى "
+"تېپىلمىدى)."
 
 #: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "قۇلۇپسىزلا(_U)"
 
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "بۇ ئۈسكۈنىنى ئاپتوماتىك قۇلۇپسىزلا"
+
 #: ../src/info.ui.h:1
 msgid "Connection Information"
 msgstr "باغلىنىش ئۇچۇرلىرى"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "ئاكتىپ تور باغلىنىشلىرى"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:208
+#: ../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/libnm-gtk/nm-mobile-wizard.c:215
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "ئۈسكۈنىڭىز:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:226
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "تەمىنلىگۈچىڭىز:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:237
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "پىلانىڭىز:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:262
+#: ../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 "تاللىغان تەڭشەكلەر بويىچە كۆچمە كەڭ بەلۋاغ تەمىنلىگۈچىڭىزگە بارىدىغان بىر باغلىنىشنى قۇرىدۇ. ئەگەر باغلىنىش مەغلۇپ بولسا ياكى تور بايلىقلىرىنى زىيارەت قىلالمىسىڭىز، تەڭشەكلىرىڭىزنى قوش چېكىڭ. كۆچمە كەڭ بەلۋاغ باغلىنىشىڭىزنىڭ تەڭشەكلىرىنى ئۆزگەرتىش ئۈچۈن \"سىستېما››\" تاللاش ئىقتىدار تىزىملىكىدىن \"تور باغلىنىشلىرى\" نى تاللاڭ."
+msgstr ""
+"تاللىغان تەڭشەكلەر بويىچە كۆچمە كەڭ بەلۋاغ تەمىنلىگۈچىڭىزگە بارىدىغان بىر "
+"باغلىنىشنى قۇرىدۇ. ئەگەر باغلىنىش مەغلۇپ بولسا ياكى تور بايلىقلىرىنى زىيارەت "
+"قىلالمىسىڭىز، تەڭشەكلىرىڭىزنى قوش چېكىڭ. كۆچمە كەڭ بەلۋاغ باغلىنىشىڭىزنىڭ "
+"تەڭشەكلىرىنى ئۆزگەرتىش ئۈچۈن \"سىستېما››\" تاللاش ئىقتىدار تىزىملىكىدىن "
+"\"تور باغلىنىشلىرى\" نى تاللاڭ."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:274
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "كۆچمە كەڭ بەلۋاغ تەڭشەكلىرىنى جەزملە"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:338
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "تىزىملانمىغان"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:493
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "پىلانىڭىزنى تاللاڭ(_S):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:517
+#: ../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/libnm-gtk/nm-mobile-wizard.c:541
+#: ../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"
+msgstr ""
+"ئاگاھلاندۇرۇش: ناتوغرا بىر پىلاننى تاللاش كەڭ بەلۋاغ ھېسابات ھەق تۆلەش "
+"مەسىلىسى ياكى باغلىنالماسلىقنى كەلتۈرۈپ چىقىرىشى مۇمكىن.\n"
 "\n"
 "پىلانىڭىزنى جەزم قىلالمىسىڭىز تەمىنلىگۈچىڭىزدىن پىلانىڭىزنىڭ APN ئىنى سوراڭ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:548
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "ھەق تۆلەش پىلانىڭىزنى كىرگۈزۈڭ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:597
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "پىلانىم تىزىملىكتە يوق..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "تەمىنلىگۈچى"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:792
+#: ../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/libnm-gtk/nm-mobile-wizard.c:803
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "تەمىنلىگۈچى:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:827
+#: ../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/libnm-gtk/nm-mobile-wizard.c:833
+#: ../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/libnm-gtk/nm-mobile-wizard.c:844
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "تەمىنلىگۈچىڭىزنى تاللاڭ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "دۆلەت ياكى رايون تىزىملىكى:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1113
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "دۆلەت ياكى رايون"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1123
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "دۆلىتىم تىزىملانماپتۇ"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1173
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1227
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "ئورۇنلاشتۇرۇلغان GSM ئۈسكۈنىسى"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1230
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "ئورۇنلاشتۇرۇلغان CDMA ئۈسكۈنىسى"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1402
+#: ../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 "بۇ ياردەمچى پروگرامما كۆچمە تېلېفون تورى(3G) نى قۇلايلىق تەڭشەپ كۆچمە كەڭ بەلۋاغقا باغلىنىشقا ياردەم قىلىدۇ."
+msgstr ""
+"بۇ ياردەمچى پروگرامما كۆچمە تېلېفون تورى(3G) نى قۇلايلىق تەڭشەپ كۆچمە كەڭ "
+"بەلۋاغقا باغلىنىشقا ياردەم قىلىدۇ."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "ئاستىدىكى ئۇچۇرلارغا ئېھتىياجىڭىز چۈشىدۇ:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1422
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "كەڭ بەلۋاغ تەمىنلىگۈچىڭىزنىڭ ئاتى"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "كەڭ بەلۋاغ ھەق تۆلەش پىلانىڭىز ئاتى"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../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(زىيارەت نۇقتا ئاتى) ئى"
+msgstr ""
+"(بەزى ئەھۋالدا) كەڭ بەلۋاغ ھەق تۆلەش پىلانىڭىزنىڭ APN(زىيارەت نۇقتا ئاتى) ئى"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1461
+#: ../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 "بۇ كۆچمە كەڭ بەلۋاغ ئۈسكۈنىسى ئۈچۈن بىر باغلىنىش قۇر(_T):"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1476
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "ھەرقانداق بىر ئۈسكۈنە"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1489
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشىنى سەپلە"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1662
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "يېڭى كۆچمە كەڭ بەلۋاغ باغلىنىشى"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:370
-msgid "Wired"
-msgstr "سىملىق"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "كۆكچىش"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:343
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:405
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "ئىم(_P):"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:407
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "ئىم(_P):"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%$2s (%$1s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:483 ../src/libnm-gtk/nm-ui-utils.c:503
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %s"
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "ئىمنى كۆرسەت(_W)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:437
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "يېڭى…"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1052
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "يوق"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "قۇر(_R)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1136
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
-msgstr "سىمسىز(Wi-Fi) تور ‹%s› نى زىيارەت قىلىش ئۈچۈن ئىم ياكى شىفىرلاش ئاچقۇچى زۆرۈردۇر."
+msgstr ""
+"سىمسىز(Wi-Fi) تور ‹%s› نى زىيارەت قىلىش ئۈچۈن ئىم ياكى شىفىرلاش ئاچقۇچى "
+"زۆرۈردۇر."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1138
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "سىمسىز(Wi-Fi) تور كىملىك دەلىللەش زۆرۈر"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1140
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "سىمسىز(Wi-Fi) تور كىملىك دەلىللەشنى تەلەپ قىلدى"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1145
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "يېڭى سىمسىز(Wi-Fi) تور قۇرۇش"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "يېڭى سىمسىز(Wi-Fi) تور"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1148
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "قۇرماقچى بولغان سىمسىز(Wi-Fi) تورنىڭ ئاتىنى كىرگۈزۈڭ."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1150
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تورغا باغلىنىش"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "يوشۇرۇن سىمسىز(Wi-Fi) تور"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1153
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
-msgstr "باغلانماقچى بولغان يوشۇرۇن سىمسىز تورنىڭ ئاتى ۋە بىخەتەرلىك تەپسىلاتلىرىنى كىرگۈزۈڭ."
+msgstr ""
+"باغلانماقچى بولغان يوشۇرۇن سىمسىز تورنىڭ ئاتى ۋە بىخەتەرلىك تەپسىلاتلىرىنى "
+"كىرگۈزۈڭ."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "سىمسىز(Wi-Fi) تور بىخەتەرلىكى:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "باغلىنىش(_O):"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "سىمسىز(Wi-Fi) تور كارتىسى(_A):"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "ئىشلىتىش ئۇسۇلى:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
-msgstr "بۇ پروگرامما NetworkManager پروگراممىسىنىڭ بىر بۆلىكى(https://wiki.gnome.org/Projects/NetworkManager/)."
+msgstr ""
+"بۇ پروگرامما NetworkManager پروگراممىسىنىڭ بىر بۆلىكى(https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
-msgstr "ئۇ بۇيرۇق قۇر ئالماشتۇرۇش ئۈچۈن لايىھىلەنگەن بولماستىن، گىنوم ئۈستەلئۈستى مۇھىتىدا ئىجرا قىلىشقا ئۇيغۇنلاشتۇرۇلغان."
+msgstr ""
+"ئۇ بۇيرۇق قۇر ئالماشتۇرۇش ئۈچۈن لايىھىلەنگەن بولماستىن، گىنوم ئۈستەلئۈستى "
+"مۇھىتىدا ئىجرا قىلىشقا ئۇيغۇنلاشتۇرۇلغان."
 
-#: ../src/mb-menu-item.c:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "قوزغىتىلمىغان"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "خەتلىتىلمىگەن"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "ئۆيدىكى تور (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "ئۆيدىكى تور"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "ئىزدەۋاتىدۇ"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "خەتلىتىش رەت قىلىندى"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (كېزىۋاتىدۇ)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "تورنى كېزىۋاتىدۇ (%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "تورنى كېزىۋاتىدۇ"
 
-#: ../src/mobile-helpers.c:297
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "SIM كارتىسى ‹%s› (‹%s› نىڭدىكى) نىڭ PIN كودى"
 
-#: ../src/mobile-helpers.c:471
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "PIN كودى ئېھتىياجلىق"
 
-#: ../src/mobile-helpers.c:479
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "كۆچمە كەڭ بەلۋاغ ئۈسكۈنىسى ئۈچۈن PIN كودى كېرەك"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "كۆچمە كەڭ بەلۋاغ باغلىنىشى ‹%s› ئاكتىپ:(%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "كەزمە"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s باغلىنىش"
 
-#: ../src/wireless-security/eap-method.c:275
-msgid "No Certificate Authority certificate chosen"
-msgstr "گۇۋاھنامە تارقاتقان ئورگان گۇۋاھنامىسىنى تاللىمىدى"
-
-#: ../src/wireless-security/eap-method.c:276
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue Wi-Fi networks.  Would you like to choose a Certificate "
-"Authority certificate?"
-msgstr "تەكشۈرۈش مەركىزى(CA)نىڭ گۇۋاھنامىسىنى ئىشلەتمەسلىك بىخەتەر بولمىغان، مۈجمەل سىمسىز تورغا(Wi-Fi) باغلاپ قويۇشى مۇمكىن. تەكشۈرۈش مەركىزىنىڭ گۇۋاھنامىسىنى تاللاشنى ئىستەمسىز؟"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:285
-msgid "Choose CA Certificate"
-msgstr "CA گۇۋاھنامىسى تاللا"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:645
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:648
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER ياكى PEM گۇۋاھنامىسى(der.*، pem.*، crt.*، cer.*)"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:399
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "PAC ھۆججىتىنى تاللاڭ…"
 
-#: ../src/wireless-security/eap-method-fast.c:406
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC ھۆججەتلىرى(*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:410
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "ھەممە ھۆججەتلەر"
 
@@ -2987,8 +3616,8 @@ msgid "PAC _file:"
 msgstr "PAC ھۆججىتى(_F):"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "ئىچكى ئىسپات"
 
@@ -2996,14 +3625,32 @@ msgstr "ئىچكى ئىسپات"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "ئاپتوماتىك PAC تەمىنلەش"
 
-#: ../src/wireless-security/eap-method-peap.c:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:434
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "بىر گۇۋاھنامە تەكشۈرۈش گۇۋاھنامىسى تاللا..."
 
@@ -3021,32 +3668,73 @@ msgstr "نەشرى 1"
 msgid "C_A certificate:"
 msgstr "C_A گۇۋاھنامىسى:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "CA گۇۋاھنامىسىگە پەرۋا قىلما"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "PEAP نەشرى(_V):"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "بۇ ئىمنى ھەر ۋاقىت سورىسۇن(_K)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:260
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A گۇۋاھنامىسى:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "شىفىرلانمىغان شەخسىي ئاچقۇچلار بىخەتەر ئەمەس"
 
-#: ../src/wireless-security/eap-method-tls.c:263
+#: ../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)"
-msgstr "تاللىغان شەخسىي ئاچقۇچ بىر ئىم تەرىپىدىن قوغدالمىغاندەك قىلىدۇ. بۇ سىزنىڭ بىخەتەرلىك ئىسپاتنامىڭىزگە تەسىر قىلىدۇ. بىر ئىم تاللاپ شەخسىي ئاچقۇچىڭىزنى قوغداڭ.(شەخسىي ئاچقۇچىڭىزنى openssl ئارقىلىق ئىملىق قوغدىيالايسىز)"
+msgstr ""
+"تاللىغان شەخسىي ئاچقۇچ بىر ئىم تەرىپىدىن قوغدالمىغاندەك قىلىدۇ. بۇ سىزنىڭ "
+"بىخەتەرلىك ئىسپاتنامىڭىزگە تەسىر قىلىدۇ. بىر ئىم تاللاپ شەخسىي ئاچقۇچىڭىزنى "
+"قوغداڭ.(شەخسىي ئاچقۇچىڭىزنى openssl ئارقىلىق ئىملىق قوغدىيالايسىز)"
 
-#: ../src/wireless-security/eap-method-tls.c:428
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "خۇسۇسىي گۇۋاھنامىڭىزنى تاللاڭ..."
 
-#: ../src/wireless-security/eap-method-tls.c:440
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "شەخسىي ئاچقۇچىڭىزنى تاللاڭ:"
 
@@ -3058,27 +3746,44 @@ msgstr "كىملىك(_I):"
 msgid "_User certificate:"
 msgstr "ئىشلەتكۈچى گۇۋاھنامىسى(_U):"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "شەخسىي ئاچقۇچ(_K)"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "شەخسىي ئاچقۇچ ئىمى(_P):"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "تونىل TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "قوغدىلىدىغان EAP (PEAP)"
 
@@ -3088,29 +3793,55 @@ msgstr "قوغدىلىدىغان EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "كىملىك دەلىللەش(_T):"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "ئوچۇق سىستېما"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "ھەمبەھىرلەنگەن ئاچقۇچ"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:4
-msgid "2"
-msgstr "2"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "3"
+msgid "Open System"
+msgstr "ئوچۇق سىستېما"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "4"
+msgid "Shared Key"
+msgstr "ھەمبەھىرلەنگەن ئاچقۇچ"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -3124,6 +3855,227 @@ msgstr "ئاچقۇچنى كۆرسەت(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP ئىندېكسى(_X):"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "تىپى(_T):"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "WiMAX كۆچمە كەڭ بەلۋاغنى ئىناۋەتلىك قىل(_X)"
+
+#~ msgid "_Help"
+#~ msgstr "ياردەم(_H)"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "يېڭى كۆچمە كەڭ بەلۋاغ(CDMA) باغلىنىشى..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "ھازىر CDMA تورىغا باغلاندىڭىز."
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA تورى."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "يېڭى كۆچمە كەڭ بەلۋاغ(GSM) باغلىنىشى..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "ھازىر GSM تورىغا باغلاندىڭىز."
+
+#~ msgid "GSM network."
+#~ msgstr "GSM تورى."
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX كۆچمە كەڭ بەلۋاغ(%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX كۆچمە كەڭ بەلۋاغ"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX چەكلەنگەن"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX قاتتىق دېتال ئۈزچاتى تەرىپىدىن چەكلەنگەن"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "ھازىر WiMAX تورىغا باغلاندىڭىز."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "نامەلۇم"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "نامەلۇم"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "ئىككىنچى DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "ئۈچىنچى DNS:"
+
+#~ msgid "_Mode:"
+#~ msgstr "ھالەت(_M):"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "ئۈسكۈنە MAC ئادرېسى(_D):"
+
+#~ msgid "Any"
+#~ msgstr "خالىغان"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "ئالدىن 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "ئالدىن 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "ئالدىن 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "پەقەت 4G (LTE) نى ئىشلەت"
+
+#~ msgid "Infrastructure"
+#~ msgstr "قۇرۇلما"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "_Save..."
+#~ msgstr "ساقلا...(_S)"
+
+#~ msgid "Error saving connection"
+#~ msgstr "باغلىنىشلارنى ساقلاۋاتقاندا خاتالىق كۆرۈلدى"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "خاسلىق ‹%s›/‹%s› ئىناۋەتسىز:%d"
+
+#~ msgid "_Edit..."
+#~ msgstr "تەھرىر(_E) ..."
+
+#~ msgid "_Delete..."
+#~ msgstr "ئۆچۈر(_D)..."
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "ئاپتوماتىك (PPP)"
+
+#~ 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)."
+#~ msgstr ""
+#~ "كۆكچىش سەپلىمىلىرىنى ئىشلەتكىلى بولمىدى(D-Bus كە باغلىنىش مەغلۇپ بولدى:"
+#~ "(%s) %s)"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "كۆكچىش سەپلىمىلىرىنى ئىشلەتكىلى بولمىدى(NetworkManagerنى ئىزدەۋاتقاندا "
+#~ "خاتالىق كۆرۈلدى:(%s) %s)"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "يانفونىڭىزنى بىر تور ئۈسكۈنىسى قىلىپ ئىشلىتىڭ(PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "يانفونىڭىزنى ئىشلىتىپ ئىنتېرنېتنى زىيارەت قىلىڭ(DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "خاتالىق: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "DUN باغلىنىشىنى قۇرۇش مەغلۇپ بولدى: %s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "تېلېفونىڭىز ئىشلىتىشكە ھازىرلاندى!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "كۆچمە يېتەكلىگۈچى بىكار قىلىندى"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "نامەلۇم تېلېفون ئۈسكۈنىسى تىپى( GSM ياكى CDMA ئەمەس)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "مودېمنىڭ تىپى نامەلۇم."
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "تېلېفونغا باغلىنىش مەغلۇپ بولدى."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "تېلېفون ئارقىلىق باغلىنىش تاسادىپىي ئۈزۈلدى."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "تېلېفون تەپسىلاتىنى تەكشۈرۈۋاتقاندا ۋاقىت چەكلىمىدىن ئاشتى."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "تېلېفون سەپلىمىسىنى تەكشۈرۈۋاتىدۇ..."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "باش لىنىيە باغلىنىشىنى ئوقۇشتا خاتالىق كۆرۈلدى"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "تېلېفون تورىغا باغلىنىشنى تەڭشەشتىن ئىلگىرى كۆڭۈلدىكى كۆكچىش "
+#~ "ماسلاشتۇرغۇچنى قوزغىتىشىڭىز زۆرۈر."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "PAN باغلىنىشىنى قۇرۇش مەغلۇپ بولدى: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s تورى"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "گۇۋاھنامە تارقاتقان ئورگان گۇۋاھنامىسىنى تاللىمىدى"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue Wi-Fi networks.  Would you like to choose "
+#~ "a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "تەكشۈرۈش مەركىزى(CA)نىڭ گۇۋاھنامىسىنى ئىشلەتمەسلىك بىخەتەر بولمىغان، "
+#~ "مۈجمەل سىمسىز تورغا(Wi-Fi) باغلاپ قويۇشى مۇمكىن. تەكشۈرۈش مەركىزىنىڭ "
+#~ "گۇۋاھنامىسىنى تاللاشنى ئىستەمسىز؟"
+
+#~ msgid "Choose CA Certificate"
+#~ msgstr "CA گۇۋاھنامىسى تاللا"
+
 #~ msgid "Wireless Networks (%s)"
 #~ msgstr "سىمسىز تورلار (%s)"
 
@@ -3196,9 +4148,6 @@ msgstr "WEP ئىندېكسى(_X):"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "«%s» دېگەن باغلىنىشنى قانداق تەھرىرلەشنى بىلمىدى"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "كۆكچىش ئۈسكۈنىسى تېپىلمىدى."
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr ""
 #~ "كۆكچىش سەپلىمىلىرىنى ئىشلەتكىلى بولمىدى(D-Bus ۋاكالەتچى قۇرۇش مەغلۇپ "
@@ -3213,9 +4162,6 @@ msgstr "WEP ئىندېكسى(_X):"
 #~ msgid "label"
 #~ msgstr "ئەن"
 
-#~ msgid "Network Manager"
-#~ msgstr "تور باشقۇرغۇچ"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "nm-applet نىڭ بىر ئۈلگىسى ئىجرا قىلىنىۋېتىپتۇ.\n"
 
diff --git a/po/uk.po b/po/uk.po
index d5db14d6..e2ac819c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-24 09:41+0200\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -15,11 +15,11 @@ 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%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"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"
 "X-Generator: Virtaal 0.7.1\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Мережа"
 
@@ -27,671 +27,905 @@ msgstr "Мережа"
 msgid "Manage your network connections"
 msgstr "Організуйте ваші мережеві з'єднання"
 
-#: ../nm-applet.schemas.in.h:1
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "Мережні з'єднання"
+
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "Керування параметрами мережних з'єднань"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "Вимкнути сповіщення про підключення"
 
-#: ../nm-applet.schemas.in.h:2
-msgid "Set this to TRUE to disable notifications when connecting to a network."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, fuzzy
+msgid "Set this to true to disable notifications when connecting to a network."
 msgstr "Встановіть у TRUE, для вимикання сповіщення про приєднання до мережі."
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
 msgid "Disable disconnected notifications"
 msgstr "Вимкнути сповіщення про відключення"
 
-#: ../nm-applet.schemas.in.h:4
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when disconnecting from a network."
+"Set this to true to disable notifications when disconnecting from a network."
 msgstr ""
 "Встановіть у TRUE, для вимикання сповіщення про від'єднання від мережі."
 
-#: ../nm-applet.schemas.in.h:5
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "Вимкнути сповіщення про підключення"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, 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
 msgid "Suppress networks available notifications"
 msgstr "Вимкнути сповіщення про доступні мережі"
 
-#: ../nm-applet.schemas.in.h:6
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+#, fuzzy
 msgid ""
-"Set this to TRUE to disable notifications when wireless networks are "
-"available."
+"Set this to true to disable notifications when Wi-Fi networks are available."
 msgstr ""
 "Встановіть у TRUE, для вимикання сповіщення про доступні бездротові мережі."
 
-#: ../nm-applet.schemas.in.h:7
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "Штамп"
 
-#: ../nm-applet.schemas.in.h:8
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
 msgid "Used to determine whether settings should be migrated to a new version."
 msgstr ""
 "Використовується для визначення параметрів, які мають бути перенесені у нову "
 "версію."
 
-#: ../nm-applet.schemas.in.h:9
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
 msgid "Disable WiFi Create"
 msgstr "Вимкнути створення з'єднання WiFi"
 
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
 msgid ""
-"Set to TRUE to disable creation of adhoc networks when using the applet."
+"Set to true to disable creation of adhoc networks when using the applet."
 msgstr ""
 "Встановіть у TRUE, для вимикання нестандартних мереж при використані аплету."
 
-#: ../nm-connection-editor.desktop.in.h:1
-#: ../src/connection-editor/nm-connection-editor.ui.h:1
-msgid "Network Connections"
-msgstr "Мережні з'єднання"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
 
-#: ../nm-connection-editor.desktop.in.h:2
-msgid "Manage and change your network connection settings"
-msgstr "Керування параметрами мережних з'єднань"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
 
-#: ../src/applet-device-bt.c:174 ../src/applet-device-cdma.c:399
-#: ../src/applet-device-gsm.c:446 ../src/applet-device-wired.c:240
-#: ../src/applet-device-wifi.c:864 ../src/applet-device-wimax.c:279
-msgid "Available"
-msgstr "Доступні"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "Виберіть сертифікат CA"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Менеджер мережі"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Менеджер мережі"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_З'єднати"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "_Назва мережі:"
+
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Спеціально"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+msgid "Failed to add/activate connection"
+msgstr "Не вдалося додати/встановити з'єднання"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr "Невідома помилка"
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+msgid "Connection failure"
+msgstr "Невдале з'єднання"
 
-#: ../src/applet-device-bt.c:200 ../src/applet-device-cdma.c:441
-#: ../src/applet-device-gsm.c:488 ../src/applet-device-wired.c:269
-#: ../src/applet-device-wimax.c:423
+#: ../src/applet.c:399
+msgid "Device disconnect failed"
+msgstr "Не вдалось від'єднати пристрій"
+
+#: ../src/applet.c:404
+msgid "Disconnect failure"
+msgstr "Не вдалося від'єднати"
+
+#: ../src/applet.c:434
+msgid "Connection activation failed"
+msgstr "Не вдалося встановити з'єднання"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "Більше не виводити це повідомлення"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "Ви приєднані до мережі «%s»."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"Неможливо встановити з'єднання VPN «%s»: з'єднання з мережею було перервано."
 
-#: ../src/applet-device-bt.c:204 ../src/applet-device-cdma.c:445
-#: ../src/applet-device-gsm.c:492 ../src/applet-device-wired.c:273
-#: ../src/applet-device-wifi.c:1268 ../src/applet-device-wimax.c:427
-msgid "Connection Established"
-msgstr "З'єднання встановлено"
+#: ../src/applet.c:847
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"Неможливо встановити з'єднання VPN «%s»: служба VPN несподівано завершилась."
 
-#: ../src/applet-device-bt.c:205
-msgid "You are now connected to the mobile broadband network."
-msgstr "Наразі ви приєднані до мобільної широкосмугової мережі."
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"Неможливо встановити з'єднання VPN «%s»: служба VPN повернула неправильну "
+"конфігурацію."
 
-#: ../src/applet-device-bt.c:231 ../src/applet-device-cdma.c:481
-#: ../src/applet-device-gsm.c:528 ../src/applet-device-wimax.c:464
+#: ../src/applet.c:853
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "Підготовка мобільного широкосмугового з'єднання «%s»..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"Неможливо встановити з'єднання VPN «%s»: вичерпано час очікування."
 
-#: ../src/applet-device-bt.c:234 ../src/applet-device-cdma.c:484
-#: ../src/applet-device-gsm.c:531 ../src/applet-device-wimax.c:467
+#: ../src/applet.c:856
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "Налаштовування мобільного широкосмугового з'єднання «%s»..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"Неможливо встановити з'єднання VPN «%s»: служба VPN не запустилась вчасно."
 
-#: ../src/applet-device-bt.c:237 ../src/applet-device-cdma.c:487
-#: ../src/applet-device-gsm.c:534 ../src/applet-device-wimax.c:470
+#: ../src/applet.c:859
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
 msgstr ""
-"Для мобільного широкосмугового з'єднання «%s» вимагається автентифікація..."
+"\n"
+"Неможливо встановити з'єднання VPN «%s»: неможливо запустити службу VPN."
 
-#: ../src/applet-device-bt.c:240 ../src/applet-device-cdma.c:490
-#: ../src/applet-device-gsm.c:537 ../src/applet-device-wimax.c:473
-#: ../src/applet.c:2503
+#: ../src/applet.c:862
 #, c-format
-msgid "Requesting a network address for '%s'..."
-msgstr "Отримання мережної адреси для «%s»..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"Неможливо встановити з'єднання VPN «%s»: неможливо знайти відповідний ключ "
+"для VPN."
 
-#: ../src/applet-device-bt.c:244 ../src/applet-device-cdma.c:508
-#: ../src/applet-device-gsm.c:555
+#: ../src/applet.c:865
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "Мобільне широкосмугове з'єднання «%s» встановлено"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"Неможливо встановити з'єднання VPN «%s»: неправильний ключ доступу до VPN."
 
-#: ../src/applet-device-cdma.c:184 ../src/connection-editor/page-mobile.c:696
-#: ../src/mb-menu-item.c:54
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"Неможливо встановити з'єднання VPN «%s»"
 
-#: ../src/applet-device-cdma.c:345 ../src/applet-device-gsm.c:392
-#: ../src/applet-dialogs.c:424
+#: ../src/applet.c:888
 #, c-format
-msgid "Mobile Broadband (%s)"
-msgstr "Мобільне широкосмугове (%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"З'єднання VPN «%s» розірвано, оскільки мережне з'єднання перервано."
 
-#: ../src/applet-device-cdma.c:347 ../src/applet-device-gsm.c:394
-#: ../src/connection-editor/page-mobile.c:379
-#: ../src/connection-editor/nm-connection-editor.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:1510
-msgid "Mobile Broadband"
-msgstr "Мобільні широкосмугові"
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"З'єднання VPN «%s» розірвано, оскільки було зупинено службу VPN."
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:412
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Нове мобільне широкосмугове з'єднання(CDMA)..."
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"З'єднання VPN «%s» розірвано."
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "Повідомлення входу VPN"
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "Збій з'єднання VPN"
 
-#: ../src/applet-device-cdma.c:446
-msgid "You are now connected to the CDMA network."
-msgstr "Ви приєднані до мережі CDMA."
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Неможливо встановити з'єднання VPN «%s»: не вдалось запустити службу VPN.\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:503 ../src/applet-device-gsm.c:550
-#: ../src/applet-device-wimax.c:482
+#: ../src/applet.c:993
 #, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "Мобільне широкосмугове з'єднання «%s» встановлено: (%d%%%s%s)"
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"Не вдалось запустити з'єднання VPN «%s».\n"
+"\n"
+"%s"
 
-#: ../src/applet-device-cdma.c:506 ../src/applet-device-gsm.c:553
-#: ../src/applet-device-wimax.c:485
-msgid "roaming"
-msgstr "роумінг"
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr "пристрій не готовий (відсутній мікрокод)"
 
-#: ../src/applet-device-cdma.c:647 ../src/applet-device-cdma.c:653
-msgid "CDMA network."
-msgstr "Мережа CDMA."
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "пристрій не готовий"
 
-#: ../src/applet-device-cdma.c:648 ../src/applet-device-gsm.c:1198
-msgid "You are now registered on the home network."
-msgstr "Ви тепер зареєстровані в домашній мережі."
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "з'єднання розірвано"
 
-#: ../src/applet-device-cdma.c:654 ../src/applet-device-gsm.c:1204
-msgid "You are now registered on a roaming network."
-msgstr "Ви тепер зареєстровані в роумінговій мережі."
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "Від'єднатися"
 
-#: ../src/applet-device-gsm.c:213 ../src/connection-editor/page-mobile.c:699
-#: ../src/mb-menu-item.c:59
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "пристрій не керується"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:459
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Нове мобільне широкосмугове з'єднання(GSM)..."
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "Немає доступних мережних пристроїв"
 
-#: ../src/applet-device-gsm.c:493
-msgid "You are now connected to the GSM network."
-msgstr "Ви приєднані до мережі GSM."
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "З'єднання _VPN"
 
-#: ../src/applet-device-gsm.c:654
-msgid "PIN code required"
-msgstr "Вимагається код PIN"
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "_Налаштувати VPN..."
 
-#: ../src/applet-device-gsm.c:662
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "Для використання мобільного широкосмугового пристрою потрібен код PIN"
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
+msgstr "_Від'єднати VPN..."
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "NetworkManager не запущено..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "Підтримку мережі вимкнено"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "_Мережа"
 
-#: ../src/applet-device-gsm.c:783
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "_Бездротова мережа"
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "Мобільне _широкосмугове з'єднання"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "Увімкнути _сповіщення"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "_Інформація про з'єднання"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "Змінити з'єднання..."
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_Про програму"
+
+#: ../src/applet.c:2179
 #, c-format
-msgid "PIN code for SIM card '%s' on '%s'"
-msgstr "Код PIN для картки SIM «%s» на «%s»"
+msgid "You are now connected to '%s'."
+msgstr "Ви приєднані до мережі «%s»."
 
-#: ../src/applet-device-gsm.c:875
-msgid "Wrong PIN code; please contact your provider."
-msgstr "Неправильний код PIN; зверніться до постачальника послуг."
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "З'єднання розірвано"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "Мережне з'єднання було розірвано."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Підготовка мережного з'єднання «%s»..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "Для мережного з'єднання «%s» вимагається автентифікація..."
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr "Отримання мережної адреси для «%s»..."
+
+#: ../src/applet.c:2483
+#, c-format
+msgid "Network connection '%s' active"
+msgstr "Мережне з'єднання «%s» встановлено"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "Запуск з'єднання VPN «%s»..."
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "Для з'єднання VPN «%s» вимагається автентифікація…"
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "Отримання адреси VPN для «%s»…"
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "З'єднання VPN «%s» установлено"
 
-#: ../src/applet-device-gsm.c:898
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "Немає з'єднання з мережею"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "Аплет NetworkManager"
+
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "Неправильний код PUK; зверніться до постачальника послуг."
 
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr "Неправильний код PIN; зверніться до постачальника послуг."
+
 #. Start the spinner to show the progress of the unlock
-#: ../src/applet-device-gsm.c:925
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Надсилається код розблокування..."
 
-#: ../src/applet-device-gsm.c:988
-msgid "SIM PIN unlock required"
-msgstr "Для розблокування SIM потрібен код PIN"
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr "Мобільне широкосмугове (%s)"
 
-#: ../src/applet-device-gsm.c:989
-msgid "SIM PIN Unlock Required"
-msgstr "Для розблокування SIM потрібен код PIN"
+#: ../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
+msgid "Mobile Broadband"
+msgstr "Мобільні широкосмугові"
 
-#. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-device-gsm.c:991
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PIN code before it can be "
-"used."
-msgstr ""
-"Для роботи мобільного широкосмугового пристрою «%s» потрібен код PIN SIM."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Доступні"
 
-#. Translators: PIN code entry label
-#: ../src/applet-device-gsm.c:993
-msgid "PIN code:"
-msgstr "Код PIN:"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "Нове мобільне широкосмугове з'єднання"
 
-#. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-device-gsm.c:997
-msgid "Show PIN code"
-msgstr "Показати код PIN"
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "З'єднання встановлено"
 
-#: ../src/applet-device-gsm.c:1000
-msgid "SIM PUK unlock required"
-msgstr "Для розблокування SIM потрібен код PUK"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "Наразі ви приєднані до мобільної широкосмугової мережі."
 
-#: ../src/applet-device-gsm.c:1001
-msgid "SIM PUK Unlock Required"
-msgstr "Для розблокування SIM потрібен код PUK"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "Пароль мобільної широкосмугової мережі"
 
-#. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-device-gsm.c:1003
-#, c-format
-msgid ""
-"The mobile broadband device '%s' requires a SIM PUK code before it can be "
-"used."
-msgstr ""
-"Для роботи мобільного широкосмугового пристрою «%s» потрібен код SIM PUK."
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr "Ви тепер зареєстровані в домашній мережі."
 
-#. Translators: PUK code entry label
-#: ../src/applet-device-gsm.c:1005
-msgid "PUK code:"
-msgstr "Код PUK:"
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr "Ви тепер зареєстровані в роумінговій мережі."
 
-#. Translators: New PIN entry label
-#: ../src/applet-device-gsm.c:1008
-msgid "New PIN code:"
-msgstr "Новий код PIN:"
+#: ../src/applet-device-bt.c:88
+msgid "You are now connected to the mobile broadband network."
+msgstr "Наразі ви приєднані до мобільної широкосмугової мережі."
 
-#. Translators: New PIN verification entry label
-#: ../src/applet-device-gsm.c:1010
-msgid "Re-enter new PIN code:"
-msgstr "Введіть новий код PIN ще раз:"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "Підготовка мобільного широкосмугового з'єднання «%s»..."
 
-#. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-device-gsm.c:1015
-msgid "Show PIN/PUK codes"
-msgstr "Показати коди PIN/PUK"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "Налаштовування мобільного широкосмугового з'єднання «%s»..."
 
-#: ../src/applet-device-gsm.c:1197 ../src/applet-device-gsm.c:1203
-msgid "GSM network."
-msgstr "Мережа GSM."
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr ""
+"Для мобільного широкосмугового з'єднання «%s» вимагається автентифікація..."
 
-#: ../src/applet-device-wired.c:62
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "Мобільне широкосмугове з'єднання «%s» встановлено"
+
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet автоматично"
 
-#: ../src/applet-device-wired.c:205
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "Дротові мережі (%s)"
 
-#: ../src/applet-device-wired.c:207
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "Дротова мережа (%s)"
 
-#: ../src/applet-device-wired.c:210
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "Дротові мережі"
 
-#: ../src/applet-device-wired.c:212
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "Дротова мережа"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:232 ../src/applet.c:1509
-msgid "disconnected"
-msgstr "з'єднання розірвано"
-
-#: ../src/applet-device-wired.c:274
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "Ви приєднані до провідної мережі."
 
-#: ../src/applet-device-wired.c:300
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "Підготовка дротового мережного з'єднання «%s»..."
 
-#: ../src/applet-device-wired.c:303
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "Налаштовування дротового мережного з'єднання «%s»..."
 
-#: ../src/applet-device-wired.c:306
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "Для дротового мережного з'єднання «%s» вимагається автентифікація..."
 
-#: ../src/applet-device-wired.c:309
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "Отримання адреси у дротовій мережі для «%s»..."
 
-#: ../src/applet-device-wired.c:313
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "Дротове з'єднання «%s» встановлено"
 
-#: ../src/applet-device-wired.c:494
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Автентифікація DSL"
 
-#: ../src/applet-device-wifi.c:97
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "Приєднатися до _прихованої бездротової мережі..."
 
-#: ../src/applet-device-wifi.c:150
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "Створити _нову бездротову мережу..."
 
-#: ../src/applet-device-wifi.c:294
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(немає)"
 
-#: ../src/applet-device-wifi.c:792
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "Бездротові мережі (%s)"
-
-#: ../src/applet-device-wifi.c:794
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "Бездротова мережа (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Дротові мережі (%s)"
 
-#: ../src/applet-device-wifi.c:796
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "Бездротова мережа"
-msgstr[1] "Бездротові мережі"
-msgstr[2] "Бездротові мережі"
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Дротова мережа (%s)"
 
-#: ../src/applet-device-wifi.c:829
-msgid "wireless is disabled"
-msgstr "бездротову мержу вимкнено"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "Дротова мережа"
+msgstr[1] "Дротова мережа"
+msgstr[2] "Дротова мережа"
+
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
+msgstr "WiMAX вимкнено"
 
-#: ../src/applet-device-wifi.c:830
-msgid "wireless is disabled by hardware switch"
-msgstr "бездротову мержу вимкнено на апаратному рівні"
+#: ../src/applet-device-wifi.c:935
+#, fuzzy
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr "WiMAX вимкнено на апаратному рівні"
 
-#: ../src/applet-device-wifi.c:891
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Ще мережі"
 
-#: ../src/applet-device-wifi.c:1071
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "Доступні бездротові мережі"
 
-#: ../src/applet-device-wifi.c:1072
-msgid "Use the network menu to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "Використовувати меню мережі для підключення до бездротової мережі"
 
-#: ../src/applet-device-wifi.c:1075 ../src/applet.c:925
-msgid "Don't show this message again"
-msgstr "Більше не виводити це повідомлення"
-
-#: ../src/applet-device-wifi.c:1267
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, fuzzy, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "Ви приєднані до бездротової мережі «%s»."
 
-#: ../src/applet-device-wifi.c:1298
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "Підготовка бездротового мережного з'єднання з «%s»..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "Підготовка мережного з'єднання «%s»..."
 
-#: ../src/applet-device-wifi.c:1301
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "Налаштовування бездротового мережного з'єднання «%s»..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "Налаштовування дротового мережного з'єднання «%s»..."
 
-#: ../src/applet-device-wifi.c:1304
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr ""
 "Для бездротового мережного з'єднання «%s» вимагається автентифікація..."
 
-#: ../src/applet-device-wifi.c:1307
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "Отримання адреси у бездротовій мережі для «%s»..."
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "Отримання мережної адреси для «%s»..."
 
-#: ../src/applet-device-wifi.c:1328
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Бездротове мережне з'єднання «%s» встановлено: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1333
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "Бездротове мережне з'єднання «%s» встановлено"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Дротове з'єднання «%s» встановлено"
 
-#: ../src/applet-device-wifi.c:1381
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Не вдалося встановити з'єднання"
 
-#: ../src/applet-device-wifi.c:1383 ../src/applet-device-wifi.c:1402
-#: ../src/applet.c:491 ../src/applet.c:535 ../src/applet.c:561
-msgid "Unknown error"
-msgstr "Невідома помилка"
-
-#: ../src/applet-device-wifi.c:1386 ../src/applet-device-wifi.c:1405
-#: ../src/applet.c:494 ../src/applet.c:564
-msgid "Connection failure"
-msgstr "Невдале з'єднання"
-
-#: ../src/applet-device-wifi.c:1400
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Не вдалося додати нове з'єднання"
 
-#: ../src/applet-device-wimax.c:231
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "Мобільна радіомережа WiMAX (%s)"
-
-#: ../src/applet-device-wimax.c:233
-msgid "WiMAX Mobile Broadband"
-msgstr "Мобільна радіомережа WiMAX"
-
-#: ../src/applet-device-wimax.c:259
-msgid "WiMAX is disabled"
-msgstr "WiMAX вимкнено"
-
-#: ../src/applet-device-wimax.c:260
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX вимкнено на апаратному рівні"
-
-#: ../src/applet-device-wimax.c:428
-msgid "You are now connected to the WiMAX network."
-msgstr "Ви приєднані до мережі WiMAX."
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "Помилка при показі відомостей з'єднання: "
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wireless-security.c:313
-#: ../src/libnm-gtk/nm-wireless-dialog.c:948
-#: ../src/wireless-security/wireless-security.c:406
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "Динамічний WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:245
-#: ../src/applet-dialogs.c:247
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:243
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Адреси"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:251 ../src/applet-dialogs.c:260
-#: ../src/connection-editor/page-wireless-security.c:265
-#: ../src/libnm-gtk/nm-wireless-dialog.c:905
-msgctxt "Wifi/wired security"
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Без перевірки автентичності"
 
-#: ../src/applet-dialogs.c:277
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (типово)"
 
-#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:484
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Мб/c"
 
-#: ../src/applet-dialogs.c:348 ../src/applet-dialogs.c:486
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: ../src/applet-dialogs.c:361
-#, c-format
-msgid "%d dB"
-msgstr "%d дБ"
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr "Невідома"
 
-#: ../src/applet-dialogs.c:363
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "невідомо"
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Адреса IP:"
 
-#: ../src/applet-dialogs.c:375
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "невідомо"
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "Широкомовна адреса:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "Маска мережі"
 
-#: ../src/applet-dialogs.c:410
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Маска мережі:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:413
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:420
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:422
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:426
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:432 ../src/applet-dialogs.c:791
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Загальне"
 
-#: ../src/applet-dialogs.c:436
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Інтерфейс:"
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Апаратна адреса:"
 
 #. Driver
-#: ../src/applet-dialogs.c:460
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Драйвер:"
 
-#: ../src/applet-dialogs.c:489
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Швидкість:"
 
-#: ../src/applet-dialogs.c:499
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Захист:"
 
-#: ../src/applet-dialogs.c:512
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:525
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
-#. Address
-#: ../src/applet-dialogs.c:553 ../src/applet-dialogs.c:660
-msgid "IP Address:"
-msgstr "Адреса IP:"
-
-#: ../src/applet-dialogs.c:555 ../src/applet-dialogs.c:571
-msgctxt "Address"
-msgid "Unknown"
-msgstr "Невідома"
-
-#: ../src/applet-dialogs.c:569
-msgid "Broadcast Address:"
-msgstr "Широкомовна адреса:"
-
-#. Prefix
-#: ../src/applet-dialogs.c:578
-msgid "Subnet Mask:"
-msgstr "Маска мережі:"
-
-#: ../src/applet-dialogs.c:580
-msgctxt "Subnet Mask"
-msgid "Unknown"
-msgstr "Маска мережі"
-
-#: ../src/applet-dialogs.c:588 ../src/applet-dialogs.c:675
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "Типовий шлюз:"
 
-#: ../src/applet-dialogs.c:600
-msgid "Primary DNS:"
-msgstr "Первинний DNS:"
-
-#: ../src/applet-dialogs.c:609
-msgid "Secondary DNS:"
-msgstr "Вторинний DNS:"
-
-#: ../src/applet-dialogs.c:619
-msgid "Ternary DNS:"
-msgstr "Трійкове DNS:"
-
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:634
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:643
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Зігнорувати"
 
-#: ../src/applet-dialogs.c:796
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Тип VPN:"
 
-#: ../src/applet-dialogs.c:803
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Шлюз VPN:"
 
-#: ../src/applet-dialogs.c:809
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Користувач VPN:"
 
-#: ../src/applet-dialogs.c:815
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Шапка VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Основне з'єднання:"
 
-#: ../src/applet-dialogs.c:823
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Невідомо"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:886
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Немає доступних активних з'єднань!"
 
-#: ../src/applet-dialogs.c:939
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -699,395 +933,602 @@ msgstr ""
 "© Novell, Inc., 2005-2008\n"
 "і багато інших учасників та перекладачів"
 
-#: ../src/applet-dialogs.c:942
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "Аплет для керування мережними пристроями та з'єднаннями."
 
-#: ../src/applet-dialogs.c:944
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Веб-сайт NetworkManager"
 
-#: ../src/applet-dialogs.c:959
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Відсутні компоненти програми"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Пароль мобільної широкосмугової мережі"
 
-#: ../src/applet-dialogs.c:993
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "Для підключення до мережі «%s» вимагається пароль."
 
-#: ../src/applet-dialogs.c:1012
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/applet.c:489
-msgid "Failed to add/activate connection"
-msgstr "Не вдалося додати/встановити з'єднання"
-
-#: ../src/applet.c:533
-msgid "Device disconnect failed"
-msgstr "Не вдалось від'єднати пристрій"
-
-#: ../src/applet.c:538
-msgid "Disconnect failure"
-msgstr "Не вдалося від'єднати"
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr "Для розблокування SIM потрібен код PIN"
 
-#: ../src/applet.c:559
-msgid "Connection activation failed"
-msgstr "Не вдалося встановити з'єднання"
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr "Для розблокування SIM потрібен код PIN"
 
-#: ../src/applet.c:1014
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was "
-"interrupted."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"Неможливо встановити з'єднання VPN «%s»: з'єднання з мережею було перервано."
+"Для роботи мобільного широкосмугового пристрою «%s» потрібен код PIN SIM."
 
-#: ../src/applet.c:1017
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr "Код PIN:"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr "Показати код PIN"
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr "Для розблокування SIM потрібен код PUK"
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr "Для розблокування SIM потрібен код PUK"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"Неможливо встановити з'єднання VPN «%s»: служба VPN несподівано завершилась."
+"Для роботи мобільного широкосмугового пристрою «%s» потрібен код SIM PUK."
 
-#: ../src/applet.c:1020
-#, c-format
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr "Код PUK:"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr "Новий код PIN:"
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr "Введіть новий код PIN ще раз:"
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
+
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid "
-"configuration."
+"IP addresses identify your computer on the network.  Click the \"Add\" "
+"button to add an IP address."
 msgstr ""
-"\n"
-"Неможливо встановити з'єднання VPN «%s»: служба VPN повернула неправильну "
-"конфігурацію."
+"Адреси IP ідентифікують ваш комп'ютер у мережі. Натисніть кнопку «Додати», "
+"щоб додати адресу IP."
 
-#: ../src/applet.c:1023
-#, c-format
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "В_илучити"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"Неможливо встановити з'єднання VPN «%s»: вичерпано час очікування."
+"Якщо увімкнено, це з'єднання ніколи не буде використовуватись як типове "
+"мережне з'єднання."
 
-#: ../src/applet.c:1026
-#, c-format
+#: ../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…"
+msgstr "Створити…"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "Виберіть тип з'єднання VPN"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+"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."
 msgstr ""
-"\n"
-"Неможливо встановити з'єднання VPN «%s»: служба VPN не запустилась вчасно."
+"Вибрати тип VPN, який ви бажаєте використовувати для нового з'єднання. Якщо "
+"бажаний тим з'єднання не з'явився у списку, то додаток VPN некоректно "
+"встановлено."
 
-#: ../src/applet.c:1029
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "Широкомовна адреса:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Основне з'єднання:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Змінити"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "Інтерфейс:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"Неможливо встановити з'єднання VPN «%s»: неможливо запустити службу VPN."
 
-#: ../src/applet.c:1032
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "Первинний DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
 msgstr ""
-"\n"
-"Неможливо встановити з'єднання VPN «%s»: неможливо знайти відповідний ключ "
-"для VPN."
 
-#: ../src/applet.c:1035
+#: ../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:"
+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
+msgid "bytes"
+msgstr "байт"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "_Захист:"
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Основне з'єднання:"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "_Мережа"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "автоматично"
+
+#: ../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
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+msgid "default"
+msgstr "типово"
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
 msgstr ""
-"\n"
-"Неможливо встановити з'єднання VPN «%s»: неправильний ключ доступу до VPN."
 
-#: ../src/applet.c:1042
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Адреса"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Адреса"
+
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed."
+msgid "invalid %s for %s (%s)"
 msgstr ""
-"\n"
-"Неможливо встановити з'єднання VPN «%s»"
 
-#: ../src/applet.c:1060
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was "
-"interrupted."
+msgid "invalid %s (%s)"
 msgstr ""
-"\n"
-"З'єднання VPN «%s» розірвано, оскільки мережне з'єднання перервано."
 
-#: ../src/applet.c:1063
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+msgid "invalid interface-name for %s (%s)"
 msgstr ""
-"\n"
-"З'єднання VPN «%s» розірвано, оскільки було зупинено службу VPN."
 
-#: ../src/applet.c:1069
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+msgid "invalid interface-name (%s)"
 msgstr ""
-"\n"
-"З'єднання VPN «%s» розірвано."
 
-#: ../src/applet.c:1103
-msgid "VPN Login Message"
-msgstr "Повідомлення входу VPN"
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Будь-який пристрій"
 
-#: ../src/applet.c:1109 ../src/applet.c:1117 ../src/applet.c:1167
-msgid "VPN Connection Failed"
-msgstr "Збій з'єднання VPN"
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "Не вдалось оновити секрети з'єднання через невідому помилку."
 
-#: ../src/applet.c:1174
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
-msgstr ""
-"\n"
-"Неможливо встановити з'єднання VPN «%s»: не вдалось запустити службу VPN.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "Використовувати захист _802.1X для цього з'єднання"
 
-#: ../src/applet.c:1177
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
 msgstr ""
-"\n"
-"Не вдалось запустити з'єднання VPN «%s».\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1497
-msgid "device not ready (firmware missing)"
-msgstr "пристрій не готовий (відсутній мікрокод)"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/applet.c:1499
-msgid "device not ready"
-msgstr "пристрій не готовий"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:1525
-msgid "Disconnect"
-msgstr "Від'єднатися"
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.c:1539
-msgid "device not managed"
-msgstr "пристрій не керується"
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.c:1583
-msgid "No network devices available"
-msgstr "Немає доступних мережних пристроїв"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
 
-#: ../src/applet.c:1671
-msgid "_VPN Connections"
-msgstr "З'єднання _VPN"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.c:1728
-msgid "_Configure VPN..."
-msgstr "_Налаштувати VPN..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.c:1732
-msgid "_Disconnect VPN"
-msgstr "_Від'єднати VPN..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
 
-#: ../src/applet.c:1830
-msgid "NetworkManager is not running..."
-msgstr "NetworkManager не запущено..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.c:1835 ../src/applet.c:2634
-msgid "Networking disabled"
-msgstr "Підтримку мережі вимкнено"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:2056
-msgid "Enable _Networking"
-msgstr "_Мережа"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:2065
-msgid "Enable _Wireless"
-msgstr "_Бездротова мережа"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2074
-msgid "Enable _Mobile Broadband"
-msgstr "Мобільне _широкосмугове з'єднання"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr "2"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2083
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Увімкнути мобільну _радіомережу WiMAX"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr "3"
 
-#. Toggle notifications item
-#: ../src/applet.c:2094
-msgid "Enable N_otifications"
-msgstr "Увімкнути _сповіщення"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr "4"
 
-#. 'Connection Information' item
-#: ../src/applet.c:2105
-msgid "Connection _Information"
-msgstr "_Інформація про з'єднання"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:2115
-msgid "Edit Connections..."
-msgstr "Змінити з'єднання..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
 
-#. Help item
-#: ../src/applet.c:2129
-msgid "_Help"
-msgstr "_Довідка"
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#. About item
-#: ../src/applet.c:2138
-msgid "_About"
-msgstr "_Про програму"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.c:2315
-msgid "Disconnected"
-msgstr "З'єднання розірвано"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.c:2316
-msgid "The network connection has been disconnected."
-msgstr "Мережне з'єднання було розірвано."
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.c:2497
-#, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "Підготовка мережного з'єднання «%s»..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.c:2500
-#, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "Для мережного з'єднання «%s» вимагається автентифікація..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.c:2506
-#, c-format
-msgid "Network connection '%s' active"
-msgstr "Мережне з'єднання «%s» встановлено"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.c:2589
-#, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "Запуск з'єднання VPN «%s»..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.c:2592
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "Для з'єднання VPN «%s» вимагається автентифікація…"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#, fuzzy
+msgid "2:"
+msgstr "2"
 
-#: ../src/applet.c:2595
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "Отримання адреси VPN для «%s»…"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#, fuzzy
+msgid "3:"
+msgstr "3"
 
-#: ../src/applet.c:2598
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "З'єднання VPN «%s» установлено"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#, fuzzy
+msgid "4:"
+msgstr "4"
 
-#: ../src/applet.c:2639
-msgid "No network connection"
-msgstr "Немає з'єднання з мережею"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.c:3394
-msgid "NetworkManager Applet"
-msgstr "Аплет NetworkManager"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:1
-msgid "Automatically unlock this device"
-msgstr "Автоматично розблоковувати цей пристрій"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/gsm-unlock.ui.h:2
-msgid "_Unlock"
-msgstr "_Розблокувати"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/info.ui.h:1
-msgid "Connection Information"
-msgstr "Інформація про з'єднання"
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
+msgid "Strict Bandwidth:"
+msgstr ""
 
-#: ../src/info.ui.h:2
-msgid "Active Network Connections"
-msgstr "Увімкнути мережеві з'єднання"
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
+msgid "Priority Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:1 ../src/wired-dialog.c:104
-msgid "Wired 802.1X authentication"
-msgstr "Автентифікація дротової мережі 802.1X"
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
+msgid "Group Bandwidth:"
+msgstr ""
 
-#: ../src/wired-8021x.ui.h:2 ../src/libnm-gtk/wifi.ui.h:3
-msgid "_Network name:"
-msgstr "_Назва мережі:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
+msgid "Group ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:72
-msgid "automatic"
-msgstr "автоматично"
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
 
-#: ../src/connection-editor/ce-page.c:318
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "Не вдалось оновити секрети з'єднання через невідому помилку."
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
-#: ../src/connection-editor/ce-page-ip4.ui.h:8
-#: ../src/connection-editor/ce-page-ip6.ui.h:8
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
 msgid ""
-"IP addresses identify your computer on the network.  Click the \"Add\" "
-"button to add an IP address."
+"Enter the allowed link bandwidth percent each Priority Group may use.  The "
+"sum of all groups must total 100%."
 msgstr ""
-"Адреси IP ідентифікують ваш комп'ютер у мережі. Натисніть кнопку «Додати», "
-"щоб додати адресу IP."
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
-msgid "Ig_nore automatically obtained routes"
-msgstr "_Ігнорувати автоматично отримані маршрути"
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
-msgid "_Use this connection only for resources on its network"
-msgstr "_Використовувати це з'єднання лише для ресурсів у його мережі"
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
-msgid ""
-"If enabled, this connection will never be used as the default network "
-"connection."
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:8
+#: ../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
@@ -1100,15 +1541,17 @@ 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:4
-#: ../src/wireless-security/eap-method-tls.ui.h:6
+#: ../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
 msgid "Sho_w password"
 msgstr "П_оказати пароль"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../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
@@ -1116,15 +1559,168 @@ msgstr "П_оказати пароль"
 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-wired.ui.h:1
-#: ../src/connection-editor/ce-page-wireless.ui.h:1
-#: ../src/connection-editor/page-ip6.c:142
+#: ../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
 msgid "Automatic"
 msgstr "Автоматично"
 
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr "Звита пара (TP)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr "Інтерфейс під'єднання пристрою (AUI)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr "BNC"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr "Інтерфейс незалежний від носія (MII)"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr "10 Мб/c"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr "100 Мб/c"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr "1 Гб/с"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr "10 Гб/с"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "_Порт:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_Швидкість:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "Повний _дуплекс"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "_Автоматичне узгодження"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
+msgstr "С_лужба:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+msgid "C_loned MAC address:"
+msgstr "_Клонована адреса MAC:"
+
+#: ../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 ""
+"Введена тут адреса MAC використовується як апаратна адреса мережного "
+"пристрою активного для цього з'єднання. ця функція відома як клонування MAC "
+"або spoofing.  Приклад: 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.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Типово"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Ігнорувати"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Широкомовна адреса:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "Па_роль до мережного ключа:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "_З'єднати"
+
 #: ../src/connection-editor/ce-page-ip4.ui.h:2
 #: ../src/connection-editor/ce-page-ip6.ui.h:2
 msgid "Automatic with manual DNS settings"
@@ -1132,8 +1728,8 @@ msgstr "Автоматично з ручними налаштування DNS"
 
 #: ../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:191
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Вручну"
 
@@ -1144,22 +1740,22 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:211
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Спільний з іншим комп'ютерами"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:6
-#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/ce-page-ip6.ui.h:9
 msgid "_Method:"
 msgstr "_Метод:"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:7
-#: ../src/connection-editor/ce-page-ip6.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
 msgid "Addresses"
 msgstr "Адреси"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1169,8 +1765,8 @@ msgstr ""
 "комп'ютерів до мережі. Якщо у вас використовується такий ідентифікатор, "
 "введіть его."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:10
-#: ../src/connection-editor/ce-page-ip6.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 msgid ""
 "Domains used when resolving host names. Use commas to separate multiple "
 "domains."
@@ -1178,22 +1774,25 @@ msgstr ""
 "Домени використовують для розв'язання назв вузлів. Використовуйте розділювач "
 "для вказування кількох доменів."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:11
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:10
+#: ../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
 msgid "S_earch domains:"
 msgstr "Домени по_шуку:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:13
-#: ../src/connection-editor/ce-page-ip6.ui.h:11
+#: ../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:"
 msgstr "Сервери _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
-#: ../src/connection-editor/ce-page-ip6.ui.h:12
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1201,11 +1800,11 @@ msgstr ""
 "IP адреси доменів використовуються для розв'язання назв вузлів. "
 "Використовуйте розділювач для вказування кількох доменів."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1213,16 +1812,43 @@ msgstr ""
 "При підключені до мереж із можливістю IPv6: дозволяє встановити з'єднання у "
 "випадку помилки у конфігурації IPv4, але успішної конфігурації IPv6."
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:17
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "М_аршрути..."
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:13
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr "Не вказувати адресу"
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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 адреси доменів використовуються для розв'язання назв вузлів. "
+"Використовуйте розділювач для вказування кількох доменів."
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 msgid "Require IPv_6 addressing for this connection to complete"
 msgstr "Вимагати адресацію IPv_6 для цього з'єднання"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:14
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1231,63 +1857,38 @@ msgstr ""
 "випадку помилки у налаштуванні IPv6, але успішного налаштування IPv4."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Будь-який"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Віддавати перевагу 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Віддавати перевагу 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "Basic"
 msgstr "Основний"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "_Номер:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:10
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Додатково"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "Ідентифікатор _мережі:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Тип:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Змінити..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "Вмикати _роумінг, якщо недоступна домашня мережа"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "П_оказати паролі"
 
@@ -1339,194 +1940,177 @@ msgstr "Луна"
 msgid "Send PPP _echo packets"
 msgstr "Надсилати пакети від_луння PPP"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:2
-msgid "Twisted Pair (TP)"
-msgstr "Звита пара (TP)"
-
-#: ../src/connection-editor/ce-page-wired.ui.h:3
-msgid "Attachment Unit Interface (AUI)"
-msgstr "Інтерфейс під'єднання пристрою (AUI)"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:4
-msgid "BNC"
-msgstr "BNC"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:5
-msgid "Media Independent Interface (MII)"
-msgstr "Інтерфейс незалежний від носія (MII)"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Основне з'єднання:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:6
-msgid "10 Mb/s"
-msgstr "10 Мб/c"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:7
-msgid "100 Mb/s"
-msgstr "100 Мб/c"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "Інтерфейс:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:8
-msgid "1 Gb/s"
-msgstr "1 Гб/с"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:9
-msgid "10 Gb/s"
-msgstr "10 Гб/с"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "_Клонована адреса MAC:"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:10
-msgid "_Port:"
-msgstr "_Порт:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:11
-msgid "_Speed:"
-msgstr "_Швидкість:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:12
-msgid "Full duple_x"
-msgstr "Повний _дуплекс"
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:13
-msgid "Aut_onegotiate"
-msgstr "_Автоматичне узгодження"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:14
-#: ../src/connection-editor/ce-page-wireless.ui.h:8
-msgid "_Device MAC address:"
-msgstr "Адреса MAC _пристрою:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:15
-#: ../src/connection-editor/ce-page-wireless.ui.h:10
-msgid "C_loned MAC address:"
-msgstr "_Клонована адреса MAC:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:16
-#: ../src/connection-editor/ce-page-wireless.ui.h:9
-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"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
 msgstr ""
-"Введена тут адреса MAC використовується як апаратна адреса мережного "
-"пристрою активного для цього з'єднання. ця функція відома як клонування MAC "
-"або spoofing.  Приклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-wired.ui.h:17
-#: ../src/connection-editor/ce-page-wireless.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.ui.h:18
-#: ../src/connection-editor/ce-page-wireless.ui.h:6
-msgid "bytes"
-msgstr "байт"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr "_Захист:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:2
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
 msgid "A (5 GHz)"
 msgstr "A (5 ГГц)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:3
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
 msgid "B/G (2.4 GHz)"
 msgstr "B/G (2,4 ГГц)"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:4
-msgid "Infrastructure"
-msgstr "Інфраструктура"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Спеціально"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "мВт"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "Поту_жність передачі:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Мб/c"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Швидкість:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:15
-msgid ""
-"This option locks this connection to the wireless access point (AP) "
-"specified by the BSSID entered here.  Example: 00:11:22:33:44:55"
-msgstr ""
-"Прив'язувати з'єднання до BSSID бездротової точки доступу. Приклад: "
-"00:11:22:33:44:55"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Канал:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:18
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_Діапазон:"
 
-#: ../src/connection-editor/ce-page-wireless.ui.h:19
-msgid "M_ode:"
-msgstr "_Режим:"
-
-#: ../src/connection-editor/ce-page-wireless.ui.h:20
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-page-wireless-security.ui.h:1
-msgid "S_ecurity:"
-msgstr "_Захист:"
+#: ../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:1
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
 msgid "Allowed Authentication Methods"
 msgstr "Дозволені способи автентифікації"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake Authentication Protocol версія 2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -1535,177 +2119,671 @@ msgstr ""
 "автентифікації. Якщо ж не вдалось з'єднатись, спробуйте вимкнути підтримку "
 "деяких способів.</i>"
 
-#: ../src/connection-editor/ce-vpn-wizard.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/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+#, fuzzy
+msgid "Ethernet"
+msgstr "Ethernet автоматично"
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:2
-msgid "Choose a VPN Connection Type"
-msgstr "Виберіть тип з'єднання VPN"
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
+msgid "Wi-Fi"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:3
-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."
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
 msgstr ""
-"Вибрати тип VPN, який ви бажаєте використовувати для нового з'єднання. Якщо "
-"бажаний тим з'єднання не з'явився у списку, то додаток VPN некоректно "
-"встановлено."
 
-#: ../src/connection-editor/ce-vpn-wizard.ui.h:4
-msgid "Create…"
-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:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "Апаратна адреса:"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "Експорт з'єднання VPN..."
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "Не вдалось запустити вікно редактора з'єднань через невідому помилку."
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "Не вдається створити нове з'єднання"
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "Помилка при видаленні з'єднання"
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "Вилучити з'єднання %s?"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:745
-#: ../src/connection-editor/ip6-routes-dialog.c:687
-#: ../src/connection-editor/page-ip4.c:900
-#: ../src/connection-editor/page-ip6.c:866
+#: ../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
 msgid "Address"
 msgstr "Адреса"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:762
-#: ../src/connection-editor/page-ip4.c:917
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Маска"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:779
-#: ../src/connection-editor/ip6-routes-dialog.c:721
-#: ../src/connection-editor/page-ip4.c:934
-#: ../src/connection-editor/page-ip6.c:900
+#: ../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
 msgid "Gateway"
 msgstr "Шлюз"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:796
-#: ../src/connection-editor/ip6-routes-dialog.c:738
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Метрика"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:704
-#: ../src/connection-editor/page-ip6.c:883
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Префікс"
 
-#: ../src/connection-editor/page-dsl.c:139
-#: ../src/connection-editor/nm-connection-editor.ui.h:8
-#: ../src/connection-editor/nm-connection-list.c:1518
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "Редагування %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "Редагування бездротового з'єднання"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Назва з'єднання:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "Помилка під час ініціалізації редактора"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Помилка при додаванні з'єднання"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+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:419
+msgid "_Save"
+msgstr "З_берегти"
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr "Зберегти параметри з'єднання."
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr ""
+"Ввести пароль адміністратора для того, щоб зробити це з'єднання спільним для "
+"всіх користувачів комп'ютера."
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "Не вдається створити нове з'єднання"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "Не вдалось змінити з'єднання"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+msgid "Unknown error creating connection editor dialog."
+msgstr "Помилка при створенні редактора з'єднань."
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "Помилка під час ініціалізації редактора"
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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
+msgid "Connection _name:"
+msgstr "_Назва з'єднання:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "_Експорт"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "ніколи"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "зараз"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d хвилина тому"
+msgstr[1] "%d хвилини тому"
+msgstr[2] "%d хвилин тому"
+
+#: ../src/connection-editor/nm-connection-list.c:160
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d година тому"
+msgstr[1] "%d години тому"
+msgstr[2] "%d годин тому"
+
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d день тому"
+msgstr[1] "%d дні тому"
+msgstr[2] "%d днів тому"
+
+#: ../src/connection-editor/nm-connection-list.c:178
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d місяць тому"
+msgstr[1] "%d місяці тому"
+msgstr[2] "%d місяців тому"
+
+#: ../src/connection-editor/nm-connection-list.c:182
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d рік тому"
+msgstr[1] "%d роки тому"
+msgstr[2] "%d років тому"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "Назва"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "Останнє з'єднання"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "Змінити виділене з'єднання"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "Для зміни  виділеного з'єднання потрібна автентифікація"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "Вилучити виділене з'єднання"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "Для видалення виділеного з'єднання потрібна автентифікація"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "Невідомо, як створювати з'єднання «%s»"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr "Помилка створення з'єднання"
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr "Помилка редагування з'єднання"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr "Не знайдено зв'язку з UUID «%s»"
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "Захист 802.1x"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr ""
+"Не вдалось завантажити інтерфейс налаштовування захисту з'єднання WiFi."
+
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr "Використовувати захист _802.1X для цього з'єднання"
+
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr ""
+"Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
+"мережі."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "не вдалось знайти пристрій Bluetooth."
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Дротове з'єднання %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "_Мережа"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Бездротова мережа"
+
+#: ../src/connection-editor/page-bond.c:447
+#, fuzzy
+msgid "Could not load bond user interface."
+msgstr ""
+"Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
+"мережі."
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "Первинний DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "Дротове з'єднання %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr ""
+"Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
+"мережі."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "Дротове з'єднання %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr ""
+"Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
+"мережі."
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
+msgstr "Не вдалось завантажити інтерфейс користувача DSL."
 
-#: ../src/connection-editor/page-dsl.c:141
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача DSL."
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "З'єднання DSL %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:132
+#: ../src/connection-editor/page-ethernet.c:74
+#, 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)\""
+msgstr ""
+"Цей параметр блокує з'єднання до мережного пристрою, вказаного за його "
+"первинною адресою MAC, введеною тут.  Приклад: 00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-ethernet.c:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr ""
+"Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
+"мережі."
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, 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
+#, fuzzy
+msgid "cloned MAC"
+msgstr "_Клонована адреса MAC:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "Типово"
+
+#: ../src/connection-editor/page-general.c:52
+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 не запущено..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr ""
+"Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
+"мережі."
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+#, fuzzy
+msgid "Could not load InfiniBand user interface."
+msgstr "Не вдалось завантажити інтерфейс користувача для налаштовування WiFi"
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "Дротове з'єднання %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Автоматично (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:133
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Автоматично (VPN, лише адреса)"
 
-#: ../src/connection-editor/page-ip4.c:137
+#: ../src/connection-editor/page-ip4.c:130
 #: ../src/connection-editor/page-ip6.c:136
-msgid "Automatic (PPP)"
-msgstr "Автоматично (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:137
-msgid "Automatic (PPP) addresses only"
-msgstr "Автоматично (PPP, лише адреса)"
+msgid "Automatic, addresses only"
+msgstr "Автоматично, лише адреси"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:139
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Автоматично (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Автоматично (PPPoE, лише адреса)"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Автоматично (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Автоматично (DHCP, лише адреса)"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:204
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Лише місцевий"
 
-#: ../src/connection-editor/page-ip4.c:197
-msgid "Disabled"
-msgstr "Не вказувати адресу"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "Сервери _DNS:"
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "Домени по_шуку:"
 
-#: ../src/connection-editor/page-ip4.c:832
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Маршрути IPv4 для %s"
 
-#: ../src/connection-editor/page-ip4.c:981
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Параметри IPv4"
 
-#: ../src/connection-editor/page-ip4.c:983
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача налаштовування IPv4"
 
-#: ../src/connection-editor/page-ip6.c:143
-msgid "Automatic, addresses only"
-msgstr "Автоматично, лише адреси"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:155
-#: ../src/wireless-security/eap-method.c:285
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Ігнорувати"
 
-#: ../src/connection-editor/page-ip6.c:179
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Автоматично, лише DHCP"
 
-#: ../src/connection-editor/page-ip6.c:798
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Зміна маршрутів IPv6 для %s"
 
-#: ../src/connection-editor/page-ip6.c:945
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Параметри IPv6"
 
-#: ../src/connection-editor/page-ip6.c:947
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача налаштовування IPv6"
 
-#: ../src/connection-editor/page-mobile.c:381
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача налаштовування IPv4"
 
-#: ../src/connection-editor/page-mobile.c:398
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "Непідтримуваний тип мобільного широкосмугового з'єднання."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:639
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "Вибір типу мобільного широкосмугового провайдера"
 
-#: ../src/connection-editor/page-mobile.c:674
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -1713,438 +2791,275 @@ msgstr ""
 "Оберіть технологію, яку використовує ваш провайдер мобільного "
 "широкосмугового інтернету. Якщо ви не впевнені, спитайте провайдера."
 
-#: ../src/connection-editor/page-mobile.c:679
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr ""
 "Мій провайдер використовує технологію на основі _GSM (т.е. GPRS, EDGE, UMTS, "
 "HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:686
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr ""
 "Мій провайдер використовує технологію на основі C_DMA (т.е. 1xRTT, EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:134
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-ttls.c:230
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:280
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-fast.c:277
-#: ../src/wireless-security/eap-method-peap.c:246
-#: ../src/wireless-security/eap-method-ttls.c:263
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:247
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:141
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "немає"
 
-#: ../src/connection-editor/page-ppp.c:201
+#: ../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:282
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Параметри PPP"
 
-#: ../src/connection-editor/page-ppp.c:284
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача для налаштовування PPP."
 
-#: ../src/connection-editor/page-vpn.c:109
-#: ../src/connection-editor/nm-connection-editor.ui.h:7
-#: ../src/connection-editor/nm-connection-list.c:1514
-msgid "VPN"
-msgstr "VPN"
+#: ../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 "Виберіть файл для імпорту"
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr ""
+"Не вдалось завантажити інтерфейс користувача для налаштовування дротової "
+"мережі."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "Дротове з'єднання %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Немає з'єднання з мережею"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "Не вдалось завантажити інтерфейс користувача налаштовування IPv4"
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "VPN з'єднання %d"
 
-#: ../src/connection-editor/page-vpn.c:111
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Неможливо завантажити інтерфейс користувача VPN."
 
-#: ../src/connection-editor/page-vpn.c:126
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "Не вдалось знайти модуль VPN для «%s»"
 
-#: ../src/connection-editor/page-vpn.c:201
-#: ../src/connection-editor/nm-connection-list.c:899
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN з'єднання %d"
 
-#: ../src/connection-editor/page-wired.c:89
-#: ../src/connection-editor/page-wireless.c:94
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
 msgstr ""
-"Цей параметр блокує з'єднання до мережного пристрою, вказаного за його "
-"первинною адресою MAC, введеною тут.  Приклад: 00:11:22:33:44:55"
+"Модулю VPN не вдалось коректно імпортувати з'єднання VPN'\n"
+"\n"
+"Помилка: немає типу служби VPN."
 
-#: ../src/connection-editor/page-wired.c:272
-#: ../src/connection-editor/nm-connection-editor.ui.h:2
-#: ../src/connection-editor/nm-connection-list.c:1502
-msgid "Wired"
-msgstr "Дротові"
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr "Виберіть тип з'єднання VPN"
 
-#: ../src/connection-editor/page-wired.c:274
-msgid "Could not load wired user interface."
+#: ../src/connection-editor/page-vpn.c:255
+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-wired.c:449
-#, c-format
-msgid "Wired connection %d"
-msgstr "Дротове з'єднання %d"
-
-#: ../src/connection-editor/page-wired-security.c:119
-msgid "802.1x Security"
-msgstr "Захист 802.1x"
-
-#: ../src/connection-editor/page-wired-security.c:121
-msgid "Could not load Wired Security security user interface."
-msgstr "Неможливо завантажити інтерфейс користувача безпеки радіомережі. "
+"Вибрати тип VPN, який ви бажаєте використовувати для нового з'єднання. Якщо "
+"бажаний тим з'єднання не з'явився у списку, то додаток VPN некоректно "
+"встановлено."
 
-#: ../src/connection-editor/page-wired-security.c:139
-msgid "Use 802.1_X security for this connection"
-msgstr "Використовувати захист _802.1X для цього з'єднання"
+#: ../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"
 
-#: ../src/connection-editor/page-wireless.c:171
-#: ../src/connection-editor/page-wireless.c:175
-#: ../src/connection-editor/page-wireless.c:196
-#, c-format
-msgid "default"
-msgstr "типово"
+#: ../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)\""
+msgstr ""
+"Цей параметр блокує з'єднання до мережного пристрою, вказаного за його "
+"первинною адресою MAC, введеною тут.  Приклад: 00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wireless.c:200
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u МГц)"
 
-#: ../src/connection-editor/page-wireless.c:457
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
-#: ../src/connection-editor/nm-connection-list.c:1506
-msgid "Wireless"
-msgstr "Бездротова мережа"
-
-#: ../src/connection-editor/page-wireless.c:459
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "Не вдалось завантажити інтерфейс користувача для налаштовування WiFi"
 
-#: ../src/connection-editor/page-wireless.c:663
-#, c-format
-msgid "Wireless connection %d"
-msgstr "Бездротова мережа %d"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Будь-який пристрій"
 
-#: ../src/connection-editor/page-wireless-security.c:290
-#: ../src/libnm-gtk/nm-wireless-dialog.c:922
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "Дротове з'єднання %d"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:300
-#: ../src/libnm-gtk/nm-wireless-dialog.c:931
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-и бітна ключова фраза"
 
-#: ../src/connection-editor/page-wireless-security.c:326
-#: ../src/libnm-gtk/nm-wireless-dialog.c:961
+#: ../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)"
 msgstr "Динамічний WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:340
-#: ../src/libnm-gtk/nm-wireless-dialog.c:975
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 Personal"
 
-#: ../src/connection-editor/page-wireless-security.c:354
-#: ../src/libnm-gtk/nm-wireless-dialog.c:989
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Enterprise"
 
-#: ../src/connection-editor/page-wireless-security.c:395
-msgid "Could not load WiFi security user interface; missing WiFi setting."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
 msgstr ""
 "Не вдалось завантажити інтерфейс налаштовування захисту з'єднання WiFi, "
 "налаштовування WiFi пропускається."
 
-#: ../src/connection-editor/page-wireless-security.c:405
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "Захист бездротової мережі"
 
-#: ../src/connection-editor/page-wireless-security.c:407
-msgid "Could not load WiFi security user interface."
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
 msgstr ""
 "Не вдалось завантажити інтерфейс налаштовування захисту з'єднання WiFi."
 
-#: ../src/connection-editor/nm-connection-editor.c:101
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Editing %s"
-msgstr "Редагування %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:105
-msgid "Editing un-named connection"
-msgstr "Редагування бездротового з'єднання"
-
-#: ../src/connection-editor/nm-connection-editor.c:291
-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:394
-msgid "Error creating connection editor dialog."
-msgstr "Помилка при створенні редактора з'єднань."
-
-#: ../src/connection-editor/nm-connection-editor.c:406
-msgid "_Save"
-msgstr "З_берегти"
-
-#: ../src/connection-editor/nm-connection-editor.c:407
-msgid "Save any changes made to this connection."
-msgstr "Зберегти параметри з'єднання."
-
-#: ../src/connection-editor/nm-connection-editor.c:408
-msgid "_Save..."
-msgstr "З_берегти..."
-
-#: ../src/connection-editor/nm-connection-editor.c:409
-msgid "Authenticate to save this connection for all users of this machine."
+msgid "missing SSID"
 msgstr ""
-"Ввести пароль адміністратора для того, щоб зробити це з'єднання спільним для "
-"всіх користувачів комп'ютера."
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:5
-msgid "_Import"
-msgstr "_Імпорт"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:6
-msgid "E_xport"
-msgstr "_Експорт"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:9
-msgid "Connection _name:"
-msgstr "_Назва з'єднання:"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:10
-msgid "Connect _automatically"
-msgstr "Підключати _автоматично"
-
-#: ../src/connection-editor/nm-connection-editor.ui.h:11
-msgid "A_vailable to all users"
-msgstr "Доступно _всім користувачам"
-
-#: ../src/connection-editor/nm-connection-list.c:216
-msgid "never"
-msgstr "ніколи"
-
-#: ../src/connection-editor/nm-connection-list.c:227
-#: ../src/connection-editor/nm-connection-list.c:238
-msgid "now"
-msgstr "зараз"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:245
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d хвилина тому"
-msgstr[1] "%d хвилини тому"
-msgstr[2] "%d хвилин тому"
-
-#: ../src/connection-editor/nm-connection-list.c:249
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d година тому"
-msgstr[1] "%d години тому"
-msgstr[2] "%d годин тому"
-
-#: ../src/connection-editor/nm-connection-list.c:261
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d день тому"
-msgstr[1] "%d дні тому"
-msgstr[2] "%d днів тому"
-
-#: ../src/connection-editor/nm-connection-list.c:267
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d місяць тому"
-msgstr[1] "%d місяці тому"
-msgstr[2] "%d місяців тому"
-
-#: ../src/connection-editor/nm-connection-list.c:271
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d рік тому"
-msgstr[1] "%d роки тому"
-msgstr[2] "%d років тому"
-
-#: ../src/connection-editor/nm-connection-list.c:486
-msgid "Connection add failed"
-msgstr "Помилка при додаванні з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:515
-msgid "Error saving connection"
-msgstr "Помилка збереження з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:516
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Властивість «%s» / «%s» — некоректна: %d"
 
-#: ../src/connection-editor/nm-connection-list.c:523
-#: ../src/connection-editor/nm-connection-list.c:662
-msgid "An unknown error occurred."
-msgstr "Невідома помилка."
-
-#: ../src/connection-editor/nm-connection-list.c:528
-#: ../src/connection-editor/nm-connection-list.c:702
-msgid "Error initializing editor"
-msgstr "Помилка під час ініціалізації редактора"
-
-#: ../src/connection-editor/nm-connection-list.c:546
-#: ../src/connection-editor/nm-connection-list.c:719
-#: ../src/connection-editor/nm-connection-list.c:885
-msgid ""
-"The connection editor dialog could not be initialized due to an unknown "
-"error."
-msgstr "Не вдалось запустити вікно редактора з'єднань через невідому помилку."
-
-#: ../src/connection-editor/nm-connection-list.c:557
-msgid "Could not create new connection"
-msgstr "Не вдається створити нове з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:569
-msgid "Could not edit new connection"
-msgstr "Не вдалось створити нове з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:733
-msgid "Could not edit connection"
-msgstr "Не вдалось змінити з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:763
-msgid "Connection delete failed"
-msgstr "Помилка при видаленні з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:795
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "Вилучити з'єднання %s?"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:929
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Не вдалось імпортувати з'єднання VPN"
 
-#: ../src/connection-editor/nm-connection-list.c:931
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"Модулю VPN не вдалось коректно імпортувати з'єднання VPN'\n"
-"\n"
-"Помилка: немає типу служби VPN."
-
-#: ../src/connection-editor/nm-connection-list.c:944
-msgid "Could not edit imported connection"
-msgstr "Не вдалось змінити імпортоване з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:1125
-msgid "Name"
-msgstr "Назва"
-
-#: ../src/connection-editor/nm-connection-list.c:1137
-msgid "Last Used"
-msgstr "Останнє з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:1263
-msgid "No VPN plugin available. Please install one to enable this button."
-msgstr ""
-"Додаток VPN не доступний. Будь ласка, встановіть його, щоб активувати цю "
-"кнопку."
-
-#: ../src/connection-editor/nm-connection-list.c:1274
-msgid "_Edit"
-msgstr "_Змінити"
-
-#: ../src/connection-editor/nm-connection-list.c:1275
-msgid "Edit the selected connection"
-msgstr "Змінити виділене з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:1276
-msgid "_Edit..."
-msgstr "_Змінити..."
-
-#: ../src/connection-editor/nm-connection-list.c:1277
-msgid "Authenticate to edit the selected connection"
-msgstr "Для зміни  виділеного з'єднання потрібна автентифікація"
-
-#: ../src/connection-editor/nm-connection-list.c:1292
-msgid "_Delete"
-msgstr "В_илучити"
-
-#: ../src/connection-editor/nm-connection-list.c:1293
-msgid "Delete the selected connection"
-msgstr "Вилучити виділене з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:1294
-msgid "_Delete..."
-msgstr "В_илучити…"
-
-#: ../src/connection-editor/nm-connection-list.c:1295
-msgid "Authenticate to delete the selected connection"
-msgstr "Для видалення виділеного з'єднання потрібна автентифікація"
-
-#: ../src/connection-editor/nm-connection-list.c:1574
-msgid "Error creating connection"
-msgstr "Помилка створення з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:1575
-#, c-format
-msgid "Don't know how to create '%s' connections"
-msgstr "Невідомо, як створювати з'єднання «%s»"
-
-#: ../src/connection-editor/nm-connection-list.c:1630
-#: ../src/connection-editor/nm-connection-list.c:1642
-msgid "Error editing connection"
-msgstr "Помилка редагування з'єднання"
-
-#: ../src/connection-editor/nm-connection-list.c:1631
-#, c-format
-msgid "Don't know how to edit '%s' connections"
-msgstr "Невідомо, як редагувати з'єднання «%s»"
-
-#: ../src/connection-editor/nm-connection-list.c:1643
-#, c-format
-msgid "Did not find a connection with UUID '%s'"
-msgstr "Не знайдено зв'язку з UUID «%s»"
-
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2157,29 +3072,30 @@ msgstr ""
 "\n"
 "Помилка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:263
-msgid "Select file to import"
-msgstr "Виберіть файл для імпорту"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Невідома помилка"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Файл з іменем «%s» вже існує."
 
-#: ../src/connection-editor/vpn-helpers.c:316
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Замінити"
 
-#: ../src/connection-editor/vpn-helpers.c:318
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
 msgstr "Ви дійсно хочете замінити %s?"
 
-#: ../src/connection-editor/vpn-helpers.c:354
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Не вдається імпортувати з'єднання VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:356
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2190,117 +3106,60 @@ msgstr ""
 "\n"
 "Помилка: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:391
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Експорт з'єднання VPN..."
 
-#: ../src/gnome-bluetooth/bt-widget.c:220
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Не вдалось створити з'єднання PAN: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:225
-#: ../src/gnome-bluetooth/bt-widget.c:493
-msgid "Your phone is now ready to use!"
-msgstr "Ваш телефон готовий до роботи!"
-
-#: ../src/gnome-bluetooth/bt-widget.c:249
-#, c-format
-msgid "%s Network"
-msgstr "Мережа %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:375
-#, c-format
-msgid "Error: %s"
-msgstr "Помилка: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:488
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Не вдалось створити з'єднання DUN: %s"
-
-#: ../src/gnome-bluetooth/bt-widget.c:511
-msgid "Mobile wizard was canceled"
-msgstr "Помічник налаштовування мобільної мережі скасовано"
-
-#: ../src/gnome-bluetooth/bt-widget.c:520
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Невідомий тип телефону (не GSM чи CDMA)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:714
-#: ../src/gnome-bluetooth/bt-widget.c:720
-msgid "failed to connect to the phone."
-msgstr "не вдалось приєднатися до телефону."
-
-#: ../src/gnome-bluetooth/bt-widget.c:753
-msgid "unexpectedly disconnected from the phone."
-msgstr "несподіваний розрив зв'язку з телефоном."
-
-#: ../src/gnome-bluetooth/bt-widget.c:762
-msgid "timed out detecting phone details."
-msgstr "вийшов термін виявлення телефону."
-
-#: ../src/gnome-bluetooth/bt-widget.c:774
-msgid "Detecting phone configuration..."
-msgstr "Виявлення параметрів телефону..."
-
-#: ../src/gnome-bluetooth/bt-widget.c:840
-msgid "could not find the Bluetooth device."
-msgstr "не вдалось знайти пристрій Bluetooth."
-
-#: ../src/gnome-bluetooth/bt-widget.c:980
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
 msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Адаптер Bluetooth типово має бути увімкнений до налаштовування комутованого "
-"з'єднання."
-
-#: ../src/gnome-bluetooth/bt-widget.c:1012
-#, c-format
-msgid "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
 msgstr ""
-"Неможливо налаштувати Bluetooth (помилка при підключенні до D-Bus: %s)."
+"Аплет NetworkManager не може знайти деякі потрібні ресурси (не знайдено "
+"файл .ui)."
 
-#: ../src/gnome-bluetooth/bt-widget.c:1022
-msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
-msgstr "Неможливо налаштувати Bluetooth (помилка створення проксі D-Bus)."
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr "_Розблокувати"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1031
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: %s)."
-msgstr "Неможливо налаштувати Bluetooth (не знайдено NetworkManager: %s)."
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr "Автоматично розблоковувати цей пристрій"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1098
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Використовувати мобільний телефон як мережний пристрій (PAN/NAP)"
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "Інформація про з'єднання"
 
-#: ../src/gnome-bluetooth/bt-widget.c:1107
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Доступ до Інтернету з використанням мобільного телефону (DUN)"
+#: ../src/info.ui.h:3
+msgid "Active Network Connections"
+msgstr "Увімкнути мережеві з'єднання"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:198
+#: ../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/libnm-gtk/nm-mobile-wizard.c:205
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "Пристрій:"
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:216
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "Провайдер:"
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:227
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "План:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:252
+#: ../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 "
@@ -2315,23 +3174,28 @@ msgstr ""
 "змінити параметри з'єднання, виберіть пункт «Мережні з'єднання» з меню "
 "Система >> Параметри."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:264
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "Підтвердження параметрів мобільного з'єднання"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:325
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Немає у списку"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:480
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "_Виберіть план:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:504
+#: ../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/libnm-gtk/nm-mobile-wizard.c:528
+#: ../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"
@@ -2344,67 +3208,83 @@ msgstr ""
 "Якщо ви не впевнені, спитайте у провайдера, яка точка доступу (APN) "
 "відповідає вашому тарифному плану."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "Виберіть тарифний план"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:583
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Мого плану немає у списку..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:740
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "Виберіть п_ровайдера зі списку:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:753
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Провайдер"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:778
+#: ../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/libnm-gtk/nm-mobile-wizard.c:789
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Провайдер:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:813
+#: ../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/libnm-gtk/nm-mobile-wizard.c:819
+#: ../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/libnm-gtk/nm-mobile-wizard.c:830
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "Виберіть свого провайдера"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1081
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "Список країн або областей:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1093
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "Країна або область"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1100
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "Моєї країни немає у списку"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1146
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1200
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Встановлено пристрій GSM"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1203
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Встановлено пристрій CDMA"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1375
+#: ../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."
@@ -2412,115 +3292,216 @@ msgstr ""
 "Цей помічник допоможе вам налаштувати мобільне широкосмугове підключення до "
 "мобільної (3G) мережі."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1380
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "Вам буде потрібна наступна інформація:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1395
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Назва провайдера"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1401
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Тарифний план"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1407
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1434
+#: ../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 "Створити з'єднання для _цього мобільного широкосмугового пристрою:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1449
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "Будь-який пристрій"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1462
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "Налаштовування мобільного широкосмугового пристрою"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1626
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "Нове мобільне широкосмугове з'єднання"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:457
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+#, 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
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_Пароль:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_Пароль:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "П_оказати паролі"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Створити..."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1076
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "Без перевірки автентичності"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "С_творити"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1160
-#, c-format
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
 msgid ""
-"Passwords or encryption keys are required to access the wireless network "
-"'%s'."
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr ""
 "Для доступу до бездротової мережі «%s» необхідні паролі або ключі шифрування."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1162
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "Для доступу до бездротової мережі потрібна автентифікація"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1164
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "Для доступу до бездротової мережі потрібна автентифікація"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1169
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "Створити нову бездротову мережу"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1171
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "Нова бездротова мережа"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1172
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "Введіть назву бездротової мережі, яку треба створити."
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1174
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "З'єднатись з прихованою бездротовою мережею"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1176
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "Прихована бездротова мережа"
 
-#: ../src/libnm-gtk/nm-wireless-dialog.c:1177
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, fuzzy
 msgid ""
-"Enter the name and security details of the hidden wireless network you wish "
-"to connect to."
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
 msgstr ""
 "Введіть назву та параметри безпеки прихованої бездротової мережі, до якої "
 "треба приєднатись."
 
-#: ../src/libnm-gtk/wifi.ui.h:2
-msgid "Wireless _security:"
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
 msgstr "_Захист бездротової мережі:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "З'_єднання:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
-msgid "Wireless _adapter:"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
 msgstr "Бездротовий _адаптер:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Використання:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
 msgstr ""
-"Ця програма є частиною NetworkManager (https://wiki.gnome.org/"
-"Projects/NetworkManager/)."
+"Ця програма є частиною NetworkManager (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
 
-#: ../src/main.c:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -2528,121 +3509,156 @@ msgstr ""
 "Вона не призначена для використання з командного рядка, її слід "
 "використовувати з середовища GNOME."
 
-#: ../src/mb-menu-item.c:57
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:61
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:63
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:65
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:67
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:69
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:71
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:73
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/mb-menu-item.c:68
+#, fuzzy
+msgid "HSPA+"
+msgstr "HSPA"
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
 
-#: ../src/mb-menu-item.c:109
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "недоступно"
 
-#: ../src/mb-menu-item.c:115
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "не зареєстровано"
 
-#: ../src/mb-menu-item.c:133
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Домашня мережа (%s)"
 
-#: ../src/mb-menu-item.c:135
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Домашня мережа"
 
-#: ../src/mb-menu-item.c:143
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "триває пошук"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "реєстрацію заборонено"
 
-#: ../src/mb-menu-item.c:151 ../src/mb-menu-item.c:157
+#: ../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:153 ../src/mb-menu-item.c:159
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s (роумінг)"
 
-#: ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "Роумінгова мережна (%s)"
 
-#: ../src/mb-menu-item.c:164
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Роумінгова мережна"
 
-#: ../src/utils/nmn-mobile-providers.c:531
-msgid "Default"
-msgstr "Типово"
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr "Код PIN для картки SIM «%s» на «%s»"
 
-#: ../src/wired-dialog.c:91 ../src/wired-dialog.c:99
-msgid ""
-"The NetworkManager Applet could not find some required resources (the .ui "
-"file was not found)."
-msgstr ""
-"Аплет NetworkManager не може знайти деякі потрібні ресурси (не знайдено "
-"файл .ui)."
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "Вимагається код PIN"
 
-#: ../src/wireless-security/eap-method.c:279
-msgid "No Certificate Authority certificate chosen"
-msgstr "Не вибраний сертифікат Центру Сертифікації"
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "Для використання мобільного широкосмугового пристрою потрібен код PIN"
 
-#: ../src/wireless-security/eap-method.c:280
-msgid ""
-"Not using a Certificate Authority (CA) certificate can result in connections "
-"to insecure, rogue wireless networks.  Would you like to choose a "
-"Certificate Authority certificate?"
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "Мобільне широкосмугове з'єднання «%s» встановлено: (%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "роумінг"
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Основне з'єднання:"
+
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
 msgstr ""
-"Без використання сертифікату Центру сертифікації (CA) можливе приєднання до "
-"небезпечних, зловмисних мереж.  Вибрати сертифікат Центру сертифікації?"
 
-#: ../src/wireless-security/eap-method.c:289
-msgid "Choose CA Certificate"
-msgstr "Виберіть сертифікат CA"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:648
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/wireless-security/eap-method.c:452
+#, 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:651
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Сертифікати DER чи PEM (*.der, *.pem, *.crt, *.cer)"
 
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr "GTC"
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr "Виберіть файл PAC…"
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr "Файли PAC (*.pac)"
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr "Усі файли"
+
 #: ../src/wireless-security/eap-method-fast.ui.h:2
 msgid "Anonymous"
 msgstr "Анонімно"
@@ -2666,8 +3682,8 @@ msgid "PAC _file:"
 msgstr "_Файл PAC:"
 
 #: ../src/wireless-security/eap-method-fast.ui.h:7
-#: ../src/wireless-security/eap-method-peap.ui.h:7
-#: ../src/wireless-security/eap-method-ttls.ui.h:4
+#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../src/wireless-security/eap-method-ttls.ui.h:5
 msgid "_Inner authentication:"
 msgstr "Вн_утрішня автентифікація:"
 
@@ -2675,31 +3691,32 @@ msgstr "Вн_утрішня автентифікація:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Дозволити автоматичне перед_бачення PAC"
 
-#: ../src/wireless-security/eap-method-fast.c:261
-#: ../src/wireless-security/eap-method-peap.c:280
-msgid "GTC"
-msgstr "GTC"
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:399
-msgid "Choose a PAC file..."
-msgstr "Виберіть файл PAC…"
+#: ../src/wireless-security/eap-method-leap.c:69
+msgid "missing EAP-LEAP password"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:406
-msgid "PAC files (*.pac)"
-msgstr "Файли PAC (*.pac)"
+#: ../src/wireless-security/eap-method-peap.c:63
+#, c-format
+msgid "invalid EAP-PEAP CA certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-fast.c:410
-msgid "All files"
-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:263
-#: ../src/wireless-security/wireless-security.c:382
+#: ../src/wireless-security/eap-method-peap.c:287
+#: ../src/wireless-security/eap-method-ttls.c:318
+#: ../src/wireless-security/wireless-security.c:424
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:350
-#: ../src/wireless-security/eap-method-tls.c:416
-#: ../src/wireless-security/eap-method-ttls.c:350
+#: ../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 "Обрати сертифікат Центру сертифікації..."
 
@@ -2717,19 +3734,57 @@ msgstr "Версія 1"
 msgid "C_A certificate:"
 msgstr "Сертифікат C_A:"
 
-#: ../src/wireless-security/eap-method-peap.ui.h:8
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "Сертифікат C_A:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
 msgid "PEAP _version:"
 msgstr "Ве_рсія PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "_Запитувати цей пароль щоразу"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "Сертифікат C_A:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:246
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Використовувати секретні ключі без шифрування небезпечно"
 
-#: ../src/wireless-security/eap-method-tls.c:249
+#: ../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 "
@@ -2742,11 +3797,11 @@ msgstr ""
 "\n"
 "(Ви можете захистити секретний ключ за допомогою openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:410
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Обрати персональний сертифікат..."
 
-#: ../src/wireless-security/eap-method-tls.c:422
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Обрати секретний ключ..."
 
@@ -2758,27 +3813,44 @@ msgstr "_Посвідчення:"
 msgid "_User certificate:"
 msgstr "Сертифікат _користувача:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:4
+#: ../src/wireless-security/eap-method-tls.ui.h:5
 msgid "Private _key:"
 msgstr "Приватний кл_юч:"
 
-#: ../src/wireless-security/eap-method-tls.ui.h:5
+#: ../src/wireless-security/eap-method-tls.ui.h:6
 msgid "_Private key password:"
 msgstr "Па_роль до мережного ключа:"
 
-#: ../src/wireless-security/wireless-security.c:394
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "ШВИДКО"
 
-#: ../src/wireless-security/wireless-security.c:429
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Тунельний TLS"
 
-#: ../src/wireless-security/wireless-security.c:440
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "Захищено EAP (PEAP)"
 
@@ -2788,29 +3860,55 @@ msgstr "Захищено EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "Ав_тентифікація:"
 
-#: ../src/wireless-security/ws-wep-key.ui.h:1
-msgid "Open System"
-msgstr "Відкрита система"
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:2
-msgid "Shared Key"
-msgstr "Спільний ключ"
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
 
-#: ../src/wireless-security/ws-wep-key.ui.h:3
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:4
-msgid "2"
-msgstr "2"
-
 #: ../src/wireless-security/ws-wep-key.ui.h:5
-msgid "3"
-msgstr "3"
+msgid "Open System"
+msgstr "Відкрита система"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:6
-msgid "4"
-msgstr "4"
+msgid "Shared Key"
+msgstr "Спільний ключ"
 
 #: ../src/wireless-security/ws-wep-key.ui.h:7
 msgid "_Key:"
@@ -2824,6 +3922,253 @@ msgstr "П_оказати ключ"
 msgid "WEP inde_x:"
 msgstr "_Індекс WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Тип:"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Нове мобільне широкосмугове з'єднання(CDMA)..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Ви приєднані до мережі CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "Мережа CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Нове мобільне широкосмугове з'єднання(GSM)..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Ви приєднані до мережі GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "Мережа GSM."
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "Бездротові мережі (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "Бездротова мережа (%s)"
+
+#~ msgid "wireless is disabled"
+#~ msgstr "бездротову мержу вимкнено"
+
+#~ msgid "wireless is disabled by hardware switch"
+#~ msgstr "бездротову мержу вимкнено на апаратному рівні"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "Підготовка бездротового мережного з'єднання з «%s»..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "Налаштовування бездротового мережного з'єднання «%s»..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "Отримання адреси у бездротовій мережі для «%s»..."
+
+#~ msgid "Wireless network connection '%s' active"
+#~ msgstr "Бездротове мережне з'єднання «%s» встановлено"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "Мобільна радіомережа WiMAX (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "Мобільна радіомережа WiMAX"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Ви приєднані до мережі WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d дБ"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "невідомо"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "невідомо"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "Secondary DNS:"
+#~ msgstr "Вторинний DNS:"
+
+#~ msgid "Ternary DNS:"
+#~ msgstr "Трійкове DNS:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Увімкнути мобільну _радіомережу WiMAX"
+
+#~ msgid "_Help"
+#~ msgstr "_Довідка"
+
+#~ msgid "Any"
+#~ msgstr "Будь-який"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Віддавати перевагу 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Віддавати перевагу 2G (GPRS/EDGE)"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Адреса MAC _пристрою:"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Інфраструктура"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "Автоматично (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "Автоматично (PPP, лише адреса)"
+
+#~ msgid "Could not load Wired Security security user interface."
+#~ msgstr "Неможливо завантажити інтерфейс користувача безпеки радіомережі. "
+
+#~ msgid "Wireless"
+#~ msgstr "Бездротова мережа"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "Бездротова мережа %d"
+
+#~ msgid "_Save..."
+#~ msgstr "З_берегти..."
+
+#~ msgid "_Import"
+#~ msgstr "_Імпорт"
+
+#~ msgid "Connect _automatically"
+#~ msgstr "Підключати _автоматично"
+
+#~ msgid "A_vailable to all users"
+#~ msgstr "Доступно _всім користувачам"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Помилка збереження з'єднання"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "Властивість «%s» / «%s» — некоректна: %d"
+
+#~ msgid "An unknown error occurred."
+#~ msgstr "Невідома помилка."
+
+#~ msgid "Could not edit new connection"
+#~ msgstr "Не вдалось створити нове з'єднання"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "Не вдалось змінити імпортоване з'єднання"
+
+#~ msgid "No VPN plugin available. Please install one to enable this button."
+#~ msgstr ""
+#~ "Додаток VPN не доступний. Будь ласка, встановіть його, щоб активувати цю "
+#~ "кнопку."
+
+#~ msgid "_Edit..."
+#~ msgstr "_Змінити..."
+
+#~ msgid "_Delete..."
+#~ 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 "Ваш телефон готовий до роботи!"
+
+#~ msgid "%s Network"
+#~ msgstr "Мережа %s"
+
+#~ msgid "Error: %s"
+#~ msgstr "Помилка: %s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "Не вдалось створити з'єднання DUN: %s"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Помічник налаштовування мобільної мережі скасовано"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Невідомий тип телефону (не GSM чи CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "не вдалось приєднатися до телефону."
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "несподіваний розрив зв'язку з телефоном."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "вийшов термін виявлення телефону."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Виявлення параметрів телефону..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Адаптер Bluetooth типово має бути увімкнений до налаштовування "
+#~ "комутованого з'єднання."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (failed to connect to D-Bus: %s)."
+#~ msgstr ""
+#~ "Неможливо налаштувати Bluetooth (помилка при підключенні до D-Bus: %s)."
+
+#~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
+#~ msgstr "Неможливо налаштувати Bluetooth (помилка створення проксі D-Bus)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: %s)."
+#~ msgstr "Неможливо налаштувати Bluetooth (не знайдено NetworkManager: %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Використовувати мобільний телефон як мережний пристрій (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Доступ до Інтернету з використанням мобільного телефону (DUN)"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "Не вибраний сертифікат Центру Сертифікації"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "Без використання сертифікату Центру сертифікації (CA) можливе приєднання "
+#~ "до небезпечних, зловмисних мереж.  Вибрати сертифікат Центру сертифікації?"
+
 #~ msgid "Click on this icon to connect to a wireless network"
 #~ msgstr "Натисніть на цей значок для підключення до бездротової мережі"
 
@@ -2839,9 +4184,6 @@ msgstr "_Індекс WEP:"
 #~ msgid "_Security:"
 #~ msgstr "_Захист:"
 
-#~ msgid "C_onnect"
-#~ msgstr "_З'єднати"
-
 #~ msgid "Other Wireless Network..."
 #~ msgstr "Інша бездротова мережа..."
 
@@ -2851,9 +4193,6 @@ msgstr "_Індекс WEP:"
 #~ msgid "United Kingdom"
 #~ msgstr "Великобританія"
 
-#~ msgid "Network Manager"
-#~ msgstr "Менеджер мережі"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "Процес nm-applet вже запущений.\n"
 
diff --git a/po/ur.po b/po/ur.po
index 8ade4656..f8ac6f30 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -5,11 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=nm-applet\n"
-"POT-Creation-Date: 2010-01-21 02:01+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,1857 +19,3101 @@ msgstr ""
 "X-Poedit-Country: PAKISTAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../nm-applet.desktop.in.h:1
-msgid "Control your network connections"
-msgstr "اپنے نیٹ ورک اتصال کی ادارت کریں"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#, fuzzy
+msgid "Network"
+msgstr "ن_یٹ ورک:"
 
 #: ../nm-applet.desktop.in.h:2
-msgid "Network Manager"
-msgstr "نیٹ ورک منیجر"
+#, fuzzy
+msgid "Manage your network connections"
+msgstr "اپنے نیٹ ورک اتصال کی ادارت کریں"
 
-#: ../nm-applet.schemas.in.h:1
-msgid "Disable WiFi Create"
-msgstr "WiFi کو بنانا معطل کریں"
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "نیٹ ورک اتصال"
 
-#: ../nm-applet.schemas.in.h:2
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr "اپنے نیٹ ورک اتصال کی تبدیلی اور ادارت کریں"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
 msgid "Disable connected notifications"
 msgstr "متصل اطلاعات کو معطل کریں"
 
-#: ../nm-applet.schemas.in.h:3
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+#, 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
 msgid "Disable disconnected notifications"
 msgstr "غیر متصل اطلاعات کو معطل کریں"
 
-#: ../nm-applet.schemas.in.h:4
-msgid "Set this to TRUE to disable notifications when connecting to a network."
-msgstr "نیٹ ورک سے اتصال کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+#, 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
+#, fuzzy
+msgid "Disable VPN notifications"
+msgstr "متصل اطلاعات کو معطل کریں"
 
-#: ../nm-applet.schemas.in.h:5
-msgid "Set this to TRUE to disable notifications when disconnecting from a network."
-msgstr "نیٹ ورک سے اتصال منقطع کرنے کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when connecting to or "
+"disconnecting from a VPN."
+msgstr ""
+"نیٹ ورک سے اتصال منقطع کرنے کے دوران اطلاعات کو معطل کرنے کے لیے اسے TRUE "
+"کردیں."
 
-#: ../nm-applet.schemas.in.h:6
-msgid "Set this to TRUE to disable notifications when wireless networks are available."
-msgstr "وائیرلیس نیٹ ورک کی دستیابی پر اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
+#: ../org.gnome.nm-applet.gschema.xml.in.h:7
+msgid "Suppress networks available notifications"
+msgstr "زیریں نیٹ ورکس دستیابی اطلاعات"
 
-#: ../nm-applet.schemas.in.h:7
-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:8
+#, fuzzy
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+"وائیرلیس نیٹ ورک کی دستیابی پر اطلاعات کو معطل کرنے کے لیے اسے TRUE کردیں."
 
-#: ../nm-applet.schemas.in.h:8
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
 msgid "Stamp"
 msgstr "مہر"
 
-#: ../nm-applet.schemas.in.h:9
-msgid "Suppress networks available notifications"
-msgstr "زیریں نیٹ ورکس دستیابی اطلاعات"
-
-#: ../nm-applet.schemas.in.h:10
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
 msgid "Used to determine whether settings should be migrated to a new version."
-msgstr "یہ جاننے کے لیے استعمال ہوتا ہے کہ آیا ترتیبات نئے نسخے پر منتقل کی جانی چاہئیں یا نہیں."
+msgstr ""
+"یہ جاننے کے لیے استعمال ہوتا ہے کہ آیا ترتیبات نئے نسخے پر منتقل کی جانی "
+"چاہئیں یا نہیں."
 
-#: ../nm-connection-editor.desktop.in.h:1
-msgid "Manage and change your network connection settings"
-msgstr "اپنے نیٹ ورک اتصال کی تبدیلی اور ادارت کریں"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:11
+msgid "Disable WiFi Create"
+msgstr "WiFi کو بنانا معطل کریں"
 
-#: ../nm-connection-editor.desktop.in.h:2
-#: ../src/connection-editor/nm-connection-editor.glade.h:7
-msgid "Network Connections"
-msgstr "نیٹ ورک اتصال"
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+#, fuzzy
+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
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+#, fuzzy
+msgid "Ignore CA certificate"
+msgstr "CA سند منتخب کریں"
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "نیٹ ورک منیجر"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "نیٹ ورک منیجر"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "_متصل ہوں"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
+msgid "_Network name:"
+msgstr "_نیٹ ورک کا نام:"
+
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr ""
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+#, fuzzy
+msgid "Failed to add/activate connection"
+msgstr "Verbindung konnte nicht aktualisiert werden"
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+#, fuzzy
+msgid "Unknown error"
+msgstr "نامعلوم"
+
+#
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+#, fuzzy
+msgid "Connection failure"
+msgstr "اتصال کا اضافہ ناکام ہوگیا"
 
-#: ../src/applet-dbus-manager.c:165
+#: ../src/applet.c:399
+#, fuzzy
+msgid "Device disconnect failed"
+msgstr "غیر متصل"
+
+#: ../src/applet.c:404
+#, fuzzy
+msgid "Disconnect failure"
+msgstr "غیر متصل"
+
+#
+#: ../src/applet.c:434
+#, fuzzy
+msgid "Connection activation failed"
+msgstr "اتصال کا اضافہ ناکام ہوگیا"
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr "یہ پیغام دوبارہ مت دکھائیں"
+
+#: ../src/applet.c:844
 #, c-format
-msgid "An instance of nm-applet is already running.\n"
-msgstr "ایک nm-applet پہلے ہی چل رہا ہے.\n"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ نیٹ ورک اتصال میں مداخلت کی گئی."
 
-#: ../src/applet-dbus-manager.c:167
+#: ../src/applet.c:847
 #, c-format
-msgid "Could not acquire the %s service. (%d)\n"
-msgstr "سروس %s حاصل نہیں کی جاسکتی. (%d)\n"
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس غیر متوقعہ طور پر بند "
+"ہوگئی."
 
-#: ../src/applet-device-bt.c:171
-#: ../src/applet-device-cdma.c:291
-#: ../src/applet-device-gsm.c:284
-#: ../src/applet-device-wired.c:241
-#: ../src/applet-device-wifi.c:773
-msgid "Available"
-msgstr "دستیاب"
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس نے ناموزوں وضع کاری "
+"لوٹائی ہے."
 
-#: ../src/applet-device-bt.c:197
-#: ../src/applet-device-cdma.c:321
-#: ../src/applet-device-gsm.c:314
-#: ../src/applet-device-wired.c:270
+#: ../src/applet.c:853
 #, c-format
-msgid "You are now connected to '%s'."
-msgstr "آپ '%s' سے متصل ہیں."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ اتصال قائم کرنے کی کوششوں کا وقت "
+"تمام ہوگیا."
 
-#: ../src/applet-device-bt.c:201
-#: ../src/applet-device-cdma.c:325
-#: ../src/applet-device-gsm.c:318
-#: ../src/applet-device-wired.c:274
-#: ../src/applet-device-wifi.c:1220
-msgid "Connection Established"
-msgstr "اتصال قائم ہوگیا"
+#: ../src/applet.c:856
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس وقت پر نہیں چلی."
 
-#: ../src/applet-device-bt.c:202
-msgid "You are now connected to the mobile broadband network."
-msgstr "آپ اس وقت موبائل براڈ بینڈ نیٹ ورک سے متصل ہیں."
+#: ../src/applet.c:859
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس چلنے میں ناکام ہوگئی."
 
-#: ../src/applet-device-bt.c:228
-#: ../src/applet-device-cdma.c:352
-#: ../src/applet-device-gsm.c:345
+#: ../src/applet.c:862
 #, c-format
-msgid "Preparing mobile broadband connection '%s'..."
-msgstr "موبائل براڈ بینڈ اتصال '%s' تیار کیا جارہا ہے..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ کوئی موزوں وی پی این سیکرٹس نہیں ہیں."
 
-#: ../src/applet-device-bt.c:231
-#: ../src/applet-device-cdma.c:355
-#: ../src/applet-device-gsm.c:348
+#: ../src/applet.c:865
 #, c-format
-msgid "Configuring mobile broadband connection '%s'..."
-msgstr "موبائل براڈ بینڈ اتصال '%s' وضع کیا جارہا ہے..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' ناکام ہوگیا جی کی وجہ نا موزوں وی پی این سیکرٹس ہیں."
 
-#: ../src/applet-device-bt.c:234
-#: ../src/applet-device-cdma.c:358
-#: ../src/applet-device-gsm.c:351
+#: ../src/applet.c:872
 #, c-format
-msgid "User authentication required for mobile broadband connection '%s'..."
-msgstr "موبائل براڈ بینڈ اتصال '%s' کے لیے صارف کی توثیق درکار ہے..."
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' ناکام ہوگیا."
+
+#: ../src/applet.c:888
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' منقطع ہوگیا کیونکہ نیٹ ورک اتصال میں مداخلت کی گئی."
+
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' منقطع کردیا گیا کیونکہ وی پی این سروس رک گئی ہے."
+
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' منقطع کردیا گیا."
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr "وی پی این لاگ ان پیغام"
+
+#
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
+msgid "VPN Connection Failed"
+msgstr "وی پی این اتصال ناکام"
+
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس چلنے میں ناکام "
+"ہوگئی.\n"
+"\n"
+"%s"
+
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+"\n"
+"وی پی این اتصال '%s' چلنے میں ناکام.\n"
+"\n"
+"%s"
+
+#: ../src/applet.c:1280
+#, fuzzy
+msgid "device not ready (firmware missing)"
+msgstr "ڈیوائس تیار نہیں ہے"
+
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr "ڈیوائس تیار نہیں ہے"
+
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr "غیر متصل"
+
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr "غیر متصل"
+
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr "ڈیوائس کی ادارت نہیں کی گئی"
+
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr "کوئی نیٹ ورک ڈیوائس دستیاب نہیں ہے"
+
+#: ../src/applet.c:1449
+msgid "_VPN Connections"
+msgstr "_وی پی این اتصال"
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr "وی پی این _وضع کریں..."
+
+#: ../src/applet.c:1508
+#, fuzzy
+msgid "_Disconnect VPN"
+msgstr "وی پی این _منقطع کریں..."
+
+#: ../src/applet.c:1615
+msgid "NetworkManager is not running..."
+msgstr "نیٹ ورک منیجر نہیں چل رہا..."
+
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
+msgstr "نیٹ ورکنگ معطل ہے"
+
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
+msgid "Enable _Networking"
+msgstr "_نیٹ ورکنگ فعال کریں"
+
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+#, fuzzy
+msgid "Enable _Wi-Fi"
+msgstr "_وائیرلیس فعال کریں"
 
-#: ../src/applet-device-bt.c:237
-#: ../src/applet-device-cdma.c:361
-#: ../src/applet-device-gsm.c:354
-#: ../src/applet.c:2274
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr "_موبائل براڈ بینڈ فعال کریں"
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr "_اطلاعات فعال کریں"
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr "اتصال کی _معلومات"
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+msgid "Edit Connections..."
+msgstr "اتصال مدون کریں..."
+
+#: ../src/applet.c:1894
+msgid "_About"
+msgstr "_بابت"
+
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr "آپ '%s' سے متصل ہیں."
+
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr "غیر متصل"
+
+#: ../src/applet.c:2223
+msgid "The network connection has been disconnected."
+msgstr "نیٹ ورک اتصال منقطع کردیا گیا ہے."
+
+#: ../src/applet.c:2474
+#, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "نیٹ ورک اتصال '%s' تیار کیا جارہا ہے..."
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr "نیٹ ورک اتصال '%s' کے لیے صارف کی توثیق درکار ہے."
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "درخواست برائے نیٹ ورک '%s' بھیجی جارہی ہے..."
 
-#: ../src/applet-device-bt.c:241
-#: ../src/applet-device-cdma.c:365
-#: ../src/applet-device-gsm.c:358
+#: ../src/applet.c:2483
 #, c-format
-msgid "Mobile broadband connection '%s' active"
-msgstr "موبائل براڈ بینڈ اتصال '%s' فعال ہے"
+msgid "Network connection '%s' active"
+msgstr "نیٹ ورک اتصال '%s' فعال ہے"
 
-#: ../src/applet-device-cdma.c:150
-#: ../src/connection-editor/page-mobile.c:625
-msgid "CDMA"
-msgstr "CDMA"
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr "وی پی این اتصال '%s' چلایا جارہا ہے..."
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr "وی پی این اتصال '%s' کے لیے صارف کی توثیق درکار ہے..."
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr "'%s' کے لیے وی پی این پتہ کی درخواس کی جارہی ہے..."
+
+#: ../src/applet.c:2566
+#, c-format
+msgid "VPN connection '%s' active"
+msgstr "وی پی این اتصال '%s' فعال ہے"
+
+#: ../src/applet.c:2616
+msgid "No network connection"
+msgstr "کوئی نیٹ ورک اتصال نہیں"
+
+#: ../src/applet.c:3204
+msgid "NetworkManager Applet"
+msgstr "نیٹ ورک منیجر ایپلیٹ"
+
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr ""
 
-#: ../src/applet-device-cdma.c:222
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "نیا موبائل براڈ بینڈ (CDMA) اتصال..."
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr ""
 
-#: ../src/applet-device-cdma.c:261
-#: ../src/applet-device-gsm.c:260
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "موبائل براڈ بینڈ (%s)"
 
-#: ../src/applet-device-cdma.c:263
-#: ../src/applet-device-gsm.c:262
-#: ../src/connection-editor/page-mobile.c:326
-#: ../src/connection-editor/nm-connection-editor.glade.h:6
-#: ../src/connection-editor/nm-connection-list.c:1360
+#: ../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
 msgid "Mobile Broadband"
 msgstr "موبائل براڈ بینڈ"
 
-#: ../src/applet-device-cdma.c:326
-msgid "You are now connected to the CDMA network."
-msgstr "اب آپ CDMA نیٹ ورک سے متصل ہیں."
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "دستیاب"
 
-#: ../src/applet-device-cdma.c:495
-#: ../src/applet-device-gsm.c:570
-msgid "Mobile broadband network password"
-msgstr "موبائل براڈ بینڈ نیٹ ورک پاس ورڈ"
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+#, fuzzy
+msgid "New Mobile Broadband connection..."
+msgstr "نیا موبائل براڈ بینڈ اتصال"
 
-#: ../src/applet-device-cdma.c:504
-#: ../src/applet-device-gsm.c:579
-#, c-format
-msgid "A password is required to connect to '%s'."
-msgstr "نیٹ ورک '%s' سے اتصال قائم کرنے کے لیے پاس ورڈ درکار ہے."
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "اتصال قائم ہوگیا"
 
-#: ../src/applet-device-cdma.c:522
-#: ../src/applet-device-gsm.c:597
-msgid "Password:"
-msgstr "پاس ورڈ:"
+#: ../src/applet-device-broadband.c:816
+#, fuzzy
+msgid "You are now connected to the Mobile Broadband network."
+msgstr "آپ اس وقت موبائل براڈ بینڈ نیٹ ورک سے متصل ہیں."
 
-#: ../src/applet-device-gsm.c:152
-#: ../src/connection-editor/page-mobile.c:628
-msgid "GSM"
-msgstr "GSM"
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+#, fuzzy
+msgid "Mobile Broadband network."
+msgstr "موبائل براڈ بینڈ نیٹ ورک پاس ورڈ"
 
-#: ../src/applet-device-gsm.c:223
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "نیا موبائل براڈ بینڈ (GSM) اتصال..."
+#: ../src/applet-device-broadband.c:957
+#, fuzzy
+msgid "You are now registered on the home network."
+msgstr "اب آپ وائیرڈ نیٹ ورک سے متصل ہیں."
 
-#: ../src/applet-device-gsm.c:319
-msgid "You are now connected to the GSM network."
-msgstr "اب آپ جی ایس ایم (GSM) نیٹ ورک سے متصل ہیں."
+#: ../src/applet-device-broadband.c:963
+#, fuzzy
+msgid "You are now registered on a roaming network."
+msgstr "اب آپ وائیرڈ نیٹ ورک سے متصل ہیں."
 
-#: ../src/applet-device-gsm.c:510
-msgid "PIN code required"
-msgstr "پِن PIN کوڈ درکار ہے"
+#: ../src/applet-device-bt.c:88
+msgid "You are now connected to the mobile broadband network."
+msgstr "آپ اس وقت موبائل براڈ بینڈ نیٹ ورک سے متصل ہیں."
 
-#: ../src/applet-device-gsm.c:512
-msgid "PUK code required"
-msgstr "پَک PUK کوڈ درکار ہے"
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr "موبائل براڈ بینڈ اتصال '%s' تیار کیا جارہا ہے..."
 
-#: ../src/applet-device-gsm.c:521
-msgid "PIN code is needed for the mobile broadband device"
-msgstr "موبائل براڈ بینڈ ڈیوائس کے لیے پِن PIN کوڈ درکار ہے"
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr "موبائل براڈ بینڈ اتصال '%s' وضع کیا جارہا ہے..."
+
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr "موبائل براڈ بینڈ اتصال '%s' کے لیے صارف کی توثیق درکار ہے..."
 
-#: ../src/applet-device-gsm.c:523
-msgid "PUK code is needed for the mobile broadband device"
-msgstr "موبائل براڈ بینڈ ڈیوائس کے لیے پَک PUK کوڈ درکار ہے"
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr "موبائل براڈ بینڈ اتصال '%s' فعال ہے"
 
-#: ../src/applet-device-wired.c:63
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "خودکار ایتھرنیٹ (Ethernet)"
 
-#: ../src/applet-device-wired.c:206
-#, c-format
-msgid "Wired Networks (%s)"
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "وائیرڈ نیٹ ورکس (%s)"
 
-#: ../src/applet-device-wired.c:208
-#, c-format
-msgid "Wired Network (%s)"
+#: ../src/applet-device-ethernet.c:84
+#, fuzzy, c-format
+msgid "Ethernet Network (%s)"
 msgstr "وائیرڈ نیٹ ورک (%s)"
 
-#: ../src/applet-device-wired.c:211
-msgid "Wired Networks"
+#: ../src/applet-device-ethernet.c:87
+#, fuzzy
+msgid "Ethernet Networks"
 msgstr "وائیرڈ نیٹ ورکس"
 
-#: ../src/applet-device-wired.c:213
-msgid "Wired Network"
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
 msgstr "وائیرڈ نیٹ ورک"
 
-#. Notify user of unmanaged or unavailable device
-#: ../src/applet-device-wired.c:233
-#: ../src/applet.c:1331
-msgid "disconnected"
-msgstr "غیر متصل"
-
-#: ../src/applet-device-wired.c:275
-msgid "You are now connected to the wired network."
+#: ../src/applet-device-ethernet.c:133
+#, fuzzy
+msgid "You are now connected to the ethernet network."
 msgstr "اب آپ وائیرڈ نیٹ ورک سے متصل ہیں."
 
-#: ../src/applet-device-wired.c:301
-#, c-format
-msgid "Preparing wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:161
+#, fuzzy, c-format
+msgid "Preparing ethernet network connection '%s'..."
 msgstr "وائیرڈ نیٹ ورک اتصال '%s' تیار کیا جارہا ہے..."
 
-#: ../src/applet-device-wired.c:304
-#, c-format
-msgid "Configuring wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:164
+#, fuzzy, c-format
+msgid "Configuring ethernet network connection '%s'..."
 msgstr "وائیرڈ نیٹ ورک اتصال '%s' وضع کیا جارہا ہے..."
 
-#: ../src/applet-device-wired.c:307
-#, c-format
-msgid "User authentication required for wired network connection '%s'..."
+#: ../src/applet-device-ethernet.c:167
+#, fuzzy, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "وائیرڈ نیٹ ورک اتصال '%s' کے لیے صارف کی توثیق درکار ہے..."
 
-#: ../src/applet-device-wired.c:310
-#, c-format
-msgid "Requesting a wired network address for '%s'..."
+#: ../src/applet-device-ethernet.c:170
+#, fuzzy, c-format
+msgid "Requesting an ethernet network address for '%s'..."
 msgstr "وائیرڈ نیٹ ورک پتہ کی درخواست برائے '%s' کی جارہی ہے..."
 
-#: ../src/applet-device-wired.c:314
-#, c-format
-msgid "Wired network connection '%s' active"
+#: ../src/applet-device-ethernet.c:174
+#, fuzzy, c-format
+msgid "Ethernet network connection '%s' active"
 msgstr "وائیرڈ نیٹ ورک اتصال '%s' فعال ہے"
 
-#: ../src/applet-device-wired.c:565
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "ڈی ایس ایل DSL توثیق"
 
-#: ../src/applet-device-wifi.c:88
-msgid "_Connect to Hidden Wireless Network..."
+#: ../src/applet-device-wifi.c:230
+#, fuzzy
+msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "پوشیدہ وائیرلیس نیٹ ورک سے _متصل ہوں..."
 
-#: ../src/applet-device-wifi.c:121
-msgid "Create _New Wireless Network..."
+#: ../src/applet-device-wifi.c:281
+#, fuzzy
+msgid "Create _New Wi-Fi Network..."
 msgstr "_نیا وائیرلیس نیٹ ورک بنائیں..."
 
-#: ../src/applet-device-wifi.c:705
-#, c-format
-msgid "Wireless Networks (%s)"
-msgstr "وائیرلیس نیٹ ورکس (%s)"
+#: ../src/applet-device-wifi.c:431
+msgid "(none)"
+msgstr "(کچھ نہیں)"
 
-#: ../src/applet-device-wifi.c:707
-#, c-format
-msgid "Wireless Network (%s)"
-msgstr "وائیرلیس نیٹ ورک (%s)"
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "وائیرڈ نیٹ ورکس (%s)"
+
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "وائیرڈ نیٹ ورک (%s)"
 
-#: ../src/applet-device-wifi.c:709
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
-msgstr[0] "وائیرلیس نیٹ ورک"
-msgstr[1] "وائیرلیس نیٹ ورکس"
+#: ../src/applet-device-wifi.c:905
+#, fuzzy
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
+msgstr[0] "وائیرڈ نیٹ ورک"
+msgstr[1] "وائیرڈ نیٹ ورک"
 
-#: ../src/applet-device-wifi.c:739
-msgid "wireless is disabled"
+#: ../src/applet-device-wifi.c:934
+#, fuzzy
+msgid "Wi-Fi is disabled"
 msgstr "وائیرلیس معطل ہے"
 
-#: ../src/applet-device-wifi.c:800
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "مزید نیٹ ورک"
 
-#: ../src/applet-device-wifi.c:1010
-msgid "Wireless Networks Available"
+#: ../src/applet-device-wifi.c:1180
+#, fuzzy
+msgid "Wi-Fi Networks Available"
 msgstr "وائیرلیس نیٹ ورک دستیاب ہیں"
 
-#: ../src/applet-device-wifi.c:1011
-msgid "Click on this icon to connect to a wireless network"
+#: ../src/applet-device-wifi.c:1181
+#, fuzzy
+msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "وائیرلیس نیٹ ورک سے متصل ہونے کے لیے اس آئکن پر کلک کریں"
 
-#: ../src/applet-device-wifi.c:1014
-#: ../src/applet.c:692
-msgid "Don't show this message again"
-msgstr "یہ پیغام دوبارہ مت دکھائیں"
-
-#: ../src/applet-device-wifi.c:1218
-#, c-format
-msgid "You are now connected to the wireless network '%s'."
+#: ../src/applet-device-wifi.c:1364
+#, fuzzy, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "اب آپ وائیرلیس نیٹ ورک '%s' سے متصل ہیں."
 
-#: ../src/applet-device-wifi.c:1219
-#: ../src/applet-device-wifi.c:1250
-msgid "(none)"
-msgstr "(کچھ نہیں)"
-
-#: ../src/applet-device-wifi.c:1260
-#, c-format
-msgid "Preparing wireless network connection '%s'..."
-msgstr "وائیرلیس نیٹ ورک اتصال '%s' تیار کیا جارہا ہے..."
+#: ../src/applet-device-wifi.c:1399
+#, fuzzy, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr "نیٹ ورک اتصال '%s' تیار کیا جارہا ہے..."
 
-#: ../src/applet-device-wifi.c:1263
-#, c-format
-msgid "Configuring wireless network connection '%s'..."
-msgstr "وائیرلیس نیٹ ورک اتصال '%s' وضع کیا جارہا ہے..."
+#: ../src/applet-device-wifi.c:1402
+#, fuzzy, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr "وائیرڈ نیٹ ورک اتصال '%s' وضع کیا جارہا ہے..."
 
-#: ../src/applet-device-wifi.c:1266
-#, c-format
-msgid "User authentication required for wireless network '%s'..."
+#: ../src/applet-device-wifi.c:1405
+#, fuzzy, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "وائیرلیس نیٹ ورک '%s' کے لیے صارف کی توثیق درکار ہے..."
 
-#: ../src/applet-device-wifi.c:1269
-#, c-format
-msgid "Requesting a wireless network address for '%s'..."
-msgstr "وائیرلیس نیٹ ورک پتہ کی درخواست برائے '%s' بھیجی جارہی ہے..."
+#: ../src/applet-device-wifi.c:1408
+#, fuzzy, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr "درخواست برائے نیٹ ورک '%s' بھیجی جارہی ہے..."
 
-#: ../src/applet-device-wifi.c:1289
-#, c-format
-msgid "Wireless network connection '%s' active: %s (%d%%)"
+#: ../src/applet-device-wifi.c:1419
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "وائیرلیس نیٹ ورک اتصال '%s' فعال ہے: %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1293
-#, c-format
-msgid "Wireless network connection '%s' active"
-msgstr "وائیرلیس نیٹ ورک اتصال '%s' فعال ہے"
+#: ../src/applet-device-wifi.c:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "وائیرڈ نیٹ ورک اتصال '%s' فعال ہے"
+
+#: ../src/applet-device-wifi.c:1442
+#, fuzzy
+msgid "Failed to activate connection"
+msgstr "Verbindung konnte nicht aktualisiert werden"
+
+#: ../src/applet-device-wifi.c:1465
+#, fuzzy
+msgid "Failed to add new connection"
+msgstr "نیا اتصال مدون نہیں ہوسکتا"
 
-#: ../src/applet-dialogs.c:53
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "اتصال کی معلومات دکھانے میں غلطی:"
 
-#: ../src/applet-dialogs.c:84
-#: ../src/connection-editor/page-wireless-security.c:284
-#: ../src/wireless-dialog.c:925
-#: ../src/wireless-security/wireless-security.c:340
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:86
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "حرکی WEP"
 
-#: ../src/applet-dialogs.c:88
-#: ../src/applet-dialogs.c:189
-#: ../src/applet-dialogs.c:191
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:187
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "_میک MAC پتہ:"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:195
-#: ../src/applet-dialogs.c:204
-#: ../src/connection-editor/page-wireless-security.c:238
-#: ../src/wireless-dialog.c:882
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+#, fuzzy
+msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "کچھ نہیں"
 
-#: ../src/applet-dialogs.c:207
-#: ../src/applet-dialogs.c:279
-#: ../src/applet-dialogs.c:380
-msgid "Unknown"
-msgstr "نامعلوم"
+#: ../src/applet-dialogs.c:260
+#, fuzzy, c-format
+msgid "%s (default)"
+msgstr "طے شدہ"
 
-#: ../src/applet-dialogs.c:277
-#: ../src/applet-dialogs.c:378
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u م.ب/s"
 
-#: ../src/applet-dialogs.c:309
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+#, fuzzy
+msgctxt "Speed"
+msgid "Unknown"
+msgstr "نامعلوم"
+
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+#, fuzzy
+msgctxt "Address"
+msgid "Unknown"
+msgstr "نامعلوم"
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "آئی پی پتہ:"
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr "نشریہ پتہ:"
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+#, fuzzy
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr "نامعلوم"
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "سب-نیٹ ماسک:"
+
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "ایتھرنیٹ (%s)"
 
-#: ../src/applet-dialogs.c:311
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:313
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:315
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:320
+#. --- General ---
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
+msgid "General"
+msgstr ""
+
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "مواجہ:"
 
-#: ../src/applet-dialogs.c:336
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "ہارڈویئر پتہ:"
 
-#: ../src/applet-dialogs.c:346
+#. Driver
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "ڈرائیور:"
 
-#: ../src/applet-dialogs.c:384
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "رفتار:"
 
-#: ../src/applet-dialogs.c:393
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "سیکورٹی:"
 
-#: ../src/applet-dialogs.c:413
-msgid "IP Address:"
-msgstr "آئی پی پتہ:"
-
-#: ../src/applet-dialogs.c:429
-msgid "Broadcast Address:"
-msgstr "نشریہ پتہ:"
-
-#: ../src/applet-dialogs.c:440
-msgid "Subnet Mask:"
-msgstr "سب-نیٹ ماسک:"
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+msgid "IPv4"
+msgstr ""
 
-#: ../src/applet-dialogs.c:452
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
 msgid "Default Route:"
 msgstr "طے شدہ راؤٹ:"
 
-#: ../src/applet-dialogs.c:467
-msgid "Primary DNS:"
-msgstr "ابتدائی DNS:"
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+msgid "IPv6"
+msgstr ""
+
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+#, fuzzy
+msgid "Ignored"
+msgstr "نظر انداز کریں"
+
+#: ../src/applet-dialogs.c:815
+#, fuzzy
+msgid "VPN Type:"
+msgstr "Schlüsseltyp:"
+
+#: ../src/applet-dialogs.c:822
+#, fuzzy
+msgid "VPN Gateway:"
+msgstr "گیٹ وے"
+
+#: ../src/applet-dialogs.c:828
+#, fuzzy
+msgid "VPN Username:"
+msgstr "صا_رف کا نام:"
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "ا_تصال:"
 
-#: ../src/applet-dialogs.c:478
-msgid "Secondary DNS:"
-msgstr "ثانوی DNS:"
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr "نامعلوم"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:541
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "کوئی موزوں فعال اتصال نہیں پائے گئے!"
 
-#: ../src/applet-dialogs.c:667
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2008 Red Hat, Inc.\n"
-"Copyright © 2005-2008 Novell, Inc."
+"Copyright © 2004-2014 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:669
-msgid "Notification area applet for managing your network devices and connections."
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
 msgstr "آپ کے نیٹ ورک آلوں اور اتصال کی ادارت کے لیے اطلاعی علاقہ ایپلیٹ"
 
-#: ../src/applet-dialogs.c:671
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "نیٹ ورک منیجر ویب سائٹ"
 
-#: ../src/applet-dialogs.c:674
-msgid "translator-credits"
-msgstr ""
-"محمد علی مکی <makkiabufaris@aol.com>\n"
-"مکی کا بلاگ <http://makki.urducoder.com>\n"
-"اردو کوڈر لینکس فورم <http://www.urducoder.com>"
-
-#: ../src/applet-dialogs.c:690
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "مفقود وسائل"
 
-#: ../src/applet.c:816
+#: ../src/applet-dialogs.c:1030
+msgid "Mobile broadband network password"
+msgstr "موبائل براڈ بینڈ نیٹ ورک پاس ورڈ"
+
+#: ../src/applet-dialogs.c:1039
 #, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the network connection was interrupted."
-msgstr ""
-"\n"
-"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ نیٹ ورک اتصال میں مداخلت کی گئی."
+msgid "A password is required to connect to '%s'."
+msgstr "نیٹ ورک '%s' سے اتصال قائم کرنے کے لیے پاس ورڈ درکار ہے."
+
+#: ../src/applet-dialogs.c:1054
+msgid "Password:"
+msgstr "پاس ورڈ:"
 
-#: ../src/applet.c:819
+#: ../src/applet-dialogs.c:1336
+#, fuzzy
+msgid "SIM PIN unlock required"
+msgstr "پِن PIN کوڈ درکار ہے"
+
+#: ../src/applet-dialogs.c:1337
+#, fuzzy
+msgid "SIM PIN Unlock Required"
+msgstr "پِن PIN کوڈ درکار ہے"
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
 msgstr ""
-"\n"
-"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس غیر متوقعہ طور پر بند ہوگئی."
 
-#: ../src/applet.c:822
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service returned invalid configuration."
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+#, fuzzy
+msgid "PIN code:"
+msgstr "پِن PIN کوڈ درکار ہے"
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
 msgstr ""
-"\n"
-"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس نے ناموزوں وضع کاری لوٹائی ہے."
 
-#: ../src/applet.c:825
+#: ../src/applet-dialogs.c:1347
+#, fuzzy
+msgid "SIM PUK unlock required"
+msgstr "پَک PUK کوڈ درکار ہے"
+
+#: ../src/applet-dialogs.c:1348
+#, fuzzy
+msgid "SIM PUK Unlock Required"
+msgstr "پَک PUK کوڈ درکار ہے"
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the connection attempt timed out."
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
 msgstr ""
-"\n"
-"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ اتصال قائم کرنے کی کوششوں کا وقت تمام ہوگیا."
 
-#: ../src/applet.c:828
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service did not start in time."
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+#, fuzzy
+msgid "PUK code:"
+msgstr "پَک PUK کوڈ درکار ہے"
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
 msgstr ""
-"\n"
-"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس وقت پر نہیں چلی."
 
-#: ../src/applet.c:831
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start."
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
 msgstr ""
-"\n"
-"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس چلنے میں ناکام ہوگئی."
 
-#: ../src/applet.c:834
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because there were no valid VPN secrets."
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+msgid "Show PIN/PUK codes"
 msgstr ""
-"\n"
-"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ کوئی موزوں وی پی این سیکرٹس نہیں ہیں."
 
-#: ../src/applet.c:837
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' failed because of invalid VPN secrets."
+#: ../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 ""
-"\n"
-"وی پی این اتصال '%s' ناکام ہوگیا جی کی وجہ نا موزوں وی پی این سیکرٹس ہیں."
 
-#: ../src/applet.c:844
-#, c-format
+#: ../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
 msgid ""
-"\n"
-"The VPN connection '%s' failed."
+"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: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
+msgid "_Add"
 msgstr ""
-"\n"
-"وی پی این اتصال '%s' ناکام ہوگیا."
 
-#: ../src/applet.c:862
-#, c-format
+#. 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
+#, fuzzy
+msgid "_Delete"
+msgstr "حذف"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+#, 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
 msgid ""
-"\n"
-"The VPN connection '%s' disconnected because the network connection was interrupted."
+"If enabled, this connection will never be used as the default network "
+"connection."
 msgstr ""
-"\n"
-"وی پی این اتصال '%s' منقطع ہوگیا کیونکہ نیٹ ورک اتصال میں مداخلت کی گئی."
+"اگر فعال کیا گیا تو یہ اتصال کبھی بھی طے شدہ نیٹ ورک اتصال کے طور پر استعمال "
+"نہیں کیا جائے گا."
+
+#: ../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/applet.c:865
-#, c-format
+#: ../src/connection-editor/ce-new-connection.ui.h:3
+msgid "Create…"
+msgstr "بنائیں..."
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+#, fuzzy
+msgid "Choose a Connection Type"
+msgstr "Eine UTMS-Verbindung erstellen"
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+#, fuzzy
 msgid ""
+"Select the type of connection you wish to create.\n"
 "\n"
-"The VPN connection '%s' disconnected because the VPN service stopped."
+"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."
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">وی پی این VPN اتصال کی نوعیت منتخب "
+"کریں</span>\n"
 "\n"
-"وی پی این اتصال '%s' منقطع کردیا گیا کیونکہ وی پی این سروس رک گئی ہے."
+"نئے اتصال کے لیے وی پی این کی نوعیت منتخب کریں.  اگر جو اتصال آپ بنانا چاہیں "
+"فہرست میں موجود نہ ہو تو ممکنہ طور پر آپ کے پاس درست وی پی این پلگ ان نصب "
+"نہیں ہے."
 
-#: ../src/applet.c:871
-#, c-format
-msgid ""
-"\n"
-"The VPN connection '%s' disconnected."
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
 msgstr ""
-"\n"
-"وی پی این اتصال '%s' منقطع کردیا گیا."
 
-#: ../src/applet.c:902
-msgid "VPN Login Message"
-msgstr "وی پی این لاگ ان پیغام"
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
 
-#
-#: ../src/applet.c:914
-#: ../src/applet.c:922
-#: ../src/applet.c:969
-msgid "VPN Connection Failed"
-msgstr "وی پی این اتصال ناکام"
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
 
-#: ../src/applet.c:976
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+#, fuzzy
+msgid "Broadcast"
+msgstr "نشریہ پتہ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+#, fuzzy
+msgid "ARP"
+msgstr "EAP"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "ا_تصال:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+#, fuzzy
+msgid "_Edit"
+msgstr "تدوین"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+#, fuzzy
+msgid "_Interface name:"
+msgstr "مواجہ:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
-"\n"
-"The VPN connection '%s' failed because the VPN service failed to start.\n"
-"\n"
-"%s"
+"An IP address, or a comma-separated list of IP addresses, to look for when "
+"checking the link status."
 msgstr ""
-"\n"
-"وی پی این اتصال '%s' ناکام ہوگیا کیونکہ وی پی این سروس چلنے میں ناکام ہوگئی.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:979
-#, c-format
+#: ../src/connection-editor/ce-page-bond.ui.h:21
+msgid "Link _up delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+#, fuzzy
+msgid "_Primary:"
+msgstr "ابتدائی DNS:"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
-"\n"
-"The VPN connection '%s' failed to start.\n"
-"\n"
-"%s"
+"The interface name of the primary device. If set, this device will always be "
+"the active slave when it is available."
 msgstr ""
-"\n"
-"وی پی این اتصال '%s' چلنے میں ناکام.\n"
-"\n"
-"%s"
 
-#: ../src/applet.c:1322
-msgid "device not ready"
-msgstr "ڈیوائس تیار نہیں ہے"
+#: ../src/connection-editor/ce-page-bond.ui.h:25
+#: ../src/connection-editor/ce-page-ethernet.ui.h:17
+#: ../src/connection-editor/ce-page-infiniband.ui.h:4
+#: ../src/connection-editor/ce-page-team.ui.h:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+msgid "_MTU:"
+msgstr ""
 
-#: ../src/applet.c:1347
-msgid "Disconnect"
-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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr "بائٹس"
 
-#: ../src/applet.c:1361
-msgid "device not managed"
-msgstr "ڈیوائس کی ادارت نہیں کی گئی"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+msgid "Path _cost:"
+msgstr ""
 
-#: ../src/applet.c:1407
-msgid "No network devices available"
-msgstr "کوئی نیٹ ورک ڈیوائس دستیاب نہیں ہے"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:2
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
+#, fuzzy
+msgid "_Priority:"
+msgstr "_سیکورٹی:"
 
-#: ../src/applet.c:1495
-msgid "_VPN Connections"
-msgstr "_وی پی این اتصال"
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:3
+msgid "_Hairpin mode:"
+msgstr ""
 
-#: ../src/applet.c:1548
-msgid "_Configure VPN..."
-msgstr "وی پی این _وضع کریں..."
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "وائیرڈ اتصال %d"
 
-#: ../src/applet.c:1552
-msgid "_Disconnect VPN..."
-msgstr "وی پی این _منقطع کریں..."
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
 
-#: ../src/applet.c:1639
-msgid "NetworkManager is not running..."
-msgstr "نیٹ ورک منیجر نہیں چل رہا..."
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
 
-#: ../src/applet.c:1644
-#: ../src/applet.c:2402
-msgid "Networking disabled"
-msgstr "نیٹ ورکنگ معطل ہے"
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
 
-#. 'Enable Networking' item
-#: ../src/applet.c:1861
-msgid "Enable _Networking"
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
 msgstr "_نیٹ ورکنگ فعال کریں"
 
-#. 'Enable Wireless' item
-#: ../src/applet.c:1870
-msgid "Enable _Wireless"
-msgstr "_وائیرلیس فعال کریں"
-
-#. 'Enable Mobile Broadband' item
-#: ../src/applet.c:1879
-msgid "Enable _Mobile Broadband"
-msgstr "_موبائل براڈ بینڈ فعال کریں"
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
 
-#. Toggle notifications item
-#: ../src/applet.c:1890
-msgid "Enable N_otifications"
-msgstr "_اطلاعات فعال کریں"
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
 
-#. 'Connection Information' item
-#: ../src/applet.c:1901
-msgid "Connection _Information"
-msgstr "اتصال کی _معلومات"
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
 
-#. 'Edit Connections...' item
-#: ../src/applet.c:1911
-msgid "Edit Connections..."
-msgstr "اتصال مدون کریں..."
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr "خودکار"
 
-#. Help item
-#: ../src/applet.c:1925
-msgid "_Help"
-msgstr "_ہدایات"
+#: ../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
+msgid "default"
+msgstr "طے شدہ"
 
-#. About item
-#: ../src/applet.c:1934
-msgid "_About"
-msgstr "_بابت"
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
 
-#: ../src/applet.c:2119
-msgid "Disconnected"
-msgstr "غیر متصل"
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "_میک MAC پتہ:"
 
-#: ../src/applet.c:2120
-msgid "The network connection has been disconnected."
-msgstr "نیٹ ورک اتصال منقطع کردیا گیا ہے."
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "پتہ"
 
-#: ../src/applet.c:2268
+#: ../src/connection-editor/ce-page.c:248
 #, c-format
-msgid "Preparing network connection '%s'..."
-msgstr "نیٹ ورک اتصال '%s' تیار کیا جارہا ہے..."
+msgid "invalid %s for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2271
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
 #, c-format
-msgid "User authentication required for network connection '%s'..."
-msgstr "نیٹ ورک اتصال '%s' کے لیے صارف کی توثیق درکار ہے."
+msgid "invalid %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2277
+#: ../src/connection-editor/ce-page.c:268
 #, c-format
-msgid "Network connection '%s' active"
-msgstr "نیٹ ورک اتصال '%s' فعال ہے"
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
 
-#: ../src/applet.c:2358
+#: ../src/connection-editor/ce-page.c:272
 #, c-format
-msgid "Starting VPN connection '%s'..."
-msgstr "وی پی این اتصال '%s' چلایا جارہا ہے..."
+msgid "invalid interface-name (%s)"
+msgstr ""
 
-#: ../src/applet.c:2361
-#, c-format
-msgid "User authentication required for VPN connection '%s'..."
-msgstr "وی پی این اتصال '%s' کے لیے صارف کی توثیق درکار ہے..."
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "کوئی بھی ڈیوائس"
 
-#: ../src/applet.c:2364
-#, c-format
-msgid "Requesting a VPN address for '%s'..."
-msgstr "'%s' کے لیے وی پی این پتہ کی درخواس کی جارہی ہے..."
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr "نا معلوم غلطی کی وجہ سے اتصال کے سیکرٹس کی تجدید نہیں ہوسکتی."
 
-#: ../src/applet.c:2367
-#, c-format
-msgid "VPN connection '%s' active"
-msgstr "وی پی این اتصال '%s' فعال ہے"
+#: ../src/connection-editor/ce-page-dcb.ui.h:1
+#, fuzzy
+msgid "Use Data Center Bridging (DCB) for this connection"
+msgstr "اس اتصال کے لیے 802.1X سیکورٹی استعمال کریں"
 
-#: ../src/applet.c:2406
-msgid "No network connection"
-msgstr "کوئی نیٹ ورک اتصال نہیں"
+#: ../src/connection-editor/ce-page-dcb.ui.h:2
+msgid "FCoE"
+msgstr ""
 
-#: ../src/applet.c:2753
-msgid "The NetworkManager applet could not find some required resources.  It cannot continue.\n"
-msgstr "نیٹ ورک منیجر ایپلیٹ کچھ درکار وسائل تلاش نہیں کر پا رہا. یہ جاری نہیں رہ سکتا.\n"
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
 
-#: ../src/applet.c:2948
-msgid "NetworkManager Applet"
-msgstr "نیٹ ورک منیجر ایپلیٹ"
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
 
-#: ../src/applet.c:2954
-#: ../src/wired-dialog.c:128
-msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)."
-msgstr "نیٹ ورک منیجر ایپلیٹ کچھ درکار وسائل تلاش نہیں کر پا رہا (گلیڈ glade فائل نہیں مل سکی)."
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
 
-#: ../src/applet.glade.h:1
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:1
-msgid " "
-msgstr " "
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
 
-#: ../src/applet.glade.h:2
-msgid ""
-"1 (Default)\n"
-"2\n"
-"3\n"
-"4"
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
 msgstr ""
-"1 (طے-شدہ)\n"
-"2\n"
-"3\n"
-"4"
 
-#: ../src/applet.glade.h:6
-msgid "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">فعال نیٹ ورک اتصال</span>"
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
 
-#: ../src/applet.glade.h:7
-msgid "Anony_mous identity:"
-msgstr "_نامعلوم پہچان:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
 
-#: ../src/applet.glade.h:8
-msgid ""
-"Automatic\n"
-"Version 0\n"
-"Version 1"
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
 msgstr ""
-"خودکار\n"
-"نسخہ 0\n"
-"نسخہ 1"
 
-#: ../src/applet.glade.h:11
-msgid "C_A certificate:"
-msgstr "CA _سند:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
 
-#: ../src/applet.glade.h:12
-msgid "C_onnect"
-msgstr "_متصل ہوں"
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
 
-#: ../src/applet.glade.h:13
-msgid "C_onnection:"
-msgstr "ا_تصال:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
 
-#: ../src/applet.glade.h:14
-msgid "Connection Information"
-msgstr "اتصال کی معلومات"
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
 
-#: ../src/applet.glade.h:15
-msgid "Don't _warn me again"
-msgstr "مجھے دوبارہ _متنبہ مت کریں"
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
 
-#: ../src/applet.glade.h:16
-msgid "I_dentity:"
-msgstr "شناخت:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
 
-#: ../src/applet.glade.h:17
-msgid "I_nner authentication:"
-msgstr "داخلی توثیق:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
 
-#: ../src/applet.glade.h:18
-msgid "No"
-msgstr "نہیں"
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
 
-#: ../src/applet.glade.h:19
-msgid ""
-"Open System\n"
-"Shared Key"
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
 msgstr ""
-"کھلا نظام\n"
-"شیئرڈ کلید"
 
-#: ../src/applet.glade.h:21
-msgid "Other Wireless Network..."
-msgstr "دوسرے وائیرلیس نیٹ ورک..."
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
 
-#: ../src/applet.glade.h:22
-msgid "Private _key:"
-msgstr "نجی _کلید:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
 
-#: ../src/applet.glade.h:23
-msgid "Select A File"
-msgstr "فائل منتخب کریں"
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
 
-#: ../src/applet.glade.h:24
-msgid "Sho_w key"
-msgstr "کلید _دکھائیں"
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
 
-#: ../src/applet.glade.h:25
-#: ../src/connection-editor/ce-page-dsl.glade.h:1
-msgid "Sho_w password"
-msgstr "پاس ورڈ د_کھائیں"
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
 
-#: ../src/applet.glade.h:26
-msgid "WEP inde_x:"
-msgstr "WEP inde_x:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
 
-#: ../src/applet.glade.h:27
-msgid "Wireless _adapter:"
-msgstr "وائیرلیس ا_ڈاپٹر:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
 
-#: ../src/applet.glade.h:28
-msgid "Yes"
-msgstr "ہاں"
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
 
-#: ../src/applet.glade.h:29
-msgid "_Authentication:"
-msgstr "_توثیق:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
 
-#: ../src/applet.glade.h:30
-msgid "_Key:"
-msgstr "_کلید:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
 
-#: ../src/applet.glade.h:31
-msgid "_Network name:"
-msgstr "_نیٹ ورک کا نام:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
 
-#: ../src/applet.glade.h:32
-msgid "_PEAP version:"
-msgstr "_PEAP نسخہ:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
 
-#: ../src/applet.glade.h:33
-#: ../src/connection-editor/ce-page-dsl.glade.h:2
-#: ../src/connection-editor/ce-page-mobile.glade.h:15
-msgid "_Password:"
-msgstr "_پاس ورڈ:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
 
-#: ../src/applet.glade.h:34
-msgid "_Private key password:"
-msgstr "_نجی کلید پاس ورڈ:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
 
-#: ../src/applet.glade.h:35
-#: ../src/connection-editor/ce-page-mobile.glade.h:16
-msgid "_Type:"
-msgstr "_نوعیت:"
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
+msgid "Traffic Class:"
+msgstr ""
 
-#: ../src/applet.glade.h:36
-msgid "_User certificate:"
-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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
 
-#: ../src/applet.glade.h:37
-#: ../src/connection-editor/ce-page-dsl.glade.h:4
-#: ../src/connection-editor/ce-page-mobile.glade.h:17
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:"
 msgstr "صا_رف کا نام:"
 
-#: ../src/applet.glade.h:38
-msgid "Wireless _security:"
-msgstr "_وائیرلیس سیکورٹی:"
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+msgid "_Service:"
+msgstr "_سروس:"
 
-#: ../src/connection-editor/ce-page.c:69
-msgid "automatic"
+#: ../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
+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:"
+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-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
+msgid "Automatic"
 msgstr "خودکار"
 
-#: ../src/connection-editor/ce-page.c:221
-#: ../src/connection-editor/nm-connection-editor.c:623
-msgid "Failed to update connection secrets due to an unknown error."
-msgstr "نا معلوم غلطی کی وجہ سے اتصال کے سیکرٹس کی تجدید نہیں ہوسکتی."
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-dsl.glade.h:3
-msgid "_Service:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+#, fuzzy
+msgid "10 Mb/s"
+msgstr "م.ب/س"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+#, fuzzy
+msgid "100 Mb/s"
+msgstr "%u م.ب/s"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr "_پورٹ:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr "_رفتار:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr "بھرپور _دو جُزی"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr "خودکار-فیصلہ"
+
+#: ../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
+#, fuzzy
+msgid "_Device:"
 msgstr "_سروس:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:1
-#: ../src/connection-editor/ce-page-ip6.glade.h:1
-msgid "<b>Addresses</b>"
-msgstr "<b>پتے</b>"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#, fuzzy
+msgid "C_loned MAC address:"
+msgstr "_میک MAC پتہ:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:2
-#: ../src/connection-editor/ce-page-ip6.glade.h:2
+#: ../src/connection-editor/ce-page-ethernet.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:10
 msgid ""
-"Automatic\n"
-"Automatic with manual DNS settings\n"
-"Manual\n"
-"Link-Local\n"
-"Shared to other computers"
+"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 ""
-"خودکار\n"
-"خودکار بمع دستی DNS ترتیبات\n"
-"دستی\n"
-"ربط-لوکلl\n"
-"دوسرے کمپیوٹروں سے شیئر کردہ"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:7
-msgid "D_HCP client ID:"
-msgstr "DHCP _موکل آئی ڈی:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:8
-#: ../src/connection-editor/ce-page-ip6.glade.h:7
-msgid "Domains used when resolving host names. Use commas to separate multiple domains."
-msgstr "ڈومین نام جو ہوسٹ ناموں کو حل کرنے کے لیے استعمال ہوں گے. متعدد ڈومینوں کو کوما سے الگ کریں."
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "طے شدہ"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:9
-#: ../src/connection-editor/ce-page-ip6.glade.h:8
-msgid "IP addresses identify your computer on the network.  Click the \"Add\" button to add an IP address."
-msgstr "آئی پی پتے نیٹ ورک پر آپ کے کمپیوٹر کی پہچان ہوتے ہیں.  کوئی آئی پی پتہ شامل کرنے کے لیے \"شامل کریں\" کے بٹن پر کلک کریں"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "نظر انداز کریں"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:10
-#: ../src/connection-editor/ce-page-ip6.glade.h:9
-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-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:11
-#: ../src/connection-editor/ce-page-ip6.glade.h:10
-msgid "If enabled, this connection will never be used as the default network connection."
-msgstr "اگر فعال کیا گیا تو یہ اتصال کبھی بھی طے شدہ نیٹ ورک اتصال کے طور پر استعمال نہیں کیا جائے گا."
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:12
-#: ../src/connection-editor/ce-page-ip6.glade.h:11
-msgid "Ig_nore automatically obtained routes"
-msgstr "خودکار حاصل ہونے والے روٹ _نظر انداز کریں"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:13
-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 موکل شناخت کنندہ استعمال کرنا چاہیں تو اسے یہاں داخل کریں."
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "نشریہ پتہ:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:14
-#: ../src/connection-editor/ce-page-ip6.glade.h:12
-msgid "Use this c_onnection only for resources on its network"
-msgstr "یہ ا_تصال صرف اس کے اپنے نیٹ ورک کے وسائل کے لیے استعمال کریں"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:15
-#: ../src/connection-editor/ce-page-ip6.glade.h:13
-msgid "DNS ser_vers:"
-msgstr "_ڈی این ایس سرور:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_نجی کلید پاس ورڈ:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+#, 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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+#, fuzzy
+msgid "Connected"
+msgstr "_متصل ہوں"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:16
-#: ../src/connection-editor/ce-page-ip6.glade.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr ""
+
+#: ../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 "دستی"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+#, 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:186
+#: ../src/connection-editor/page-ip6.c:204
+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:"
 msgstr "_اسلوب:"
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:17
-msgid "_Routes…"
-msgstr "_روٹس..."
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+#, fuzzy
+msgid "Addresses"
+msgstr "پتہ"
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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 موکل شناخت کنندہ استعمال کرنا "
+"چاہیں تو اسے یہاں داخل کریں."
 
-#: ../src/connection-editor/ce-page-ip4.glade.h:18
-#: ../src/connection-editor/ce-page-ip6.glade.h:16
-msgid "_Search domains:"
+#: ../src/connection-editor/ce-page-ip4.ui.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+"ڈومین نام جو ہوسٹ ناموں کو حل کرنے کے لیے استعمال ہوں گے. متعدد ڈومینوں کو "
+"کوما سے الگ کریں."
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr "DHCP _موکل آئی ڈی:"
+
+#: ../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
+#, fuzzy
+msgid "S_earch domains:"
 msgstr "_تلاش کے ڈومین:"
 
-#: ../src/connection-editor/ce-page-ip6.glade.h:15
-msgid "_Routes&#x2026;"
-msgstr "_روٹس&#x2026;"
+#: ../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:"
+msgstr "_ڈی این ایس سرور:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:1
-msgid "<b>Advanced</b>"
-msgstr "<b>اعلی</b>"
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+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-mobile.glade.h:2
-msgid "<b>Basic</b>"
-msgstr "<b>بنیادی</b>"
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:3
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
 msgid ""
-"Any\n"
-"3G (UMTS/HSPA)\n"
-"2G (GPRS/EDGE)\n"
-"Prefer 3G (UMTS/HSPA)\n"
-"Prefer 2G (GPRS/EDGE)"
+"When connecting to IPv6-capable networks, allows the connection to complete "
+"if IPv4 configuration fails but IPv6 configuration succeeds."
 msgstr ""
-"کوئی\n"
-"3G (UMTS/HSPA)\n"
-"2G (GPRS/EDGE)\n"
-"ترجیحاً 3G (UMTS/HSPA)\n"
-"ترجیحاً 2G (GPRS/EDGE)"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:8
-msgid "Change..."
-msgstr "تبدیل کریں..."
+#: ../src/connection-editor/ce-page-ip4.ui.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr "_روٹس..."
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:9
-msgid "N_etwork:"
-msgstr "ن_یٹ ورک:"
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#, fuzzy
+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-mobile.glade.h:10
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+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
+msgid "Basic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "_نمبر:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:11
-msgid "PI_N:"
-msgstr "PI_N:"
-
-#: ../src/connection-editor/ce-page-mobile.glade.h:12
-msgid "Sho_w passwords"
-msgstr "پاس ورڈ _دکھائیں"
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+#, fuzzy
+msgid "Advanced"
+msgstr "<b>اعلی</b>"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.glade.h:14
-msgid "_Band:"
-msgstr "_بینڈ:"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:1
-msgid "<b>Allowed Authentication Methods</b>"
-msgstr "<b>جائز توثیقی طریقے</b>"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:2
-msgid "<b>Authentication</b>"
-msgstr "<b>توثیق</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+#, fuzzy
+msgid "N_etwork ID:"
+msgstr "ن_یٹ ورک:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:3
-msgid "<b>Compression</b>"
-msgstr "<b>دباؤ</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr "تبدیل کریں..."
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:4
-msgid "<b>Echo</b>"
-msgstr "<b>ایکو</b>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:5
-msgid "<i>In most cases, the provider's PPP servers will support all authentication methods.  If connections fail, try disabling support for some methods.</i>"
-msgstr "<i>بیشتر حالتوں میں، PPP سرور کا فراہم کار تمام نوعیت کے توثیقی اسلوب کی معاونت کرے گا.  اگر اتصال ناکام ہوجائے، تو کچھ اسلوبوں کی معاونت معطل کر کے دیکھیں.</i>"
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:6
-msgid "Allow _BSD data compression"
-msgstr "_بی ایس ڈی BSD ڈیٹا دباؤ"
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Sho_w passwords"
+msgstr "پاس ورڈ _دکھائیں"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:7
-msgid "Allow _Deflate data compression"
-msgstr "_ڈیفلیٹ Deflate ڈیٹا دباؤ کی اجازت دیں"
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
+#, fuzzy
+msgid "Authentication"
+msgstr "_توثیق:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:8
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
 msgid "Allowed methods:"
 msgstr "مجاز اسلوب:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:9
-msgid "C_HAP"
-msgstr "C_HAP"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:10
-msgid "Challenge Handshake Authentication Protocol"
-msgstr "چلینج ہینڈ شیک توثیقی پروٹوکول"
-
-#: ../src/connection-editor/ce-page-ppp.glade.h:11
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
 msgid "Configure _Methods…"
 msgstr "ا_سلوب وضع کریں..."
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:12
-msgid "Extensible Authentication Protocol"
-msgstr "وسعت پذیر توثیقی پروٹوکول"
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+#, fuzzy
+msgid "Compression"
+msgstr "<b>دباؤ</b>"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:13
-msgid "MSCHAP v_2"
-msgstr "MSCHAP v_2"
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr "پوائینٹ ٹو پوائینٹ رمز نگاری (MPPE) اس_تعمال کریں"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:14
-msgid "Microsoft Challenge Handshake Authentication Protocol"
-msgstr "مائکروسوفٹ چیلنج ہینڈ شیک توثیقی پروٹوکول"
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
+msgid "_Require 128-bit encryption"
+msgstr "128-بِٹ رمز نگاری _درکار"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:15
-msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
-msgstr "مائکروسوفٹ چیلنج ہینڈ شیک توثیقی پروٹوکول نسخہ 2"
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+msgid "Use _stateful MPPE"
+msgstr "stateful MPPE _استعمال کریں"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:16
-msgid "Password Authentication Protocol"
-msgstr "پاس ورڈ توثیقی پروٹوکول"
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Allow _BSD data compression"
+msgstr "_بی ایس ڈی BSD ڈیٹا دباؤ"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:17
-msgid "Send PPP _echo packets"
-msgstr "پی پی پی _ایکو پیکٹ ارسال کریں"
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
+msgid "Allow _Deflate data compression"
+msgstr "_ڈیفلیٹ Deflate ڈیٹا دباؤ کی اجازت دیں"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:18
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
 msgid "Use TCP _header compression"
 msgstr "ٹی سی پی TCP ہیڈر دباؤ استعمال کریں"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:19
-msgid "Use _stateful MPPE"
-msgstr "stateful MPPE _استعمال کریں"
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:20
-msgid "_EAP"
-msgstr "_EAP"
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid "Send PPP _echo packets"
+msgstr "پی پی پی _ایکو پیکٹ ارسال کریں"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:21
-msgid "_MSCHAP"
-msgstr "_MSCHAP"
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:22
-msgid "_PAP"
-msgstr "_PAP"
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:23
-msgid "_Require 128-bit encryption"
-msgstr "128-بِٹ رمز نگاری _درکار"
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "ا_تصال:"
 
-#: ../src/connection-editor/ce-page-ppp.glade.h:24
-msgid "_Use point-to-point encryption (MPPE)"
-msgstr "پوائینٹ ٹو پوائینٹ رمز نگاری (MPPE) اس_تعمال کریں"
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.glade.h:1
-msgid "Aut_onegotiate"
-msgstr "خودکار-فیصلہ"
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+#, fuzzy
+msgid "_Parent interface:"
+msgstr "مواجہ:"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:2
-msgid ""
-"Automatic\n"
-"10 Mb/s\n"
-"100 Mb/s\n"
-"1 Gb/s\n"
-"10 Gb/s"
+#: ../src/connection-editor/ce-page-vlan.ui.h:2
+msgid "VLAN inter_face name:"
 msgstr ""
-"خودکار\n"
-"10 م.ب/س\n"
-"100 م.ب/س\n"
-"1 گ.ب/س\n"
-"10 گ.ب/س"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:7
-msgid ""
-"Automatic\n"
-"Twisted Pair (TP)\n"
-"Attachment Unit Interface (AUI)\n"
-"BNC\n"
-"Media Independent Interface (MII)"
+#: ../src/connection-editor/ce-page-vlan.ui.h:3
+#, fuzzy
+msgid "Cloned MAC _address:"
+msgstr "_میک MAC پتہ:"
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
 msgstr ""
-"خودکار\n"
-"گتھے ہوئے پیئر (TP)\n"
-"منسلکاتی اکائی مواجہ (AUI)\n"
-"BNC\n"
-"میڈیا مستقل مواجہ (MII)"
 
-#: ../src/connection-editor/ce-page-wired.glade.h:12
-msgid "Full duple_x"
-msgstr "بھرپور _دو جُزی"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.glade.h:13
-#: ../src/connection-editor/ce-page-wireless.glade.h:8
-msgid "MT_U:"
-msgstr "MT_U:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.glade.h:14
-#: ../src/connection-editor/ce-page-wireless.glade.h:13
-msgid "_MAC address:"
-msgstr "_میک MAC پتہ:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.glade.h:15
-msgid "_Port:"
-msgstr "_پورٹ:"
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+msgid "M_VRP"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.glade.h:16
-msgid "_Speed:"
-msgstr "_رفتار:"
+#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:13
+msgid "Device name + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wired.glade.h:17
-#: ../src/connection-editor/ce-page-wireless.glade.h:16
-msgid "bytes"
-msgstr "بائٹس"
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:1
-msgid ""
-"Automatic\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+#, fuzzy
+msgid "S_ecurity:"
+msgstr "سیکورٹی:"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
 msgstr ""
-"خودکار\n"
-"A (5 GHz)\n"
-"B/G (2.4 GHz)"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:4
-msgid "Ban_d:"
-msgstr "ب_ینڈ:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:5
-msgid "C_hannel:"
-msgstr "_چینل:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:6
-msgid ""
-"Infrastructure\n"
-"Ad-hoc"
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
 msgstr ""
-"ڈھانچہ\n"
-"Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:9
-msgid "M_ode:"
-msgstr "انداز:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:10
-msgid "Mb/s"
-msgstr "م.ب/س"
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "ترسیلی قوت:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:12
-msgid "_BSSID:"
-msgstr "_BSSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr "م.ب/س"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_ریٹ:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:15
-msgid "_SSID:"
-msgstr "_SSID:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wireless.glade.h:17
-msgid "mW"
-msgstr "mW"
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr "_چینل:"
 
-#: ../src/connection-editor/ce-page-wireless-security.glade.h:1
-msgid "_Security:"
-msgstr "_سیکورٹی:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr "ب_ینڈ:"
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:2
+#: ../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
+#, fuzzy
+msgid "Allowed Authentication Methods"
+msgstr "<b>جائز توثیقی طریقے</b>"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr "_EAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr "وسعت پذیر توثیقی پروٹوکول"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr "_PAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr "پاس ورڈ توثیقی پروٹوکول"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr "C_HAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr "چلینج ہینڈ شیک توثیقی پروٹوکول"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr "_MSCHAP"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr "مائکروسوفٹ چیلنج ہینڈ شیک توثیقی پروٹوکول"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr "MSCHAP v_2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr "مائکروسوفٹ چیلنج ہینڈ شیک توثیقی پروٹوکول نسخہ 2"
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+#, fuzzy
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Choose a VPN Connection Type</span>\n"
-"\n"
-"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."
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">وی پی این VPN اتصال کی نوعیت منتخب کریں</span>\n"
-"\n"
-"نئے اتصال کے لیے وی پی این کی نوعیت منتخب کریں.  اگر جو اتصال آپ بنانا چاہیں فہرست میں موجود نہ ہو تو ممکنہ طور پر آپ کے پاس درست وی پی این پلگ ان نصب نہیں ہے."
+"<i>بیشتر حالتوں میں، PPP سرور کا فراہم کار تمام نوعیت کے توثیقی اسلوب کی "
+"معاونت کرے گا.  اگر اتصال ناکام ہوجائے، تو کچھ اسلوبوں کی معاونت معطل کر کے "
+"دیکھیں.</i>"
+
+#: ../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)"
 
-#: ../src/connection-editor/ce-vpn-wizard.glade.h:5
-msgid "Create…"
-msgstr "بنائیں..."
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+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:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+msgid "Bridge"
+msgstr ""
 
-#: ../src/connection-editor/ip4-routes-dialog.c:501
-#: ../src/connection-editor/ip6-routes-dialog.c:459
-#: ../src/connection-editor/page-ip4.c:634
-#: ../src/connection-editor/page-ip6.c:611
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
+msgid "VLAN"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr "VPN"
+
+#: ../src/connection-editor/connection-helpers.c:196
+#, fuzzy
+msgid "Hardware"
+msgstr "ہارڈویئر پتہ:"
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+#, fuzzy
+msgid "Import a saved VPN configuration..."
+msgstr "وی پی این اتصال برآمد کریں..."
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr "نامعلوم غلطی کی بناء پر اتصال مدون ڈائیلاگ تیار نہیں ہوسکا."
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr "نیا اتصال نہیں بنایا جاسکتا"
+
+#
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr "اتصال حذف کرنے میں ناکامی"
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr "کیا آپ واقعی اتصال %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
 msgid "Address"
 msgstr "پتہ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:517
-#: ../src/connection-editor/page-ip4.c:650
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "نیٹ ماسک"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:533
-#: ../src/connection-editor/ip6-routes-dialog.c:491
-#: ../src/connection-editor/page-ip4.c:666
+#: ../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
 msgid "Gateway"
 msgstr "گیٹ وے"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:549
-#: ../src/connection-editor/ip6-routes-dialog.c:507
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "میٹرک"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:475
-#: ../src/connection-editor/page-ip6.c:627
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "پریفکس"
 
-#: ../src/connection-editor/page-dsl.c:140
-#: ../src/connection-editor/page-dsl.c:147
-msgid "Could not load DSL user interface."
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr "تدوین %s"
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr "بغیر-نام کے اتصال کی تدوین"
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "اتصال کا _نام:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "مدون کی تیاری میں غلطی"
+
+#
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "اتصال کا اضافہ ناکام ہوگیا"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+#, 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:419
+msgid "_Save"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr "اس اتصال کو اس مشین کے تمام صارفین کے لیے محفوظ کرنے کی تصدیق."
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+#, fuzzy
+msgid "Could not create connection"
+msgstr "نیا اتصال نہیں بنایا جاسکتا"
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr "اتصال مدون نہیں ہوسکتا"
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+#, fuzzy
+msgid "Unknown error creating connection editor dialog."
+msgstr "اتصال مدون کا ڈائیلاگ بنانے میں غلطی."
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr "مدون کی تیاری میں غلطی"
+
+#
+#: ../src/connection-editor/nm-connection-editor.c:921
+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
+msgid "Connection _name:"
+msgstr "اتصال کا _نام:"
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "برآمد"
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr "کبھی نہیں"
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr "ابھی"
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] "%d سال پہلے"
+msgstr[1] "%d سال پہلے"
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr "نام"
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr "آخری استعمال"
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr "منتخب کردہ اتصال مدون کریں"
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr "منتخب کردہ اتصال کی تدوین کی توثیق"
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr "منتخب کردہ اتصال حذف کریں"
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr "منتخب کردہ اتصال کو حذف کرنے کی توثیق"
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, fuzzy, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr "نیا اتصال نہیں بنایا جاسکتا"
+
+#: ../src/connection-editor/nm-connection-list.c:933
+#, fuzzy
+msgid "Error creating connection"
+msgstr "اتصال مدون کا ڈائیلاگ بنانے میں غلطی."
+
+#: ../src/connection-editor/nm-connection-list.c:955
+#, fuzzy
+msgid "Error editing connection"
+msgstr "Fehler beim Abrufen der VPN-Verbindung »%s«"
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr "802.1x سیکورٹی"
+
+#: ../src/connection-editor/page-8021x-security.c:111
+#, fuzzy
+msgid "Could not load 802.1x Security user interface."
+msgstr "وائی فائی WiFi سیکورٹی صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: ../src/connection-editor/page-8021x-security.c:125
+#, fuzzy
+msgid "Use 802.1_X security for this connection"
+msgstr "اس اتصال کے لیے 802.1X سیکورٹی استعمال کریں"
+
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "وائیرڈ اتصال %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "_Am Netzwerk anmelden"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "وائیرلیس نیٹ ورک"
+
+#: ../src/connection-editor/page-bond.c:447
+#, fuzzy
+msgid "Could not load bond user interface."
+msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "ابتدائی DNS:"
+
+#: ../src/connection-editor/page-bond.c:616
+#, fuzzy, c-format
+msgid "Bond connection %d"
+msgstr "وائیرڈ اتصال %d"
+
+#: ../src/connection-editor/page-bridge.c:213
+#, fuzzy
+msgid "Could not load bridge user interface."
+msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: ../src/connection-editor/page-bridge.c:310
+#, fuzzy, c-format
+msgid "Bridge connection %d"
+msgstr "وائیرڈ اتصال %d"
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+#, fuzzy
+msgid "Could not load bridge port user interface."
+msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+#, fuzzy
+msgid "Could not load DCB user interface."
 msgstr "ڈی ایس ایل DSL صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-dsl.c:153
-#: ../src/connection-editor/nm-connection-editor.glade.h:4
-#: ../src/connection-editor/nm-connection-list.c:1368
-msgid "DSL"
-msgstr "DSL"
+#: ../src/connection-editor/page-dsl.c:129
+msgid "Could not load DSL user interface."
+msgstr "ڈی ایس ایل DSL صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-dsl.c:241
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "ڈی ایس ایل اتصال %d"
 
-#: ../src/connection-editor/page-ip4.c:116
-#: ../src/connection-editor/page-ip6.c:114
+#: ../src/connection-editor/page-ethernet.c:74
+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:328
+#, fuzzy
+msgid "Could not load ethernet user interface."
+msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "ایتھرنیٹ (%s)"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+msgid "cloned MAC"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, 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:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
+msgid "Default"
+msgstr "طے شدہ"
+
+#: ../src/connection-editor/page-general.c:52
+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 "نیٹ ورک منیجر نہیں چل رہا..."
+
+#: ../src/connection-editor/page-general.c:350
+#, fuzzy
+msgid "Could not load General user interface."
+msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+#, fuzzy
+msgid "Could not load InfiniBand user interface."
+msgstr "WiFi صارف مواجہ لوڈ نہیں ہوسکتا"
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, fuzzy, c-format
+msgid "InfiniBand connection %d"
+msgstr "وائیرڈ اتصال %d"
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "خودکار (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:117
-#: ../src/connection-editor/page-ip6.c:115
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "خودکار (VPN) صرف پتے"
 
-#: ../src/connection-editor/page-ip4.c:120
-#: ../src/connection-editor/page-ip6.c:118
-msgid "Automatic (PPP)"
-msgstr "خودکار (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:121
-#: ../src/connection-editor/page-ip6.c:119
-msgid "Automatic (PPP) addresses only"
-msgstr "خودکار (PPP) صرف پتے"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "خودکار، صرف پتے"
 
-#: ../src/connection-editor/page-ip4.c:123
-#: ../src/connection-editor/page-ip6.c:121
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "خودکار (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:124
-#: ../src/connection-editor/page-ip6.c:122
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "خودکار (PPPoE) صرف پتے"
 
-#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "خودکار (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:127
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "خودکار (DHCP) صرف پتے"
 
-#: ../src/connection-editor/page-ip4.c:152
-#: ../src/connection-editor/page-ip6.c:162
-msgid "Manual"
-msgstr "دستی"
-
-#: ../src/connection-editor/page-ip4.c:164
-#: ../src/connection-editor/page-ip6.c:175
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "صرف لنک-لوکل"
 
-#: ../src/connection-editor/page-ip4.c:170
-#: ../src/connection-editor/page-ip6.c:182
-msgid "Shared to other computers"
-msgstr "دوسرے کمپوٹروں سے شیئر کردہ"
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+#, fuzzy
+msgid "Additional DNS ser_vers:"
+msgstr "_ڈی این ایس سرور:"
 
-#: ../src/connection-editor/page-ip4.c:597
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+#, fuzzy
+msgid "Additional s_earch domains:"
+msgstr "_تلاش کے ڈومین:"
+
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "تدوین IPv4 روٹس برائے %s"
 
-#: ../src/connection-editor/page-ip4.c:711
-#: ../src/connection-editor/page-ip4.c:718
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr "IPv4 ترتیبات"
+
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "IPv4 صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-ip4.c:724
-msgid "IPv4 Settings"
-msgstr "IPv4 ترتیبات"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:124
-msgid "Automatic"
-msgstr "خودکار"
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:125
-msgid "Automatic, addresses only"
-msgstr "خودکار، صرف پتے"
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:137
-#: ../src/wireless-security/eap-method.c:196
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "نظر انداز کریں"
 
-#: ../src/connection-editor/page-ip6.c:574
+#: ../src/connection-editor/page-ip6.c:172
+#, fuzzy
+msgid "Automatic, DHCP only"
+msgstr "خودکار (DHCP)"
+
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "تدوین IPv6 روٹس برائے %s"
 
-#: ../src/connection-editor/page-ip6.c:670
-#: ../src/connection-editor/page-ip6.c:677
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr "IPv6 ترتیبات"
+
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "IPv6 صارف مواجہ لوڈ نہیں ہوسکتا"
 
-#: ../src/connection-editor/page-ip6.c:683
-msgid "IPv6 Settings"
-msgstr "IPv6 ترتیبات"
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-mobile.c:313
-#: ../src/connection-editor/page-mobile.c:320
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "موبائل براڈ بینڈ صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-mobile.c:341
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "موبائل براڈ بینڈ اتصال کی نوعیت معاونت شدہ نہیں ہے."
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:578
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "موبائل براڈ بینڈ فراہم کُنندہ کی نوعیت منتخب کریں"
 
-#: ../src/connection-editor/page-mobile.c:605
-msgid "Select the technology your mobile broadband provider uses.  If you are unsure, ask your provider."
-msgstr "وہ ٹیکنالوجی منتخب کریں جو آپ کا موبائل براڈ بینڈ فراہم کُنندہ استعمال کرتا ہے. اگر آپ پُر یقین نہیں ہیں، اپنے فراہم کُنندہ سے رابطہ کریں."
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
+"وہ ٹیکنالوجی منتخب کریں جو آپ کا موبائل براڈ بینڈ فراہم کُنندہ استعمال کرتا "
+"ہے. اگر آپ پُر یقین نہیں ہیں، اپنے فراہم کُنندہ سے رابطہ کریں."
 
-#: ../src/connection-editor/page-mobile.c:610
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
-msgstr "میرا فراہم کُنندہ _جی ایس ایم پر مبنی ٹیکنالوجی استعمال کرتا ہے (جیسے GPRS, EDGE, UMTS, HSDPA)"
+msgstr ""
+"میرا فراہم کُنندہ _جی ایس ایم پر مبنی ٹیکنالوجی استعمال کرتا ہے (جیسے GPRS, "
+"EDGE, UMTS, HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:615
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
-msgstr "میرا فراہم کُنندہ سی ڈی ایم اے پر مبنی ٹیکنالوجی استعمال کرتا ہے (جیسے 1xRTT, EVDO)"
+msgstr ""
+"میرا فراہم کُنندہ سی ڈی ایم اے پر مبنی ٹیکنالوجی استعمال کرتا ہے (جیسے 1xRTT, "
+"EVDO)"
 
-#: ../src/connection-editor/page-ppp.c:132
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr "CDMA"
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+msgid "GSM"
+msgstr "GSM"
+
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:133
-#: ../src/wireless-security/eap-method-ttls.c:227
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:134
-#: ../src/wireless-security/eap-method-ttls.c:272
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:135
-#: ../src/wireless-security/eap-method-peap.c:244
-#: ../src/wireless-security/eap-method-ttls.c:257
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:136
-#: ../src/wireless-security/eap-method-ttls.c:242
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:139
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "کچھ نہیں"
 
-#: ../src/connection-editor/page-ppp.c:199
+#: ../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:283
-#: ../src/connection-editor/page-ppp.c:290
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr "PPP ترتیبات"
+
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "پی پی پی PPP صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/page-ppp.c:296
-msgid "PPP Settings"
-msgstr "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 "درآمد کرنے کے لیے فائل منتخب کریں"
 
-#: ../src/connection-editor/page-vpn.c:108
-#: ../src/connection-editor/nm-connection-editor.glade.h:8
-#: ../src/connection-editor/nm-connection-list.c:1364
-msgid "VPN"
-msgstr "VPN"
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+#, fuzzy
+msgid "Could not load team user interface."
+msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: ../src/connection-editor/page-team.c:377
+#, fuzzy, c-format
+msgid "Team connection %d"
+msgstr "وائیرڈ اتصال %d"
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+#, fuzzy
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "کوئی نیٹ ورک اتصال نہیں"
+
+#: ../src/connection-editor/page-vlan.c:596
+#, fuzzy
+msgid "Could not load vlan user interface."
+msgstr "IPv4 صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
 
-#: ../src/connection-editor/page-vpn.c:119
+#: ../src/connection-editor/page-vlan.c:797
+#, fuzzy, c-format
+msgid "VLAN connection %d"
+msgstr "وی پی این اتصال %d"
+
+#: ../src/connection-editor/page-vpn.c:103
+#, fuzzy
+msgid "Could not load VPN user interface."
+msgstr "پی پی پی PPP صارف مواجہ لوڈ نہیں ہوسکتا."
+
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "'%s' کے لیے وی پی این پلگ ان سروس نہیں پائی گئی."
 
-#: ../src/connection-editor/page-vpn.c:213
-#: ../src/connection-editor/nm-connection-list.c:949
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "وی پی این اتصال %d"
 
-#: ../src/connection-editor/page-wired.c:207
-#: ../src/connection-editor/page-wired.c:214
-msgid "Could not load wired user interface."
-msgstr "وائیرڈ صارف مواجہ لوڈ نہیں ہوسکتا."
-
-#: ../src/connection-editor/page-wired.c:220
-#: ../src/connection-editor/nm-connection-editor.glade.h:9
-#: ../src/connection-editor/nm-connection-list.c:1352
-msgid "Wired"
-msgstr "وائیرڈ"
+#: ../src/connection-editor/page-vpn.c:229
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
+"وی پی این پلگ ان وی پی این اتصال کو درست طور پر درآمد کرنے میں ناکام ہوگیا\n"
+"\n"
+"غلطی: کوئی وی پی این سروس نوعیت نہیں."
 
-#: ../src/connection-editor/page-wired.c:339
-#, c-format
-msgid "Wired connection %d"
-msgstr "وائیرڈ اتصال %d"
+#: ../src/connection-editor/page-vpn.c:254
+#, fuzzy
+msgid "Choose a VPN Connection Type"
+msgstr "Neue VPN-Verbindungen erstellen - 1 von 2"
 
-#: ../src/connection-editor/page-wired-security.c:115
-msgid "802.1x Security"
-msgstr "802.1x سیکورٹی"
+#: ../src/connection-editor/page-vpn.c:255
+#, fuzzy
+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 ""
+"<span weight=\"bold\" size=\"larger\">وی پی این VPN اتصال کی نوعیت منتخب "
+"کریں</span>\n"
+"\n"
+"نئے اتصال کے لیے وی پی این کی نوعیت منتخب کریں.  اگر جو اتصال آپ بنانا چاہیں "
+"فہرست میں موجود نہ ہو تو ممکنہ طور پر آپ کے پاس درست وی پی این پلگ ان نصب "
+"نہیں ہے."
 
-#: ../src/connection-editor/page-wired-security.c:123
-msgid "Use 802.1X security for this connection"
-msgstr "اس اتصال کے لیے 802.1X سیکورٹی استعمال کریں"
+#: ../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-wireless.c:144
-#: ../src/connection-editor/page-wireless.c:148
-msgid "default"
-msgstr "طے شدہ"
+#: ../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-wireless.c:166
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wireless.c:351
-#: ../src/connection-editor/page-wireless.c:358
-msgid "Could not load WiFi user interface."
+#: ../src/connection-editor/page-wifi.c:450
+#, fuzzy
+msgid "Could not load Wi-Fi user interface."
 msgstr "WiFi صارف مواجہ لوڈ نہیں ہوسکتا"
 
-#: ../src/connection-editor/page-wireless.c:364
-#: ../src/connection-editor/nm-connection-editor.glade.h:10
-#: ../src/connection-editor/nm-connection-list.c:1356
-msgid "Wireless"
-msgstr "وائیرلیس"
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
 
-#: ../src/connection-editor/page-wireless.c:511
-#, c-format
-msgid "Wireless connection %d"
-msgstr "وائیرلیس اتصال %d"
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "کوئی بھی ڈیوائس"
 
-#: ../src/connection-editor/page-wireless-security.c:262
-#: ../src/wireless-dialog.c:899
-msgid "WEP 40/128-bit Key"
-msgstr "WEP 40/128-bit Key"
+#: ../src/connection-editor/page-wifi.c:619
+#, fuzzy, c-format
+msgid "Wi-Fi connection %d"
+msgstr "وائیرڈ اتصال %d"
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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-wireless-security.c:271
-#: ../src/wireless-dialog.c:908
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-bit Passphrase"
 
-#: ../src/connection-editor/page-wireless-security.c:297
-#: ../src/wireless-dialog.c:938
+#: ../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)"
 msgstr "حرکی WEP (802.1x)"
 
-#: ../src/connection-editor/page-wireless-security.c:311
-#: ../src/wireless-dialog.c:952
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 ذاتی"
 
-#: ../src/connection-editor/page-wireless-security.c:325
-#: ../src/wireless-dialog.c:966
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 انٹرپرائز"
 
-#: ../src/connection-editor/page-wireless-security.c:365
-msgid "Could not load WiFi security user interface; missing WiFi setting."
-msgstr "وائی فائی WiFi سیکورٹی صارف مواجہ لوڈ نہیں ہوسکتا، WiFi ترتیاب مفقود ہے."
-
-#: ../src/connection-editor/page-wireless-security.c:372
-#: ../src/connection-editor/page-wireless-security.c:379
-msgid "Could not load WiFi security user interface."
-msgstr "وائی فائی WiFi سیکورٹی صارف مواجہ لوڈ نہیں ہوسکتا."
+#: ../src/connection-editor/page-wifi-security.c:413
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+"وائی فائی WiFi سیکورٹی صارف مواجہ لوڈ نہیں ہوسکتا، WiFi ترتیاب مفقود ہے."
 
-#: ../src/connection-editor/page-wireless-security.c:385
-msgid "Wireless Security"
+#: ../src/connection-editor/page-wifi-security.c:424
+#, fuzzy
+msgid "Wi-Fi Security"
 msgstr "وائیرلیس سیکورٹی"
 
-#: ../src/connection-editor/nm-connection-editor.c:107
-#, c-format
-msgid "Editing %s"
-msgstr "تدوین %s"
-
-#: ../src/connection-editor/nm-connection-editor.c:111
-msgid "Editing un-named connection"
-msgstr "بغیر-نام کے اتصال کی تدوین"
-
-#: ../src/connection-editor/nm-connection-editor.c:294
-msgid "The connection editor could not find some required resources (the NetworkManager applet glade file was not found)."
-msgstr "اتصال مدون کو کچھ درکار وسائل نہیں مل رہے (نیٹ ورک منیجر ایپلیٹ کی گلیڈ glade فائل نہیں پائی گئی)."
-
-#: ../src/connection-editor/nm-connection-editor.c:307
-msgid "The connection editor could not find some required resources (the glade file was not found)."
-msgstr "اتصال مدون کو کچھ درکار وسائل نہیں مل رہے (گلیڈ glade فائل نہیں ملی)."
-
-#: ../src/connection-editor/nm-connection-editor.c:405
-msgid "Error creating connection editor dialog."
-msgstr "اتصال مدون کا ڈائیلاگ بنانے میں غلطی."
-
-#: ../src/connection-editor/nm-connection-editor.c:426
-msgid "Apply"
-msgstr "اطلاق"
-
-#: ../src/connection-editor/nm-connection-editor.c:427
-msgid "Save this connection for all users of this machine."
-msgstr "اس مشین کے تمام صارفین کے لیے یہ اتصال محفوظ کریں."
-
-#: ../src/connection-editor/nm-connection-editor.c:428
-msgid "Apply..."
-msgstr "اطلاق..."
-
-#: ../src/connection-editor/nm-connection-editor.c:429
-msgid "Authenticate to save this connection for all users of this machine."
-msgstr "اس اتصال کو اس مشین کے تمام صارفین کے لیے محفوظ کرنے کی تصدیق."
-
-#: ../src/connection-editor/nm-connection-editor.glade.h:1
-msgid "A_vailable to all users"
-msgstr "دستیاب برائے تمام صارفین"
-
-#: ../src/connection-editor/nm-connection-editor.glade.h:2
-msgid "Connect _automatically"
-msgstr "_خودکار متصل ہوں"
-
-#: ../src/connection-editor/nm-connection-editor.glade.h:3
-msgid "Connection _name:"
-msgstr "اتصال کا _نام:"
-
-#: ../src/connection-editor/nm-connection-editor.glade.h:5
-msgid "E_xport"
-msgstr "برآمد"
-
-#: ../src/connection-editor/nm-connection-editor.glade.h:11
-msgid "_Import"
-msgstr "_درآمد"
-
-#: ../src/connection-editor/nm-connection-list.c:219
-msgid "never"
-msgstr "کبھی نہیں"
-
-#: ../src/connection-editor/nm-connection-list.c:230
-#: ../src/connection-editor/nm-connection-list.c:241
-msgid "now"
-msgstr "ابھی"
-
-#. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:248
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d منٹ پہلے"
-msgstr[1] "%d منٹ پہلے"
-
-#: ../src/connection-editor/nm-connection-list.c:252
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d گھنٹہ پہلے"
-msgstr[1] "%d گھنٹے پہلے"
-
-#: ../src/connection-editor/nm-connection-list.c:264
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d دن پہلے"
-msgstr[1] "%d دنوں پہلے"
-
-#: ../src/connection-editor/nm-connection-list.c:270
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d مہینہ پہلے"
-msgstr[1] "%d مہینوں پہلے"
-
-#: ../src/connection-editor/nm-connection-list.c:274
-#, c-format
-msgid "%d year ago"
-msgid_plural "%d years ago"
-msgstr[0] "%d سال پہلے"
-msgstr[1] "%d سال پہلے"
-
-#
-#: ../src/connection-editor/nm-connection-list.c:575
-msgid "Connection add failed"
-msgstr "اتصال کا اضافہ ناکام ہوگیا"
+#: ../src/connection-editor/page-wifi-security.c:426
+#, fuzzy
+msgid "Could not load Wi-Fi security user interface."
+msgstr "وائی فائی WiFi سیکورٹی صارف مواجہ لوڈ نہیں ہوسکتا."
 
-#: ../src/connection-editor/nm-connection-list.c:598
+#: ../src/connection-editor/page-wifi-security.c:506
 #, c-format
-msgid "Error editing connection: property '%s' / '%s' invalid: %d"
-msgstr "اتصال کی تدوین میں غلطی: خصوصیت '%s' / '%s' ناموزوں: %d"
-
-#: ../src/connection-editor/nm-connection-list.c:605
-#: ../src/connection-editor/nm-connection-list.c:720
-msgid "An unknown error ocurred."
-msgstr "نامعلوم غلطی ہوئی ہے."
-
-#: ../src/connection-editor/nm-connection-list.c:610
-#: ../src/connection-editor/nm-connection-list.c:755
-msgid "Error initializing editor"
-msgstr "مدون کی تیاری میں غلطی"
-
-#: ../src/connection-editor/nm-connection-list.c:626
-#: ../src/connection-editor/nm-connection-list.c:772
-#: ../src/connection-editor/nm-connection-list.c:932
-msgid "The connection editor dialog could not be initialized due to an unknown error."
-msgstr "نامعلوم غلطی کی بناء پر اتصال مدون ڈائیلاگ تیار نہیں ہوسکا."
-
-#: ../src/connection-editor/nm-connection-list.c:635
-msgid "Could not create new connection"
-msgstr "نیا اتصال نہیں بنایا جاسکتا"
-
-#: ../src/connection-editor/nm-connection-list.c:646
-msgid "Could not edit new connection"
-msgstr "نیا اتصال مدون نہیں ہوسکتا"
-
-#: ../src/connection-editor/nm-connection-list.c:787
-msgid "Could not edit connection"
-msgstr "اتصال مدون نہیں ہوسکتا"
-
-#
-#: ../src/connection-editor/nm-connection-list.c:812
-msgid "Connection delete failed"
-msgstr "اتصال حذف کرنے میں ناکامی"
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:836
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "Are you sure you wish to delete the connection %s?"
-msgstr "کیا آپ واقعی اتصال %s کو حذف کرنا چاہتے ہیں؟"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/nm-connection-list.c:979
-#: ../src/connection-editor/vpn-helpers.c:228
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "وی پی این اتصال درآمد نہیں ہوسکتا"
 
-#: ../src/connection-editor/nm-connection-list.c:981
-msgid ""
-"The VPN plugin failed to import the VPN connection correctly\n"
-"\n"
-"Error: no VPN service type."
-msgstr ""
-"وی پی این پلگ ان وی پی این اتصال کو درست طور پر درآمد کرنے میں ناکام ہوگیا\n"
-"\n"
-"غلطی: کوئی وی پی این سروس نوعیت نہیں."
-
-#: ../src/connection-editor/nm-connection-list.c:994
-msgid "Could not edit imported connection"
-msgstr "درآمد کردہ اتصال مدون نہیں ہوسکتے"
-
-#: ../src/connection-editor/nm-connection-list.c:1128
-msgid "Name"
-msgstr "نام"
-
-#: ../src/connection-editor/nm-connection-list.c:1140
-msgid "Last Used"
-msgstr "آخری استعمال"
-
-#: ../src/connection-editor/nm-connection-list.c:1243
-msgid "Edit"
-msgstr "تدوین"
-
-#: ../src/connection-editor/nm-connection-list.c:1244
-msgid "Edit the selected connection"
-msgstr "منتخب کردہ اتصال مدون کریں"
-
-#: ../src/connection-editor/nm-connection-list.c:1245
-msgid "Edit..."
-msgstr "تدوین..."
-
-#: ../src/connection-editor/nm-connection-list.c:1246
-msgid "Authenticate to edit the selected connection"
-msgstr "منتخب کردہ اتصال کی تدوین کی توثیق"
-
-#: ../src/connection-editor/nm-connection-list.c:1260
-msgid "Delete"
-msgstr "حذف"
-
-#: ../src/connection-editor/nm-connection-list.c:1261
-msgid "Delete the selected connection"
-msgstr "منتخب کردہ اتصال حذف کریں"
-
-#: ../src/connection-editor/nm-connection-list.c:1262
-msgid "Delete..."
-msgstr "حذف..."
-
-#: ../src/connection-editor/nm-connection-list.c:1263
-msgid "Authenticate to delete the selected connection"
-msgstr "منتخب کردہ اتصال کو حذف کرنے کی توثیق"
-
-#: ../src/connection-editor/vpn-helpers.c:230
+#: ../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"
+"The file '%s' could not be read or does not contain recognized VPN "
+"connection information\n"
 "\n"
 "Error: %s."
 msgstr ""
-"فائل '%s' نہیں پڑھی جاسکتی یا اس میں جانی پہچانی وی پی این اتصال کی معلومات نہیں ہیں\n"
+"فائل '%s' نہیں پڑھی جاسکتی یا اس میں جانی پہچانی وی پی این اتصال کی معلومات "
+"نہیں ہیں\n"
 "\n"
 "غلطی: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:262
-msgid "Select file to import"
-msgstr "درآمد کرنے کے لیے فائل منتخب کریں"
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "نامعلوم غلطی ہوئی ہے."
 
-#: ../src/connection-editor/vpn-helpers.c:310
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "فائل \"%s\" پہلے ہی موجود ہے."
 
-#: ../src/connection-editor/vpn-helpers.c:312
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_بدل دیں"
 
-#: ../src/connection-editor/vpn-helpers.c:314
+#: ../src/connection-editor/vpn-helpers.c:219
 #, c-format
 msgid "Do you want to replace %s with the VPN connection you are saving?"
-msgstr "کیا آپ %s کو اس وی پی این اتصال سے بدلنا چاہتے ہیں جسے آپ محفوظ کرنے جارہے ہیں؟"
+msgstr ""
+"کیا آپ %s کو اس وی پی این اتصال سے بدلنا چاہتے ہیں جسے آپ محفوظ کرنے جارہے "
+"ہیں؟"
 
-#: ../src/connection-editor/vpn-helpers.c:350
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "وی پی این اتصال برآمد نہیں ہوسکتا"
 
-#: ../src/connection-editor/vpn-helpers.c:352
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -1879,360 +3124,1194 @@ msgstr ""
 "\n"
 "غلطی: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:386
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "وی پی این اتصال برآمد کریں..."
 
-#: ../src/gnome-bluetooth/network-manager-applet.c:197
-msgid "Access the Internet using your mobile phone"
-msgstr "اپنے موبائل فون سے انٹرنیٹ تک رسائی حاصل کریں"
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
+#, fuzzy
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+msgstr ""
+"نیٹ ورک منیجر ایپلیٹ کچھ درکار وسائل تلاش نہیں کر پا رہا (گلیڈ glade فائل "
+"نہیں مل سکی)."
 
-#: ../src/main.c:70
-#| msgid "_Username:"
-msgid "Usage:"
-msgstr "استعمال:"
+#: ../src/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr ""
+
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr ""
 
-#: ../src/main.c:72
-msgid "This program is a component of NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/)."
-msgstr "یہ اطلاقیہ نیٹ ورک منیجر کا ایک جُز ہے (https://wiki.gnome.org/Projects/NetworkManager/)."
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr "اتصال کی معلومات"
 
-#: ../src/main.c:73
-msgid "It is not intended for command-line interaction but instead runs in the GNOME desktop environment."
-msgstr "اسے کمانڈ لائن تعامل میں چلانا مقصود نہیں، اس کے برعکس یہ گنوم ڈیسک ٹاپ ماحول میں چلانے کے لیے ہے."
+#: ../src/info.ui.h:3
+#, fuzzy
+msgid "Active Network Connections"
+msgstr "نیٹ ورک اتصال"
 
-#: ../src/utils/mobile-wizard.c:196
-msgid "Your mobile broadband connection is configured with the following settings:"
-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/utils/mobile-wizard.c:203
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "آپ کی ڈیوائس:"
 
 #. Provider
-#: ../src/utils/mobile-wizard.c:214
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "آپ کا فراہم کُنندہ:"
 
 #. Plan and APN
-#: ../src/utils/mobile-wizard.c:225
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "آپ کا پلان:"
 
-#: ../src/utils/mobile-wizard.c:246
-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/utils/mobile-wizard.c:258
+#: ../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/utils/mobile-wizard.c:319
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "غیر درج شدہ"
 
-#: ../src/utils/mobile-wizard.c:437
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "اپنا پلان _منتخب کریں:"
 
-#: ../src/utils/mobile-wizard.c:461
+#: ../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/utils/mobile-wizard.c:480
+#: ../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"
+"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"
 "\n"
-"اگر آپ اپنے پلان کے حوالے سے تذبذب کا شکار ہیں تو اپنے فراہم کُنندہ سے اپنے پلان کے APN کے لیے کہیں."
+"اگر آپ اپنے پلان کے حوالے سے تذبذب کا شکار ہیں تو اپنے فراہم کُنندہ سے اپنے "
+"پلان کے APN کے لیے کہیں."
 
-#: ../src/utils/mobile-wizard.c:487
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "اپنا بِلِنگ پلان منتخب کریں"
 
-#: ../src/utils/mobile-wizard.c:535
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "میرا پلان درجِ فہرست نہیں ہے..."
 
-#: ../src/utils/mobile-wizard.c:688
+#: ../src/libnma/nma-mobile-wizard.c:710
+#: ../src/libnm-gtk/nm-mobile-wizard.c:711
 msgid "Select your provider from a _list:"
 msgstr "اپنا فراہم کُنندہ _فہرست میں سے منتخب کریں:"
 
-#: ../src/utils/mobile-wizard.c:701
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "فراہم کُنندہ"
 
-#: ../src/utils/mobile-wizard.c:726
+#: ../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 "میں اپنا فراہم کُنندہ تلاش نہیں کر سکا چنانچہ میں اسے _دستی طور پر شامل کرنا چاہتا ہوں:"
+msgstr ""
+"میں اپنا فراہم کُنندہ تلاش نہیں کر سکا چنانچہ میں اسے _دستی طور پر شامل کرنا "
+"چاہتا ہوں:"
 
-#: ../src/utils/mobile-wizard.c:737
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "فراہم کُنندہ:"
 
-#: ../src/utils/mobile-wizard.c:753
+#: ../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)"
+msgstr ""
+"میرا فراہم کُنندہ GSM ٹیکنالوجی استعمال کرتا ہے (GPRS, EDGE, UMTS, HSPA)"
 
-#: ../src/utils/mobile-wizard.c:755
+#: ../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/utils/mobile-wizard.c:766
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "اپنا فراہم کُنندہ منتخب کریں"
 
-#: ../src/utils/mobile-wizard.c:1012
-msgid "Country List:"
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
+#, fuzzy
+msgid "Country or Region List:"
 msgstr "ممالک فہرست:"
 
-#: ../src/utils/mobile-wizard.c:1024
-msgid "Country"
-msgstr "ملک"
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
+#, fuzzy
+msgid "Country or region"
+msgstr "ممالک فہرست:"
 
-#: ../src/utils/mobile-wizard.c:1031
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "میرا ملک فہرست میں نہیں ہے"
 
-#: ../src/utils/mobile-wizard.c:1077
-msgid "Choose your Provider's Country"
+#: ../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/utils/mobile-wizard.c:1126
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "نصب شدہ GSM ڈیوائس"
 
-#: ../src/utils/mobile-wizard.c:1129
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "نصب شدہ CDMA ڈیوائس"
 
-#: ../src/utils/mobile-wizard.c:1297
-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: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 ""
+"یہ مددگار سیلولر (3G) نیٹ ورک سے موبائل براڈ بینڈ اتصال مرتب کرنے میں آپ کی "
+"مدد کرے گا."
 
-#: ../src/utils/mobile-wizard.c:1302
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "آپ کو ذیل کی معلومات درکار ہوں گی:"
 
-#: ../src/utils/mobile-wizard.c:1313
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "آپ کے براڈ بینڈ فراہم کُنندہ کا نام"
 
-#: ../src/utils/mobile-wizard.c:1319
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "آپ کے فراہم کُنندہ کے بِلِنگ پلان کا نام"
 
-#: ../src/utils/mobile-wizard.c:1325
+#: ../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)"
 
-#: ../src/utils/mobile-wizard.c:1352
+#: ../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 "ا_س موبائل براڈ بینڈ ڈیوائس کے لیے اتصال بنائیں:"
 
-#: ../src/utils/mobile-wizard.c:1367
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "کوئی بھی ڈیوائس"
 
-#: ../src/utils/mobile-wizard.c:1380
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "موبائل براڈ بینڈ اتصال مرتب کریں"
 
-#: ../src/utils/mobile-wizard.c:1554
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "نیا موبائل براڈ بینڈ اتصال"
 
-#: ../src/utils/nmn-mobile-providers.c:515
-msgid "Default"
-msgstr "طے شدہ"
+#: ../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/vpn-password-dialog.c:137
-#: ../src/vpn-password-dialog.c:255
-#, c-format
-msgid "Cannot start VPN connection '%s'"
-msgstr "وی پی این اتصال '%s' شروع نہیں کیا جاسکا"
+#: ../src/libnma/nma-ui-utils.c:50 ../src/libnm-gtk/nm-ui-utils.c:616
+msgid "Store the password for all users"
+msgstr ""
 
-#: ../src/vpn-password-dialog.c:140
-#, c-format
-msgid "Could not find the authentication dialog for VPN connection type '%s'. Contact your system administrator."
-msgstr "وی پی این اتصال نوعیت '%s' کے لیے توثیقی ڈائیلاگ نہیں مل سکا. خشبو لگا کر اپنے نظام کے مدیر سے رابطہ کریں."
+#: ../src/libnma/nma-ui-utils.c:51 ../src/libnm-gtk/nm-ui-utils.c:617
+msgid "Ask for this password every time"
+msgstr ""
 
-#: ../src/vpn-password-dialog.c:258
-#, c-format
-msgid "There was a problem launching the authentication dialog for VPN connection type '%s'. Contact your system administrator."
-msgstr "توثیقی ڈائیلاگ برائے وی پی این اتصال نوعیت '%s' کے لیے چلانے میں مسائل درپیش ہیں. اپنے نظام کے مدیر سے رابطہ کریں."
+#: ../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/wired-dialog.c:99
-msgid "Wired 802.1X authentication"
-msgstr "وائیرڈ 802.1X توثیق"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+#, fuzzy
+msgid "_Secondary Password:"
+msgstr "_پاس ورڈ:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "_پاس ورڈ:"
+
+#: ../src/libnma/nma-vpn-password-dialog.c:247
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:247
+#, fuzzy
+msgid "Sh_ow passwords"
+msgstr "پاس ورڈ _دکھائیں"
+
+#: ../src/libnma/nma-wifi-dialog.c:132 ../src/libnm-gtk/nm-wifi-dialog.c:141
+#, fuzzy
+msgid "Click to connect"
+msgstr "Verbindung konnte nicht verschoben werden"
 
-#: ../src/wireless-dialog.c:446
+#: ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "نیا..."
 
-#: ../src/wireless-dialog.c:1050
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+#, fuzzy
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr "کچھ نہیں"
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_بنائیں"
 
-#: ../src/wireless-dialog.c:1131
-#, c-format
-msgid "Passwords or encryption keys are required to access the wireless network '%s'."
-msgstr "وائیرلیس نیٹ ورک '%s' تک رسائی کے لیے پاس ورڈ یا ترمیزی کلیدیں درکار ہیں."
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, fuzzy, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
+"وائیرلیس نیٹ ورک '%s' تک رسائی کے لیے پاس ورڈ یا ترمیزی کلیدیں درکار ہیں."
 
-#: ../src/wireless-dialog.c:1133
-msgid "Wireless Network Authentication Required"
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, fuzzy
+msgid "Wi-Fi Network Authentication Required"
 msgstr "وائیرلیس نیٹ ورک توثیق درکار"
 
-#: ../src/wireless-dialog.c:1135
-msgid "Authentication required by wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+#, fuzzy
+msgid "Authentication required by Wi-Fi network"
 msgstr "توثیق درکار از وائیرلیس نیٹ ورک"
 
-#: ../src/wireless-dialog.c:1140
-msgid "Create New Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+#, fuzzy
+msgid "Create New Wi-Fi Network"
 msgstr "نیا وائیرلیس نیٹ ورک بنائیں"
 
-#: ../src/wireless-dialog.c:1142
-msgid "New wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
 msgstr "نیا وائیرلیس نیٹ ورک"
 
-#: ../src/wireless-dialog.c:1143
-msgid "Enter a name for the wireless network you wish to create."
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+#, fuzzy
+msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "نئے وائیرلیس نیٹ ورک کا نام لکھیں جو آپ بنانا چاہتے ہیں."
 
-#: ../src/wireless-dialog.c:1145
-msgid "Connect to Hidden Wireless Network"
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+#, fuzzy
+msgid "Connect to Hidden Wi-Fi Network"
 msgstr "پوشیدہ وائیرلیس نیٹ ورک سے اتصال قائم کریں"
 
-#: ../src/wireless-dialog.c:1147
-msgid "Hidden wireless network"
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+#, fuzzy
+msgid "Hidden Wi-Fi network"
 msgstr "پوشیدہ وائیرلیس نیٹ ورک"
 
-#: ../src/wireless-dialog.c:1148
-msgid "Enter the name and security details of the hidden wireless network you wish to connect to."
-msgstr "اس پوشیدہ وائیرلیس نیٹ ورک کا نام اور سیکورٹی تفصیلات داخل کریں جس سے آپ متصل ہونے چاہتے ہیں."
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+#, 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:2 ../src/libnm-gtk/wifi.ui.h:2
+#, fuzzy
+msgid "Wi-Fi _security:"
+msgstr "_وائیرلیس سیکورٹی:"
 
-#: ../src/wireless-security/eap-method.c:190
-msgid "No Certificate Authority certificate chosen"
-msgstr "کوئی سند اتھارٹی سند منتخب نہیں کی گئی"
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+msgid "C_onnection:"
+msgstr "ا_تصال:"
 
-#: ../src/wireless-security/eap-method.c:191
-msgid "Not using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks.  Would you like to choose a Certificate Authority certificate?"
-msgstr "سند اتھارٹی (CA) کی سند استعمال نہ کرنے کا نتیجہ غیر محفوظ اتصال یا وائیرلیس نیٹ ورک کی دھوکہ دہی کی صورت میں نکل سکتا ہے. کیا آپ سند اتھارٹی کی سند منتخب کرنا چاہتے ہیں؟"
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "وائیرلیس ا_ڈاپٹر:"
 
-#: ../src/wireless-security/eap-method.c:200
-msgid "Choose CA Certificate"
-msgstr "CA سند منتخب کریں"
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr "استعمال:"
+
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+"یہ اطلاقیہ نیٹ ورک منیجر کا ایک جُز ہے (https://wiki.gnome.org/Projects/"
+"NetworkManager/)."
+
+#: ../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
+msgid "EVDO"
+msgstr ""
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:68
+msgid "HSPA+"
+msgstr ""
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr ""
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr ""
+
+#: ../src/mb-menu-item.c:141
+#, fuzzy, c-format
+msgid "Home network (%s)"
+msgstr "وائیرڈ نیٹ ورک (%s)"
+
+#: ../src/mb-menu-item.c:143
+#, fuzzy, c-format
+msgid "Home network"
+msgstr "مزید نیٹ ورک"
 
-#: ../src/wireless-security/eap-method.c:515
-msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12)"
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr ""
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr ""
+
+#: ../src/mb-menu-item.c:170
+#, fuzzy, c-format
+msgid "Roaming network (%s)"
+msgstr "وائیرڈ نیٹ ورک (%s)"
+
+#: ../src/mb-menu-item.c:172
+#, fuzzy, c-format
+msgid "Roaming network"
+msgstr "مزید نیٹ ورک"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr "پِن PIN کوڈ درکار ہے"
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr "موبائل براڈ بینڈ ڈیوائس کے لیے پِن PIN کوڈ درکار ہے"
+
+#: ../src/mobile-helpers.c:619
+#, fuzzy, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "موبائل براڈ بینڈ اتصال '%s' فعال ہے"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "ڈی ایس ایل اتصال %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/wireless-security/eap-method.c:452
+#, 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:518
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER یا PEM اسناد (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-peap.c:259
-msgid "MD5"
-msgstr "MD5"
+#: ../src/wireless-security/eap-method-fast.c:70
+msgid "missing EAP-FAST PAC file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-peap.c:274
+#: ../src/wireless-security/eap-method-fast.c:265
+#: ../src/wireless-security/eap-method-peap.c:302
+#: ../src/wireless-security/eap-method-ttls.c:333
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-peap.c:361
-#: ../src/wireless-security/eap-method-tls.c:453
-#: ../src/wireless-security/eap-method-ttls.c:359
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+#, fuzzy
+msgid "Anonymous"
+msgstr "_نامعلوم پہچان:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+#, fuzzy
+msgid "Authenticated"
+msgstr "_توثیق:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
+msgstr "_نامعلوم پہچان:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+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
+#, fuzzy
+msgid "_Inner authentication:"
+msgstr "داخلی توثیق:"
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+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 "سند اتھارٹی سند منتخب کریں..."
 
-#: ../src/wireless-security/eap-method-tls.c:259
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr ""
+
+#: ../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 "CA _سند:"
+
+#: ../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
+#, fuzzy
+msgid "No CA certificate is _required"
+msgstr "CA _سند:"
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+#, fuzzy
+msgid "PEAP _version:"
+msgstr "_PEAP نسخہ:"
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "CA _سند:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "غیر رمز شدہ نجی کلیدیں غیر محفوظ ہیں"
 
-#: ../src/wireless-security/eap-method-tls.c:262
+#: ../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"
+"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 ""
-"معلوم ہوتا ہے کہ منتخب کردہ نجی کلید پاس ورد سے محفظ نہیں ہے. یہ آپ کی حفاظت کے لیے خطرناک ثابت ہوسکتا ہے. براہ مہربانی پاس ورڈ سے محفوظ کردہ نجی کلید منتخب کریں.\n"
+"معلوم ہوتا ہے کہ منتخب کردہ نجی کلید پاس ورد سے محفظ نہیں ہے. یہ آپ کی حفاظت "
+"کے لیے خطرناک ثابت ہوسکتا ہے. براہ مہربانی پاس ورڈ سے محفوظ کردہ نجی کلید "
+"منتخب کریں.\n"
 "\n"
 "(آپ openssl کے ذریعے اپنی نجی کلید کو پاس ورڈ سے محفوظ بنا سکتے ہیں)"
 
-#: ../src/wireless-security/eap-method-tls.c:447
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "اپنی ذاتی سند منتخب کریں..."
 
-#: ../src/wireless-security/eap-method-tls.c:459
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "اپنی نجی کلید منتخب کریں..."
 
-#: ../src/wireless-security/wireless-security.c:328
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity:"
+msgstr "شناخت:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr "_صارف سند:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "Private _key:"
+msgstr "نجی _کلید:"
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_Private key password:"
+msgstr "_نجی کلید پاس ورڈ:"
+
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:352
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Tunneled TLS"
 
-#: ../src/wireless-security/wireless-security.c:363
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "محفوظ EAP (PEAP)"
 
+#: ../src/wireless-security/ws-dynamic-wep.ui.h:2
+#: ../src/wireless-security/ws-wep-key.ui.h:9
+#: ../src/wireless-security/ws-wpa-eap.ui.h:2
+#, fuzzy
+msgid "Au_thentication:"
+msgstr "_توثیق:"
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
+msgid "Open System"
+msgstr "Offenes System"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr "Gemeinsamer Schlüssel (PSK)"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr "_کلید:"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr "کلید _دکھائیں"
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x:"
+msgstr "WEP inde_x:"
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_نوعیت:"
+
+#~ msgid "An instance of nm-applet is already running.\n"
+#~ msgstr "ایک nm-applet پہلے ہی چل رہا ہے.\n"
+
+#~ msgid "Could not acquire the %s service. (%d)\n"
+#~ msgstr "سروس %s حاصل نہیں کی جاسکتی. (%d)\n"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "نیا موبائل براڈ بینڈ (CDMA) اتصال..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "اب آپ CDMA نیٹ ورک سے متصل ہیں."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "نیا موبائل براڈ بینڈ (GSM) اتصال..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "اب آپ جی ایس ایم (GSM) نیٹ ورک سے متصل ہیں."
+
+#~ msgid "PUK code is needed for the mobile broadband device"
+#~ msgstr "موبائل براڈ بینڈ ڈیوائس کے لیے پَک PUK کوڈ درکار ہے"
+
+#~ msgid "Wireless Networks (%s)"
+#~ msgstr "وائیرلیس نیٹ ورکس (%s)"
+
+#~ msgid "Wireless Network (%s)"
+#~ msgstr "وائیرلیس نیٹ ورک (%s)"
+
+#~ msgid "Preparing wireless network connection '%s'..."
+#~ msgstr "وائیرلیس نیٹ ورک اتصال '%s' تیار کیا جارہا ہے..."
+
+#~ msgid "Configuring wireless network connection '%s'..."
+#~ msgstr "وائیرلیس نیٹ ورک اتصال '%s' وضع کیا جارہا ہے..."
+
+#~ msgid "Requesting a wireless network address for '%s'..."
+#~ msgstr "وائیرلیس نیٹ ورک پتہ کی درخواست برائے '%s' بھیجی جارہی ہے..."
+
+#~ 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 "_ہدایات"
+
+#~ msgid ""
+#~ "The NetworkManager applet could not find some required resources.  It "
+#~ "cannot continue.\n"
+#~ msgstr ""
+#~ "نیٹ ورک منیجر ایپلیٹ کچھ درکار وسائل تلاش نہیں کر پا رہا. یہ جاری نہیں رہ "
+#~ "سکتا.\n"
+
+#~ msgid ""
+#~ "<span size=\"larger\" weight=\"bold\">Active Network Connections</span>"
+#~ msgstr "<span size=\"larger\" weight=\"bold\">فعال نیٹ ورک اتصال</span>"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Version 0\n"
+#~ "Version 1"
+#~ msgstr ""
+#~ "خودکار\n"
+#~ "نسخہ 0\n"
+#~ "نسخہ 1"
+
+#~ msgid "Don't _warn me again"
+#~ msgstr "مجھے دوبارہ _متنبہ مت کریں"
+
+#~ msgid "No"
+#~ msgstr "نہیں"
+
+#~ msgid ""
+#~ "Open System\n"
+#~ "Shared Key"
+#~ msgstr ""
+#~ "کھلا نظام\n"
+#~ "شیئرڈ کلید"
+
+#~ msgid "Other Wireless Network..."
+#~ msgstr "دوسرے وائیرلیس نیٹ ورک..."
+
+#~ msgid "Select A File"
+#~ msgstr "فائل منتخب کریں"
+
+#~ msgid "Yes"
+#~ msgstr "ہاں"
+
+#~ msgid "<b>Addresses</b>"
+#~ msgstr "<b>پتے</b>"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Automatic with manual DNS settings\n"
+#~ "Manual\n"
+#~ "Link-Local\n"
+#~ "Shared to other computers"
+#~ msgstr ""
+#~ "خودکار\n"
+#~ "خودکار بمع دستی DNS ترتیبات\n"
+#~ "دستی\n"
+#~ "ربط-لوکلl\n"
+#~ "دوسرے کمپیوٹروں سے شیئر کردہ"
+
+#~ msgid "_Routes&#x2026;"
+#~ msgstr "_روٹس&#x2026;"
+
+#~ msgid "<b>Basic</b>"
+#~ msgstr "<b>بنیادی</b>"
+
+#~ msgid ""
+#~ "Any\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "Prefer 3G (UMTS/HSPA)\n"
+#~ "Prefer 2G (GPRS/EDGE)"
+#~ msgstr ""
+#~ "کوئی\n"
+#~ "3G (UMTS/HSPA)\n"
+#~ "2G (GPRS/EDGE)\n"
+#~ "ترجیحاً 3G (UMTS/HSPA)\n"
+#~ "ترجیحاً 2G (GPRS/EDGE)"
+
+#~ msgid "PI_N:"
+#~ msgstr "PI_N:"
+
+#~ msgid "_Band:"
+#~ msgstr "_بینڈ:"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>توثیق</b>"
+
+#~ msgid "<b>Echo</b>"
+#~ msgstr "<b>ایکو</b>"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "10 Mb/s\n"
+#~ "100 Mb/s\n"
+#~ "1 Gb/s\n"
+#~ "10 Gb/s"
+#~ msgstr ""
+#~ "خودکار\n"
+#~ "10 م.ب/س\n"
+#~ "100 م.ب/س\n"
+#~ "1 گ.ب/س\n"
+#~ "10 گ.ب/س"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "Twisted Pair (TP)\n"
+#~ "Attachment Unit Interface (AUI)\n"
+#~ "BNC\n"
+#~ "Media Independent Interface (MII)"
+#~ msgstr ""
+#~ "خودکار\n"
+#~ "گتھے ہوئے پیئر (TP)\n"
+#~ "منسلکاتی اکائی مواجہ (AUI)\n"
+#~ "BNC\n"
+#~ "میڈیا مستقل مواجہ (MII)"
+
+#~ msgid "MT_U:"
+#~ msgstr "MT_U:"
+
+#~ msgid ""
+#~ "Automatic\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+#~ msgstr ""
+#~ "خودکار\n"
+#~ "A (5 GHz)\n"
+#~ "B/G (2.4 GHz)"
+
+#~ msgid ""
+#~ "Infrastructure\n"
+#~ "Ad-hoc"
+#~ msgstr ""
+#~ "ڈھانچہ\n"
+#~ "Ad-hoc"
+
+#~ msgid "_SSID:"
+#~ msgstr "_SSID:"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "خودکار (PPP)"
+
+#~ msgid "Automatic (PPP) addresses only"
+#~ msgstr "خودکار (PPP) صرف پتے"
+
+#~ msgid "Wireless"
+#~ msgstr "وائیرلیس"
+
+#~ msgid "Wireless connection %d"
+#~ msgstr "وائیرلیس اتصال %d"
+
+#~ msgid "WEP 40/128-bit Key"
+#~ msgstr "WEP 40/128-bit Key"
+
+#~ msgid ""
+#~ "The connection editor could not find some required resources (the "
+#~ "NetworkManager applet glade file was not found)."
+#~ msgstr ""
+#~ "اتصال مدون کو کچھ درکار وسائل نہیں مل رہے (نیٹ ورک منیجر ایپلیٹ کی گلیڈ "
+#~ "glade فائل نہیں پائی گئی)."
+
+#~ msgid "Apply"
+#~ msgstr "اطلاق"
+
+#~ msgid "Save this connection for all users of this machine."
+#~ msgstr "اس مشین کے تمام صارفین کے لیے یہ اتصال محفوظ کریں."
+
+#~ msgid "Apply..."
+#~ 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"
+
+#~ msgid "Could not edit imported connection"
+#~ msgstr "درآمد کردہ اتصال مدون نہیں ہوسکتے"
+
+#~ msgid "Edit..."
+#~ msgstr "تدوین..."
+
+#~ msgid "Delete..."
+#~ msgstr "حذف..."
+
+#~ msgid "Access the Internet using your mobile phone"
+#~ msgstr "اپنے موبائل فون سے انٹرنیٹ تک رسائی حاصل کریں"
+
+#~ msgid "Country"
+#~ msgstr "ملک"
+
+#~ msgid "Cannot start VPN connection '%s'"
+#~ msgstr "وی پی این اتصال '%s' شروع نہیں کیا جاسکا"
+
+#~ msgid ""
+#~ "Could not find the authentication dialog for VPN connection type '%s'. "
+#~ "Contact your system administrator."
+#~ msgstr ""
+#~ "وی پی این اتصال نوعیت '%s' کے لیے توثیقی ڈائیلاگ نہیں مل سکا. خشبو لگا کر "
+#~ "اپنے نظام کے مدیر سے رابطہ کریں."
+
+#~ msgid ""
+#~ "There was a problem launching the authentication dialog for VPN "
+#~ "connection type '%s'. Contact your system administrator."
+#~ msgstr ""
+#~ "توثیقی ڈائیلاگ برائے وی پی این اتصال نوعیت '%s' کے لیے چلانے میں مسائل "
+#~ "درپیش ہیں. اپنے نظام کے مدیر سے رابطہ کریں."
+
+#~ msgid "No Certificate Authority certificate chosen"
+#~ msgstr "کوئی سند اتھارٹی سند منتخب نہیں کی گئی"
+
+#~ msgid ""
+#~ "Not using a Certificate Authority (CA) certificate can result in "
+#~ "connections to insecure, rogue wireless networks.  Would you like to "
+#~ "choose a Certificate Authority certificate?"
+#~ msgstr ""
+#~ "سند اتھارٹی (CA) کی سند استعمال نہ کرنے کا نتیجہ غیر محفوظ اتصال یا "
+#~ "وائیرلیس نیٹ ورک کی دھوکہ دہی کی صورت میں نکل سکتا ہے. کیا آپ سند اتھارٹی "
+#~ "کی سند منتخب کرنا چاہتے ہیں؟"
+
 #~ msgid "PU_K:"
 #~ msgstr "PU_K:"
+
 #~ msgid ""
 #~ "Insufficient privileges or unknown error retrieving system connection "
 #~ "secrets."
 #~ msgstr ""
 #~ "Ungenügende Rechte oder unbekannter Fehler beim Auslesen der Passwörter "
 #~ "der Systemverbindungen."
+
 #~ msgid "Could not request secrets from the system settings service."
 #~ msgstr ""
 #~ "Die Passwörter konnten nicht vom Systemeinstellungsdienst erfragt werden."
+
 #~ msgid "Could not connect to D-Bus to request connection secrets."
 #~ msgstr ""
-#~ "Das Verbinden mit D-Bus zum Erfragen der Verbindungspasswörter schlug fehl."
+#~ "Das Verbinden mit D-Bus zum Erfragen der Verbindungspasswörter schlug "
+#~ "fehl."
+
 #~ msgid "Could not create D-Bus proxy for connection secrets."
 #~ msgstr ""
-#~ "Ein D-Bus-Proxy für die Verbindungspasswörter konnte nicht erstellt werden."
+#~ "Ein D-Bus-Proxy für die Verbindungspasswörter konnte nicht erstellt "
+#~ "werden."
+
 #~ msgid "PolicyKit authorization request was invalid."
 #~ msgstr "PolicyKit-Legitimierungsanfrage war ungültig."
+
 #~ msgid "PolicyKit authorization request was malformed."
 #~ msgstr "PolicyKit-Legitimierungsanfrage war fehlerhaft."
-#~ msgid "PolicyKit authorization could not be created."
-#~ msgstr "PolicyKit-Legitimierung konnte nicht erzeugt werden."
+
 #~ msgid "PolicyKit authorization could not be created; invalid action ID."
 #~ msgstr ""
 #~ "PolicyKit-Legitimierung konnte nicht erzeugt werden, ungültige Aktions-"
 #~ "Kennung."
+
 #~ msgid "Could not obtain required privileges"
 #~ msgstr "Die erforderlichen Rechte konnten nicht erlangt werden"
+
 #~ msgid "Could not delete connection"
 #~ msgstr "Verbindung konnte nicht entfernt werden"
+
 #~ msgid "The connection could not be deleted due to an unknown error."
 #~ msgstr ""
 #~ "Verbindung konnte wegen eines unbekannten Fehlers nicht entfernt werden."
-#~ msgid "Could not move connection"
-#~ msgstr "Verbindung konnte nicht verschoben werden"
+
 #~ msgid "Could not add connection"
 #~ msgstr "Verbindung konnte nicht hinzugefügt werden"
+
 #~ msgid "The connection could not be added due to an unknown error."
 #~ msgstr ""
-#~ "Verbindung konnte wegen eines unbekannten Fehlers nicht hinzugefügt werden."
-#~ msgid "Could not update connection"
-#~ msgstr "Verbindung konnte nicht aktualisiert werden"
+#~ "Verbindung konnte wegen eines unbekannten Fehlers nicht hinzugefügt "
+#~ "werden."
+
 #~ msgid "The connection could not be updated due to an unknown error."
 #~ msgstr ""
 #~ "Verbindung konnte wegen eines unbekannten Fehlers nicht aktualisiert "
 #~ "werden."
+
 #~ msgid "User Name:"
 #~ msgstr "Benutzername:"
+
 #~ msgid "alert text"
 #~ msgstr "Text für Warnmeldungen"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Choose a Mobile Broadband "
 #~ "Connection</span>\n"
@@ -2245,138 +4324,183 @@ msgstr "محفوظ EAP (PEAP)"
 #~ "auswählen</span>\n"
 #~ "\n"
 #~ "Wählen Sie ein mobiles Breitbandgerät, das Sie für die neue Verbindung "
-#~ "verwenden möchten, oder schließen Sie dieses an. Wenn kein Gerät verfügbar "
-#~ "ist, wählen Sie einen allgemeinen Verbindungstyp."
+#~ "verwenden möchten, oder schließen Sie dieses an. Wenn kein Gerät "
+#~ "verfügbar ist, wählen Sie einen allgemeinen Verbindungstyp."
+
 #~ msgid "Create a GSM connection"
 #~ msgstr "Eine GSM-Verbindung erstellen"
-#~ msgid "Create a CDMA connection"
-#~ msgstr "Eine UTMS-Verbindung erstellen"
+
 #~ msgid "GSM connection %d"
 #~ msgstr "GSM-Verbindung %d"
+
 #~ msgid "CDMA connection %d"
 #~ msgstr "UTMS-Verbindung %d"
+
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
+
 #~ msgid "gtk-ok"
 #~ msgstr "gtk-ok"
+
 #~ msgid "Removing connection failed: %s."
 #~ msgstr "Entfernen der Verbindung ist fehlgeschlagen: %s."
+
 #~ msgid "Could not add system connection: permission denied."
 #~ msgstr ""
-#~ "Systemweite Verbindung konnte nicht hinzugefügt werden: Zugriff verweigert."
+#~ "Systemweite Verbindung konnte nicht hinzugefügt werden: Zugriff "
+#~ "verweigert."
+
 #~ msgid "Adding connection failed: %s."
 #~ msgstr "Hinzufügen der Verbindung ist fehlgeschlagen: %s."
+
 #~ msgid "Updating connection failed: %s."
 #~ msgstr "Ändern der Verbindung ist fehlgeschlagen: %s."
+
 #~ msgid "Point-to-Point Protocol (PPP)"
 #~ msgstr "Punkt-zu-Punkt-Protokoll (PPP)"
+
 #~ msgid "Dialing mobile broadband device %s..."
 #~ msgstr "Mobiles Breitbandgerät %s wählt …"
+
 #~ msgid "Starting PPP on device %s..."
 #~ msgstr "PPP wird auf Gerät %s gestartet …"
+
 #~ msgid "Waiting for user authentication on device '%s'..."
 #~ msgstr "Es wird auf die Benutzerauthentifizierung auf Gerät »%s« gewartet …"
+
 #~ msgid "Preparing device %s for the wired network..."
 #~ msgstr "Vorbereiten des Geräts %s wird für das Kabelnetzwerk …"
+
 #~ msgid "Configuring device %s for the wired network..."
 #~ msgstr "Konfigurieren des Geräts %s für das Kabelnetzwerk …"
+
 #~ msgid "Requesting a network address from the wired network..."
 #~ msgstr "Anfordern einer Netzwerkadresse vom Kabelnetzwerk …"
+
 #~ msgid "Preparing device %s for the wireless network '%s'..."
 #~ msgstr "Vorbereiten des Geräts %s für das Funknetzwerk »%s« …"
+
 #~ msgid "Attempting to join the wireless network '%s'..."
 #~ msgstr "Versuch, dem Funknetzwerk »%s« beizutreten …"
+
 #~ msgid "Waiting for Network Key for the wireless network '%s'..."
 #~ msgstr "Warten auf den Netzwerkschlüssel für das Funknetzwerk »%s« …"
+
 #~ msgid "Connection Editor"
 #~ msgstr "Verbindungseditor"
+
 #~ msgid "System setting"
 #~ msgstr "Systemeinstellungen"
+
 #~ msgid "Passphrase for wireless network %s"
 #~ msgstr "Passphrase für Funknetzwerk %s"
+
 #~ msgid "Connection to the wireless network '%s' failed."
 #~ msgstr "Die Verbindung mit Funknetzwerk »%s« ist fehlgeschlagen."
+
 #~ msgid "Connection to the wired network failed."
 #~ msgstr "Die Verbindung mit dem Kabelnetzwerk ist fehlgeschlagen."
+
 #~ msgid "Could not find some required resources (the glade file)!"
 #~ msgstr ""
 #~ "Einige benötigte Ressourcen wurden nicht gefunden (die Glade-Datei fehlt)."
+
 #~ msgid "Wireless Ethernet (%s)"
 #~ msgstr "Funk-Ethernet (%s)"
+
 #~ msgid ""
 #~ "Copyright © 2004-2005 Red Hat, Inc.\n"
 #~ "Copyright © 2005-2006 Novell, Inc."
 #~ msgstr ""
 #~ "Copyright © 2004-2005 Red Hat, Inc.\n"
 #~ "Copyright © 2005-2006 Novell, Inc."
+
 #~ msgid "VPN Login Failure"
 #~ msgstr "VPN-Anmeldefehler"
+
 #~ msgid "Could not start the VPN connection '%s' due to a login failure."
 #~ msgstr ""
 #~ "VPN-Verbindung »%s« konnte auf Grund eines Anmeldefehlers nicht gestartet "
 #~ "werden."
+
 #~ msgid "VPN Start Failure"
 #~ msgstr "VPN-Startfehler"
+
 #~ msgid ""
-#~ "Could not start the VPN connection '%s' due to a failure launching the VPN "
-#~ "program."
+#~ "Could not start the VPN connection '%s' due to a failure launching the "
+#~ "VPN program."
 #~ msgstr ""
 #~ "Die VPN-Verbindung »%s« konnte infolge eines Fehlers beim Starten des VPN-"
 #~ "Programms nicht hergestellt werden."
+
 #~ msgid "VPN Configuration Error"
 #~ msgstr "VPN-Konfigurationsfehler"
+
 #~ msgid "The network device \"%s (%s)\" does not support wireless scanning."
 #~ msgstr "Das Netzwerkgerät »%s (%s)« unterstützt keine Funknetzwerksuche."
+
 #~ msgid "The network device \"%s (%s)\" does not support link detection."
 #~ msgstr "Das Netzwerkgerät »%s (%s)« unterstützt keine Link-Erkennung."
+
 #~ msgid "Finishing connection to the wired network..."
 #~ msgstr "Fertigstellen der Verbindung mit dem Kabelnetzwerk …"
+
 #~ msgid "NetworkManager is not running"
 #~ msgstr "Der Netzwerk-Manager läuft zur Zeit nicht"
+
 #~ msgid "Connected to an Ad-Hoc wireless network"
 #~ msgstr "Verbunden mit einem Ad-Hoc-Funknetzwerk"
+
 #~ msgid "VPN connecting to '%s'"
 #~ msgstr "VPN verbindet zu »%s«"
+
 #~ msgid "_Dial Up Connections"
 #~ msgstr "_Einwahlverbindungen"
+
 #~ msgid "Connect to %s..."
 #~ msgstr "Verbinden mit %s …"
+
 #~ msgid "Disconnect from %s..."
 #~ msgstr "Trennen von %s …"
-#~ msgid "Open System"
-#~ msgstr "Offenes System"
-#~ msgid "Shared Key"
-#~ msgstr "Gemeinsamer Schlüssel (PSK)"
+
 #~ msgid "AES-CCMP"
 #~ msgstr "AES-CCMP"
+
 #~ msgid "TKIP"
 #~ msgstr "TKIP"
-#~ msgid "WEP 64/128-bit ASCII"
-#~ msgstr "WEP 64/128-bit ASCII"
+
 #~ msgid "TTLS"
 #~ msgstr "TTLS"
+
 #~ msgid "WPA Enterprise"
 #~ msgstr "WPA Enterprise"
+
 #~ msgid "Orientation"
 #~ msgstr "Ausrichtung"
+
 #~ msgid "The orientation of the tray."
 #~ msgstr "Die Ausrichtung des Benachrichtigungsfeldes."
+
 #~ msgid " (invalid Unicode)"
 #~ msgstr " (ungültiger Unicode)"
+
 #~ msgid ""
-#~ "By default, the wireless network's name is set to your computer's name, %"
-#~ "s, with no encryption enabled"
+#~ "By default, the wireless network's name is set to your computer's name, "
+#~ "%s, with no encryption enabled"
 #~ msgstr ""
 #~ "Als Vorgabe wird der Name Ihres Rechners »%s« als Netzwerkname verwendet "
 #~ "und keine Verschlüsselung eingerichtet."
+
 #~ msgid "Error connecting to wireless network"
 #~ msgstr "Fehler beim Verbinden mit dem Funknetzwerk"
+
 #~ msgid ""
 #~ "The requested wireless network requires security capabilities unsupported "
 #~ "by your hardware."
 #~ msgstr ""
 #~ "Dieses Funknetzwerk erfordert Sicherheitsfunktionen, die ihre Hardware "
 #~ "nicht unterstützt."
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
 #~ "Network</span>\n"
@@ -2389,6 +4513,7 @@ msgstr "محفوظ EAP (PEAP)"
 #~ "\n"
 #~ "Für den Zugang zu dem Funknetzwerk »%s« wird ein Schlüssel oder eine "
 #~ "Passphrase benötigt."
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</"
 #~ "span>\n"
@@ -2399,9 +4524,10 @@ msgstr "محفوظ EAP (PEAP)"
 #~ "Netzwerkfunktionalität</span>\n"
 #~ "\n"
 #~ "%s  Es könnte zu Fehlfunktionen kommen."
+
 #~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login Confirmation</"
-#~ "span>\n"
+#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
+#~ "Confirmation</span>\n"
 #~ "\n"
 #~ "You have chosen to log in to the wireless network '%s'.  If you are sure "
 #~ "that this wireless network is secure, click the checkbox below and "
@@ -2414,14 +4540,16 @@ msgstr "محفوظ EAP (PEAP)"
 #~ "sind, dass dieses Funknetzwerk vertrauenswürdig ist, können Sie die unten "
 #~ "angegebene Option auswählen und der Netzwerk-Manager wird ab sofort keine "
 #~ "Bestätigung mehr für dieses Netzwerk verlangen."
+
 #~ msgid "Client Certificate File:"
 #~ msgstr "Datei mit Client-Zertifikat:"
+
 #~ msgid "Destination Address:"
 #~ msgstr "Zieladresse:"
-#~ msgid "Key Type:"
-#~ msgstr "Schlüsseltyp:"
+
 #~ msgid "Key management:"
 #~ msgstr "Schlüsselverwaltung:"
+
 #~ msgid ""
 #~ "None\n"
 #~ "WEP 128-bit Passphrase\n"
@@ -2432,44 +4560,51 @@ msgstr "محفوظ EAP (PEAP)"
 #~ "WEP 128-bit Passphrase\n"
 #~ "WEP 64/128-bit Hex\n"
 #~ "WEP 64/128-bit ASCII\n"
+
 #~ msgid "Passphrase:"
 #~ msgstr "Passphrase:"
+
 #~ msgid "Select the Client Certificate File"
 #~ msgstr "Die Datei mit dem Client-Zertifikat auswählen"
+
 #~ 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"
+
 #~ msgid "_Fallback on this Network"
 #~ msgstr "Netzwerk ist _Ausweichlösung"
-#~ msgid "_Login to Network"
-#~ msgstr "_Am Netzwerk anmelden"
+
 #~ msgid ""
 #~ "No suitable VPN software was found on your system. Contact your system "
 #~ "administrator."
 #~ msgstr ""
 #~ "Die notwendige VPN-Software wurde nicht gefunden. Bitte setzen Sie sich "
 #~ "mit Ihrem Systemadministrator in Verbindung."
+
 #~ msgid ""
 #~ "Cannot find suitable software for VPN connection type '%s' to import the "
 #~ "file '%s'. Contact your system administrator."
 #~ msgstr ""
-#~ "Die notwendige Software für VPN-Verbindungen vom Typ »%s« wurde beim Import "
-#~ "der Datei »%s« nicht gefunden. Bitte setzen Sie sich mit Ihrem "
+#~ "Die notwendige Software für VPN-Verbindungen vom Typ »%s« wurde beim "
+#~ "Import der Datei »%s« nicht gefunden. Bitte setzen Sie sich mit Ihrem "
 #~ "Systemadministrator in Verbindung."
-#~ msgid "Error retrieving VPN connection '%s'"
-#~ msgstr "Fehler beim Abrufen der VPN-Verbindung »%s«"
+
 #~ msgid ""
 #~ "Could not find the UI files for VPN connection type '%s'. Contact your "
 #~ "system administrator."
 #~ msgstr ""
-#~ "Die Dateien für die Benutzerschnittstelle für VPN-Verbindungen vom Typ »%s« "
-#~ "wurden nicht gefunden. Bitte setzen Sie sich mit Ihrem Systemadministrator "
-#~ "in Verbindung."
+#~ "Die Dateien für die Benutzerschnittstelle für VPN-Verbindungen vom Typ "
+#~ "»%s« wurden nicht gefunden. Bitte setzen Sie sich mit Ihrem "
+#~ "Systemadministrator in Verbindung."
+
 #~ msgid "Delete VPN connection \"%s\"?"
 #~ msgstr "Möchten Sie die VPN-Verbindungen »%s« löschen?"
+
 #~ msgid ""
 #~ "All information about the VPN connection \"%s\" will be lost and you may "
 #~ "need your system administrator to provide information to create a new "
@@ -2478,77 +4613,108 @@ msgstr "محفوظ EAP (PEAP)"
 #~ "Alle Informationen über die VPN-Verbindung »%s« werden verloren gehen und "
 #~ "Sie werden Ihren Systemadministrator für das Bereitstellen der "
 #~ "Informationen für eine neue Verbindung benötigen."
+
 #~ msgid "Unable to load"
 #~ msgstr "Konnte nicht geladen werden"
+
 #~ msgid "Cannot find some needed resources (the glade file)!"
 #~ msgstr ""
 #~ "Einige benötigte Ressourcen wurden nicht gefunden (die Glade-Datei fehlt)."
+
 #~ msgid "Add a new VPN connection"
 #~ msgstr "Neue VPN-Verbindung erstellen"
+
 #~ msgid "Export the VPN settings to a file"
 #~ msgstr "Die Verbindungseinstellungen des VPN in eine Datei exportieren"
+
 #~ msgid "Export the selected VPN connection to a file"
 #~ msgstr "Ausgewählte VPN-Verbindung in eine Datei exportieren"
+
 #~ msgid "VPN Connections"
 #~ msgstr "VPN-Verbindungen"
+
 #~ msgid "40-bit WEP"
 #~ msgstr "40-bit WEP"
+
 #~ msgid "104-bit WEP"
 #~ msgstr "104-bit WEP"
+
 #~ msgid "WPA TKIP"
 #~ msgstr "WPA TKIP"
+
 #~ msgid "WPA CCMP"
 #~ msgstr "WPA CCMP"
+
 #~ msgid "WPA2 TKIP"
 #~ msgstr "WPA2 TKIP"
+
 #~ msgid "WPA2 CCMP"
 #~ msgstr "WPA2 CCMP"
+
 #~ msgid "WPA2 Automatic"
 #~ msgstr "WPA2 Automatisch"
+
 #~ msgid ""
 #~ "unable to create netlink socket for monitoring wired ethernet devices - %s"
 #~ msgstr ""
 #~ "Erstellung eines Netlink-Socket zur Überwachung von Kabelnetzwerkgeräten "
 #~ "fehlgeschlagen - %s"
+
 #~ msgid ""
-#~ "unable to bind to netlink socket for monitoring wired ethernet devices - %s"
+#~ "unable to bind to netlink socket for monitoring wired ethernet devices - "
+#~ "%s"
 #~ msgstr ""
 #~ "Bindung an den Netlink-Socket zur Überwachung von Kabelnetzwerkgeräten "
 #~ "fehlgeschlagen - %s"
+
 #~ msgid "operation took too long"
 #~ msgstr "Vorgang dauerte zu lange"
+
 #~ msgid "received data from wrong type of sender"
 #~ msgstr "Daten von einem falschen Absendertyp erhalten"
+
 #~ msgid "received data from unexpected sender"
 #~ msgstr "Daten von einem unerwarteten Absender erhalten"
+
 #~ msgid "too much data was sent over socket and some of it was lost"
 #~ msgstr ""
 #~ "Es wurden zu viele Daten über den Socket gesendet und einige davon sind "
 #~ "verloren gegangen"
+
 #~ msgid "error occurred while waiting for data on socket"
 #~ msgstr "Während des Wartens auf Daten am Socket ist ein Fehler aufgetreten"
+
 #~ msgid "You are now connected to the Ad-Hoc wireless network '%s'."
 #~ msgstr "Sie sind nun mit dem Ad-Hoc-Funknetzwerk »%s« verbunden."
+
 #~ msgid ""
 #~ "The requested wireless network '%s' does not appear to be in range.  A "
 #~ "different wireless network will be used if any are available."
 #~ msgstr ""
-#~ "Das gewünschte Funknetzwerk »%s« scheint nicht in Reichweite zu sein. Falls "
-#~ "weitere Funknetzwerke verfügbar sind, wird ein anderes verwendet."
+#~ "Das gewünschte Funknetzwerk »%s« scheint nicht in Reichweite zu sein. "
+#~ "Falls weitere Funknetzwerke verfügbar sind, wird ein anderes verwendet."
+
 #~ msgid "VPN Error"
 #~ msgstr "VPN-Fehler"
+
 #~ msgid "The VPN service said: \"%s\""
 #~ msgstr "Anwort des VPN-Dienstes: »%s«"
+
 #~ msgid "_Passphrase:"
 #~ msgstr "_Passwort:"
+
 #~ msgid "_ASCII Key:"
 #~ msgstr "_ASCII-Schlüssel:"
+
 #~ msgid "_Hex Key:"
 #~ msgstr "_Hexadezimalschlüssel:"
+
 #~ msgid ", with no encryption enabled."
 #~ msgstr ", ohne aktivierte Verschlüsselung."
+
 #~ msgid "ASCII Key:"
 #~ msgstr "ASCII-Schlüssel:"
+
 #~ msgid ""
 #~ "128-bit Passphrase (WEP)\n"
 #~ "ASCII Key (WEP)\n"
@@ -2557,6 +4723,7 @@ msgstr "محفوظ EAP (PEAP)"
 #~ "128-Bit Passwort (WEP)\n"
 #~ "ASCII-Schlüssel (WEP)\n"
 #~ "Hexadezimalschlüssel (WEP)"
+
 #~ msgid ""
 #~ "128-bit passphrase (WEP)\n"
 #~ "ASCII key (WEP)\n"
@@ -2565,21 +4732,26 @@ msgstr "محفوظ EAP (PEAP)"
 #~ "128-Bit Passwort (WEP)\n"
 #~ "ASCII-Schlüssel (WEP)\n"
 #~ "Hexadezimalschlüssel (WEP)"
+
 #~ msgid "Connect with _encryption enabled"
 #~ msgstr "Mit aktivierter _Verschlüsselung verbinden"
+
 #~ msgid "Wireless _network:"
 #~ msgstr "_Funknetzwerk:"
+
 #~ msgid "_Key type:"
 #~ msgstr "_Schlüsseltyp:"
+
 #~ msgid "Choose which type of VPN connection you wish to create."
 #~ msgstr ""
 #~ "Bitte wählen Sie aus, welche Art VPN-Verbindung Sie erstellen möchten."
-#~ msgid "Create VPN Connection - 1 of 2"
-#~ msgstr "Neue VPN-Verbindungen erstellen - 1 von 2"
+
 #~ msgid "Create VPN Connection - 2 of 2"
 #~ msgstr "Neue VPN-Verbindungen erstellen - 2 von 2"
+
 #~ msgid "Finish Creating VPN Connection"
 #~ msgstr "Erstellen der VPN-Verbindung abschließen"
+
 #~ msgid ""
 #~ "This assistant will guide you through the creation of a connection to a "
 #~ "Virtual Private Network (VPN).\n"
@@ -2592,4 +4764,3 @@ msgstr "محفوظ EAP (PEAP)"
 #~ "\n"
 #~ "Dazu benötigen Sie eventuell einige Informationen, wie z.B. IP-Adressen "
 #~ "und Passwörter, welche Sie durch Ihren Systemadministrator erhalten."
-
diff --git a/po/vi.po b/po/vi.po
index 96a158f0..56d17299 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,9 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-11-27 23:05+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -21,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "Mạng"
 
@@ -117,46 +116,90 @@ 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."
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Quản lý mạng"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Quản lý mạng"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "Kết nố_i"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "Tê_n mạng:"
 
-#: ../src/applet.c:573
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "Lỗi thêm/kích hoạt kết nối"
 
-#: ../src/applet.c:575 ../src/applet.c:619 ../src/applet.c:645
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "Lỗi lạ"
 
-#: ../src/applet.c:578 ../src/applet.c:648 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "Gặp lỗi kết nối"
 
-#: ../src/applet.c:617
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "Gặp lỗi khi ngắt kết nối thiết bị"
 
-#: ../src/applet.c:622
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "Lỗi ngắt kết nối"
 
-#: ../src/applet.c:643
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "Lỗi kích hoạt kết nối"
 
-#: ../src/applet.c:956 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "Đừng nhắc nữa"
 
-#: ../src/applet.c:1045
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -166,7 +209,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi vì kết nối mạng bị ngắt."
 
-#: ../src/applet.c:1048
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -175,7 +218,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi vì dịch vụ VPN dừng đột ngột."
 
-#: ../src/applet.c:1051
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -185,7 +228,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:1054
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +237,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi vì hết hạn kết nối."
 
-#: ../src/applet.c:1057
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -203,7 +246,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:1060
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -212,7 +255,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:1063
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -221,7 +264,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:1066
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -230,7 +273,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:1073
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -239,7 +282,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” lỗi."
 
-#: ../src/applet.c:1091
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -249,7 +292,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:1094
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -258,7 +301,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” bị ngắt vì dịch vụ VPN dừng đột ngột."
 
-#: ../src/applet.c:1100
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -267,7 +310,7 @@ msgstr ""
 "\n"
 "Kết nối VPN “%s” bị ngắt."
 
-#: ../src/applet.c:1130
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -278,19 +321,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1132
+#: ../src/applet.c:929
 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:1134
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "Thông điệp đăng nhập VPN"
 
-#: ../src/applet.c:1140 ../src/applet.c:1148 ../src/applet.c:1198
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "Lỗi kết nối VPN"
 
-#: ../src/applet.c:1205
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -303,7 +346,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1208
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -316,798 +359,544 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1536
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "thiết bị chưa sẵn sàng (thiếu firmware)"
 
-#: ../src/applet.c:1538
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "thiết bị chưa sẵn sàng"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1548 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "đã ngắt kết nối"
 
-#: ../src/applet.c:1564
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "Ngắt kết nối"
 
-#: ../src/applet.c:1578
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "thiết bị không được quản lý"
 
-#: ../src/applet.c:1738
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "Không tìm thấy thiết bị mạng dùng được"
 
-#: ../src/applet.c:1791
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "Kết nối _VPN"
 
-#: ../src/applet.c:1848
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "_Cấu hình VPN…"
 
-#: ../src/applet.c:1852
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "N_gắt kết nối VPN"
 
-#: ../src/applet.c:1968
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Trình Quản lí Mạng đang không chạy…"
 
-#: ../src/applet.c:1973 ../src/applet.c:2951
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "Kết nối mạng tắt"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2193
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "Bật _mạng"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2202
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "Bật _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2211
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "Bật _di động băng thông rộng"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2220
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "Bật di động băng thông rộng WiMA_X"
-
 #. Toggle notifications item
-#: ../src/applet.c:2231
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "Bật _thông báo"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2242
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "Thông t_in kết nối"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2252
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "Sửa kết nối…"
 
-#. Help item
-#: ../src/applet.c:2266
-msgid "_Help"
-msgstr "Trợ _giúp"
-
-#. About item
-#: ../src/applet.c:2275
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "_Giới thiệu"
 
-#: ../src/applet.c:2528
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "Bạn đã kết nối đến mạng “%s”."
 
-#: ../src/applet.c:2569
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "Đã ngắt kết nối"
 
-#: ../src/applet.c:2570
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "Kết nối mạng đã bị ngắt."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "Đang chuẩn bị kết nối “%s”…"
 
-#: ../src/applet.c:2816
+#: ../src/applet.c:2477
 #, 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:2819 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "Đang lấy địa chỉ mạng cho “%s”…"
 
-#: ../src/applet.c:2822
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "Kết nối “%s” đã hoạt động"
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "Đang bắt đầu kết nối VPN “%s”…"
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2560
 #, 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:2911
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "Đang lấy địa chỉ VPN cho “%s”…"
 
-#: ../src/applet.c:2914
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "Kết nối VPN “%s” đã hoạt động"
 
-#: ../src/applet.c:2956
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "Không có kết nối mạng"
 
-#: ../src/applet.c:3599
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "Quản lý mạng"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "Dùng được"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "Kết nối được thiết lập"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "Bạn đã kết nối đến mạng bond."
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "Đang chuẩn bị kết nối kiểu bond “%s”…"
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "Đang cấu hình kết nối kiểu bond “%s”…"
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "Cần xác thực cho kết nối bond “%s”…"
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "Đang lấy địa chỉ cho “%s”…"
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "Kết nối bond “%s” đang hoạt động"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "Bạn đã kết nối đến mạng kiểu cầu."
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "Đang chuẩn bị kết nối kiểu cầu “%s”…"
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "Đang cấu hình kết nối kiểu cầu “%s”…"
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "Cần xác thực cho kết nối kiểu cầu “%s”…"
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "Kết nối Bridge “%s” đã hoạt động"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 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:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "Đang gửi mã mở khoá…"
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "Di động băng thông rộng (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/connection-helpers.c:125
-#: ../src/connection-editor/page-mobile.c:350
-#: ../src/libnm-gtk/nm-ui-utils.c:334
+#: ../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
 msgid "Mobile Broadband"
 msgstr "Di động băng thông rộng"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "Dùng được"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 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:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "Kết nối được thiết lập"
+
+#: ../src/applet-device-broadband.c:816
 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:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "Mạng di động băng thông rộng."
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "Bạn đã đăng ký mạng nhà."
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 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:103
+#: ../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:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, 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:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, 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:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, 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:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, 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"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "Kết nối di động băng thông rộng (CDMA) mới…"
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "Bạn đã kết nối đến mạng CDMA."
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "Mạng CDMA."
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "Ethernet tự động"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "Mạng Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "Mạng Ethernet (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "Mạng Ethernet"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "Mạng Ethernet"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../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:171
+#: ../src/applet-device-ethernet.c:161
 #, 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:174
+#: ../src/applet-device-ethernet.c:164
 #, 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:177
+#: ../src/applet-device-ethernet.c:167
 #, 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:180
+#: ../src/applet-device-ethernet.c:170
 #, 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:184
+#: ../src/applet-device-ethernet.c:174
 #, 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:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "Xác thực DSL"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "Kết nối di động băng thông rộng (GSM) mới…"
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "Bạn đã kết nối đến mạng GSM."
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "Mạng GSM."
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "InfiniBand tự động"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "Mạng InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "Mạng InfiniBand (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "Mạng InfiniBand"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "Mạng InfiniBand"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "Bạn đã kết nối đến mạng InfiniBand."
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "Đang chuẩn bị kết nối InfiniBand “%s”…"
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "Đang cấu hình kết nối Infini “%s”…"
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "Cần xác thực cho kết nối InfiniBand “%s”…"
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "Kết nối InfiniBand “%s” đã hoạt động"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "Bạn đã kết nối đến mạng team."
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "Đang chuẩn bị kết nối team “%s”…"
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "Đang cấu hình kết nối team “%s”…"
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "Cần xác thực cho kết nối Vteam “%s”…"
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "Kết nối Team “%s” đã hoạt động"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "Bạn đã kết nối đến mạng VLAN."
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "Đang bắt đầu kết nối VLAN “%s”…"
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "Đang cấu hình kết nối VLAN “%s”…"
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "Cần xác thực cho kết nối VLAN “%s”…"
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "Kết nối VLAN “%s” đã hoạt động"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "_Kết nối tới mạng Wi-Fi ẩn…"
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "Tạo mạ_ng Wi-Fi mới…"
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(không)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Mạng Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Mạng Wi-Fi (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Mạng Wi-Fi"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi bị tắt"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi bị tắt từ phần cứng"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "Thêm mạng"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Mạng Wi-Fi có thể dùng"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 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:1242
+#: ../src/applet-device-wifi.c:1364
 #, 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:1273
+#: ../src/applet-device-wifi.c:1399
 #, 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:1276
+#: ../src/applet-device-wifi.c:1402
 #, 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:1279
+#: ../src/applet-device-wifi.c:1405
 #, 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:1282
+#: ../src/applet-device-wifi.c:1408
 #, 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:1303
+#: ../src/applet-device-wifi.c:1419
 #, 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:1308
+#: ../src/applet-device-wifi.c:1423
 #, 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:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "Lỗi kích hoạt kết nối"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "Lỗi thêm kết nối mới"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX di động băng thông rộng (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX di động băng thông rộng"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX bị tắt"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX bị tắt phần cứng"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "Bạn đã kết nối đến mạng WiMAX."
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, 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/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "chuyển vùng"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 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:109
-#: ../src/connection-editor/page-wifi-security.c:318
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "WEP động"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "Địa chỉ"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:270
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "Không"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (mặc định)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/giây"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "không rõ"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "không rõ"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "Địa chỉ IP:"
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "Địa chỉ IP:"
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "Địa chỉ quảng bá:"
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "Mặt nạ mạng:"
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "Định tuyến mặc định:"
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "Mặt nạ mạng:"
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "Ethernet (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:322
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "Chung"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "Giao diện:"
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "Địa chỉ phần cứng:"
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "Trình điều khiển:"
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "Tốc độ:"
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "Bảo mật:"
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR:"
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID:"
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "Định tuyến mặc định:"
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "Bỏ qua"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "Kiểu VPN:"
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "Cổng VPN:"
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "Tên người dùng VPN:"
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "Khẩu hiện VPN:"
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "Kết nối cơ sở:"
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:348
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "Không rõ"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "Không có kết nối hoạt động!"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1115,42 +904,42 @@ 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:987
+#: ../src/applet-dialogs.c:988
 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:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "Trang web NetworkManager"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "Thiếu tài nguyên"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "Mật khẩu mạng di động băng thông rộng"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, 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:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "Mật khẩu:"
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "Cần PIN mở khoá SIM"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 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:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1159,25 +948,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:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "Mã PIN:"
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "Hiện mã PIN"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "Cần PUK mở khoá SIM"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 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:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1186,27 +975,34 @@ 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:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "Mã PUK:"
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "Mã PIN mới:"
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "Nhập lại mã PIN:"
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "Hiện mã PIN/PUK"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1216,26 +1012,48 @@ 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:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "_Xoá"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "_Bỏ qua định tuyến lấy tự động"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 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:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 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:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1243,15 +1061,15 @@ msgstr "Nếu bật, kết nối này sẽ không bao giờ được dùng làm
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "Tạo…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 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.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1304,48 +1122,41 @@ msgid "Bonded _connections:"
 msgstr "_Kết nối bond:"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
 msgstr "_Chế độ:"
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:697
-msgid "_Edit"
-msgstr "_Sửa"
-
-#. Delete
 #: ../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:713
-msgid "_Delete"
-msgstr "_Xoá"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "_Sửa"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "_Tần số theo dõi:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "ms"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "Tên _giao tiếp:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "Theo dõi _liên kết:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "Đí_ch ARP:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
@@ -1353,19 +1164,19 @@ 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "Trễ liên kết _lên:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "Trễ liên kết _xuống:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "_Chính:"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 msgid ""
 "The interface name of the primary device. If set, this device will always be "
 "the active slave when it is available."
@@ -1373,12 +1184,30 @@ 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "byte"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 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:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "Độ ư_u tiên:"
 
@@ -1390,44 +1219,89 @@ msgstr "Chế độ _Hairpin:"
 msgid "Bridged _connections:"
 msgstr "_Kết nối kiểu cầu:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "T_rễ chuyển tiếp:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "Thời gian c_hào hỏi:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "s"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "Bật _mạng"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "Bật _STP (Spanning Tree Protocol)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "Tuổi _tối đa:"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "Giờ t_uổi:"
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "tự động"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../src/connection-editor/ce-page.c:86
 #: ../src/connection-editor/ce-page-dcb.ui.h:13
-#: ../src/connection-editor/page-wifi.c:171
-#: ../src/connection-editor/page-wifi.c:175
-#: ../src/connection-editor/page-wifi.c:196
+#: ../src/connection-editor/page-wifi.c:168
+#: ../src/connection-editor/page-wifi.c:172
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "mặc định"
 
-#: ../src/connection-editor/ce-page.c:360
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "Địa chỉ"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "Địa chỉ"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "Bất kỳ thiết bị nào"
+
+#: ../src/connection-editor/ce-page.c:591
 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õ."
 
@@ -1526,75 +1400,75 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "Điều khiển luồng ưu tiên"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 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:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "Độ ưu tiên:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "Lớp giao thông:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "ăng thông hạn chế:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "Băng thông ưu tiên:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "Băng thông nhóm:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "Mã nhóm:"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 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:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1603,22 +1477,22 @@ 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 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:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 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:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1631,7 +1505,7 @@ 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:4
+#: ../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
@@ -1639,8 +1513,9 @@ 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:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1652,8 +1527,8 @@ msgstr "_Mật khẩu:"
 #: ../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:139
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "Tự động"
@@ -1708,18 +1583,18 @@ msgstr "Tự động _thương lượng"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "Đị_a chỉ MAC thiết bị:"
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "_Dịch vụ:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "Địa chỉ MAC _sao:"
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1729,19 +1604,54 @@ 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-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU:"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "byte"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "Mặc định"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "Bỏ qua"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "Quảng bá"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "_Mật khẩu khoá riêng:"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1780,8 +1690,8 @@ msgstr "Tự động với thiết lập DNS thủ công"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:3
 #: ../src/connection-editor/ce-page-ip6.ui.h:3
-#: ../src/connection-editor/page-ip4.c:171
-#: ../src/connection-editor/page-ip6.c:196
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "Thủ công"
 
@@ -1792,8 +1702,8 @@ msgstr "Link-Local"
 
 #: ../src/connection-editor/ce-page-ip4.ui.h:5
 #: ../src/connection-editor/ce-page-ip6.ui.h:5
-#: ../src/connection-editor/page-ip4.c:189
-#: ../src/connection-editor/page-ip6.c:216
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "Chia sẻ với máy khác"
 
@@ -1807,7 +1717,7 @@ msgstr "_Phương pháp:"
 msgid "Addresses"
 msgstr "Địa chỉ"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1816,32 +1726,32 @@ 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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 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
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
 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:309
-#: ../src/connection-editor/page-ip6.c:318
+#: ../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
 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:300
-#: ../src/connection-editor/page-ip6.c:309
+#: ../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:"
 msgstr "Máy chủ _DNS:"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1849,11 +1759,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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1861,13 +1771,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 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/page-ip4.c:196
 msgid "Disabled"
 msgstr "Tắt"
 
@@ -1879,7 +1789,7 @@ msgstr "Bật (đưa ra địa chỉ công)"
 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.h:17
 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 "
@@ -1889,15 +1799,15 @@ 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
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 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.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1906,71 +1816,38 @@ msgstr ""
 "nhưng IPv4 thành công."
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "Bất kỳ"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "Ưu tiên 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "Ưu tiên 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "Ưu tiên 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "Chỉ dùng 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "Cơ bản"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "_Số:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "_ID mạng:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "_Kiểu:"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "Thay đổi…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN:"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 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:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "_Hiện mật khẩu"
 
@@ -2036,32 +1913,55 @@ msgid "_Teamed connections:"
 msgstr "Các kết nối _Team:"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "N_hập cấu hình team đã lưu từ tập tin…"
+#, 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-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "Giao tiếp _cha:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "_Tên giao tiếp VLAN:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "Địa chỉ MAC _nhân bản:"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "_ID VLAN:"
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "Tên thiết bị + số"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + số"
 
@@ -2078,94 +1978,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "Cơ sở hạ tầng"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 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.h:14
 msgid "Mb/s"
 msgstr "Mb/giây"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "_Tốc độ:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "_Kênh:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "_Băng tần:"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "_Chế độ:"
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID:"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "Cách xác thực được phép"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "Extensible Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "Password Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake Authentication Protocol"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 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:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2173,78 +2077,78 @@ 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:122
-#: ../src/connection-editor/page-ethernet.c:240
-#: ../src/libnm-gtk/nm-ui-utils.c:324
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/connection-editor/connection-helpers.c:123
-#: ../src/connection-editor/page-wifi.c:464 ../src/libnm-gtk/nm-ui-utils.c:326
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/connection-helpers.c:131
-#: ../src/connection-editor/page-wimax.c:123
-#: ../src/libnm-gtk/nm-ui-utils.c:332 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "Bluetooth"
 
-#: ../src/connection-editor/connection-helpers.c:132
-#: ../src/connection-editor/page-dsl.c:135
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/connection-helpers.c:133
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:336
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/connection-helpers.c:134
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:338
-#: ../src/libnm-gtk/nm-ui-utils.c:582
+#: ../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
 msgid "Bond"
 msgstr "Bond"
 
-#: ../src/connection-editor/connection-helpers.c:135
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:340
-#: ../src/libnm-gtk/nm-ui-utils.c:584
+#: ../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
 msgid "Team"
 msgstr "Team"
 
-#: ../src/connection-editor/connection-helpers.c:136
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:342 ../src/libnm-gtk/nm-ui-utils.c:586
+#: ../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
 msgid "Bridge"
 msgstr "Bridge"
 
-#: ../src/connection-editor/connection-helpers.c:137
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:344
-#: ../src/libnm-gtk/nm-ui-utils.c:588
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/connection-helpers.c:146
-#: ../src/connection-editor/connection-helpers.c:286
-#: ../src/connection-editor/page-vpn.c:112
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/connection-helpers.c:232
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "Phần cứng"
 
-#: ../src/connection-editor/connection-helpers.c:256
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "Ảo"
 
-#: ../src/connection-editor/connection-helpers.c:324
-#: ../src/connection-editor/connection-helpers.c:326
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "Nhập cấu hình VPN đã lưu…"
 
-#: ../src/connection-editor/connection-helpers.c:355
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
@@ -2252,58 +2156,79 @@ 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:364
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "Không thể tạo kết nối mới"
 
-#: ../src/connection-editor/connection-helpers.c:499
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "Lỗi xoá kết nối"
 
-#: ../src/connection-editor/connection-helpers.c:546
+#: ../src/connection-editor/connection-helpers.c:517
 #, 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:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:925
-#: ../src/connection-editor/page-ip6.c:921
+#: ../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
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:942
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
 msgid "Netmask"
 msgstr "Mặt nạ mạng"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:959
-#: ../src/connection-editor/page-ip6.c:955
+#: ../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
 msgid "Gateway"
 msgstr "Cổng ra"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
 msgid "Metric"
 msgstr "Thước đo"
 
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:938
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
 msgid "Prefix"
 msgstr "Tiền tố"
 
-#: ../src/connection-editor/nm-connection-editor.c:124
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "Sửa %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:128
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "Sửa kết nối không tên"
 
-#: ../src/connection-editor/nm-connection-editor.c:288
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "_Tên kết nối:"
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, 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:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "Lỗi thêm kết nối"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 msgid ""
 "The connection editor could not find some required resources (the .ui file "
 "was not found)."
@@ -2335,152 +2260,180 @@ msgstr "Không thể sửa kết nối"
 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:573
+#: ../src/connection-editor/nm-connection-editor.c:581
 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:912
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "Lỗi thêm kết nối"
 
-#: ../src/connection-editor/nm-connection-editor.c:952
-msgid "Error saving connection"
-msgstr "Lỗi lưu kết nối"
-
-#: ../src/connection-editor/nm-connection-editor.c:953
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "Thuộc tính “%s” / “%s” không hợp lệ: %d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "_Tên kết nối:"
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "_Xuất…"
 
-#: ../src/connection-editor/nm-connection-list.c:145
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "không bao giờ"
 
-#: ../src/connection-editor/nm-connection-list.c:156
-#: ../src/connection-editor/nm-connection-list.c:167
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "bây giờ"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:174
+#: ../src/connection-editor/nm-connection-list.c:156
 #, 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:178
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d giờ trước"
 
-#: ../src/connection-editor/nm-connection-list.c:190
+#: ../src/connection-editor/nm-connection-list.c:172
 #, 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:196
+#: ../src/connection-editor/nm-connection-list.c:178
 #, 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:200
+#: ../src/connection-editor/nm-connection-list.c:182
 #, 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:641
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "Tên"
 
-#: ../src/connection-editor/nm-connection-list.c:654
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "Dùng lần cuối"
 
-#: ../src/connection-editor/nm-connection-list.c:698
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "Sửa kết nối đã chọn"
 
-#: ../src/connection-editor/nm-connection-list.c:699
+#: ../src/connection-editor/nm-connection-list.c:685
 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:714
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "Xoá kết nối đã chọn"
 
-#: ../src/connection-editor/nm-connection-list.c:715
+#: ../src/connection-editor/nm-connection-list.c:701
 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:950
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "Chưa cài đặt phần bổ sung VPN."
 
-#: ../src/connection-editor/nm-connection-list.c:952
+#: ../src/connection-editor/nm-connection-list.c:931
 #, 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:954
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "Gặp lỗi tạo kết nối"
 
-#: ../src/connection-editor/nm-connection-list.c:1010
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "Lỗi sửa kết nối"
 
-#: ../src/connection-editor/nm-connection-list.c:1011
+#: ../src/connection-editor/nm-connection-list.c:956
 #, 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:119
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "An ninh 802.1x"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:111
 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:135
+#: ../src/connection-editor/page-8021x-security.c:125
 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:108
-#: ../src/libnm-gtk/nm-ui-utils.c:328
-msgid "Bluetooth"
-msgstr "Bluetooth"
+#: ../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:110
+#: ../src/connection-editor/page-bluetooth.c:125
 msgid "Could not load Bluetooth user interface."
 msgstr "Không thể tải giao diện Bluetooth."
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../src/connection-editor/page-bluetooth.c:175
+#, 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
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Kết nối bond %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "Bluetooth"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "Mạng Ethernet"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Mạng Wi-Fi"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "Không thể nạp giao diện bond."
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "_Chính:"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "Kết nối bond %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "Không thể nạp giao diện cầu."
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "Kết nối bridge %d"
@@ -2488,58 +2441,74 @@ 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:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "Cổng bridge"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 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:605
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:607
+#: ../src/connection-editor/page-dcb.c:605
 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:137
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "Không thể nạp giao diện DSL."
 
-#: ../src/connection-editor/page-dsl.c:229
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "Kết nối DSL %d"
 
-#: ../src/connection-editor/page-ethernet.c:79
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:94
-#: ../src/connection-editor/page-wimax.c:59
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 ""
 "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:242
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "Không thể nạp giao diện ethernet."
 
-#: ../src/connection-editor/page-ethernet.c:385
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "Ethernet"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "Địa chỉ MAC _sao:"
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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:56
-#: ../src/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "Mặc định"
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2549,116 +2518,168 @@ 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:58
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD chưa chạy."
 
-#: ../src/connection-editor/page-general.c:325
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "Không thể nạp giao diện chung."
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "Không thể nạp giao diện InfiniBand."
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "Kết nối InfiniBand %d"
 
-#: ../src/connection-editor/page-ip4.c:135
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "Tự động (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:136
-#: ../src/connection-editor/page-ip6.c:142
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "Tự động (VPN) chỉ địa chỉ"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
 msgid "Automatic, addresses only"
 msgstr "Tự động, chỉ địa chỉ"
 
-#: ../src/connection-editor/page-ip4.c:142
-#: ../src/connection-editor/page-ip6.c:144
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "Tự động (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:143
-#: ../src/connection-editor/page-ip6.c:145
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "Tự động (PPPoE) chỉ địa chỉ"
 
-#: ../src/connection-editor/page-ip4.c:145
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "Tự động (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:146
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "Tự động (DHCP) chỉ địa chỉ"
 
-#: ../src/connection-editor/page-ip4.c:183
-#: ../src/connection-editor/page-ip6.c:209
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "Chỉ Link-Local"
 
-#: ../src/connection-editor/page-ip4.c:298
-#: ../src/connection-editor/page-ip6.c:307
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "Máy chủ _DNS bổ sung:"
 
-#: ../src/connection-editor/page-ip4.c:307
-#: ../src/connection-editor/page-ip6.c:316
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "Miền _tìm kiếm bổ sung:"
 
-#: ../src/connection-editor/page-ip4.c:857
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "Sửa định tuyến IPv4 cho %s"
 
-#: ../src/connection-editor/page-ip4.c:1009
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "Thiết lập IPv4"
 
-#: ../src/connection-editor/page-ip4.c:1011
+#: ../src/connection-editor/page-ip4.c:1160
 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-ip6.c:160
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "Bỏ qua"
 
-#: ../src/connection-editor/page-ip6.c:184
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "Tự động, chỉ DHCP"
 
-#: ../src/connection-editor/page-ip6.c:853
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "Sửa định tuyến IPv6 cho %s"
 
-#: ../src/connection-editor/page-ip6.c:1004
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "Thiết lập IPv6"
 
-#: ../src/connection-editor/page-ip6.c:1006
+#: ../src/connection-editor/page-ip6.c:1157
 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-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "Nhân đôi phần phụ thuộc"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, 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:256
+#: ../src/connection-editor/page-master.c:260
 #, c-format
 msgid ""
 "Slaves '%s' and '%s' apply to different virtual ports ('%s' and '%s') of the "
@@ -2667,25 +2688,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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s phụ thuộc %d"
 
-#: ../src/connection-editor/page-mobile.c:352
+#: ../src/connection-editor/page-mobile.c:310
 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:369
+#: ../src/connection-editor/page-mobile.c:327
 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:615
+#: ../src/connection-editor/page-mobile.c:529
 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:642
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
@@ -2693,84 +2714,84 @@ 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:647
+#: ../src/connection-editor/page-mobile.c:561
 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)"
 
-#: ../src/connection-editor/page-mobile.c:654
+#: ../src/connection-editor/page-mobile.c:568
 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:664 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:667 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:136
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:137
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:143
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "không có"
 
-#: ../src/connection-editor/page-ppp.c:203
+#: ../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:286
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "Thiết lập PPP"
 
-#: ../src/connection-editor/page-ppp.c:288
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "Không thể nạp giao diện PPP."
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "Chọn tập tin cần nhập"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "Lỗi: tập tin không chứa cấu hình dạng JSON đúng"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 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:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "Kết nối team %d"
@@ -2778,47 +2799,56 @@ 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:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "Cổng Team"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (thông qua \"%s\")"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Không có kết nối mạng"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "Không thể nạp giao diện vlan."
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "Kết nối VLAN %d"
 
-#: ../src/connection-editor/page-vpn.c:114
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "Không thể nạp giao diện VPN."
 
-#: ../src/connection-editor/page-vpn.c:129
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service 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:216
-#: ../src/connection-editor/page-vpn.c:313
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "Kết nối VPN %d"
 
-#: ../src/connection-editor/page-vpn.c:242
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2828,11 +2858,11 @@ msgstr ""
 "\n"
 "Lỗi: không có kiểu dịch vụ VPN."
 
-#: ../src/connection-editor/page-vpn.c:267
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "Chọn loại kết nối VPN"
 
-#: ../src/connection-editor/page-vpn.c:268
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2841,7 +2871,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:84
+#: ../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"
@@ -2849,73 +2879,93 @@ 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:200
+#: ../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)\""
+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
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:466
+#: ../src/connection-editor/page-wifi.c:450
 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:637
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "Bất kỳ thiết bị nào"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, 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:295
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:305
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../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:331
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "WEP động (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:345
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../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:359
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 Kinh doanh"
 
-#: ../src/connection-editor/page-wifi-security.c:400
+#: ../src/connection-editor/page-wifi-security.c:413
 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:411
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "An ninh Wi-Fi"
 
-#: ../src/connection-editor/page-wifi-security.c:413
+#: ../src/connection-editor/page-wifi-security.c:426
 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-wimax.c:126
-msgid "Could not load WiMAX user interface."
-msgstr "Không thể nạp giao diện WiMAX"
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:222
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "Kết nối WiMAX %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "Không thể nhập kết nối VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2928,25 +2978,30 @@ msgstr ""
 "\n"
 "Lỗi:% s."
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "Lỗi lạ"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "Tập tin \"%s\" đã có."
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "_Thay thế"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "Không thể xuất kết nối VPN"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2957,11 +3012,11 @@ msgstr ""
 "\n"
 "Lỗi: %s."
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "Xuất kết nối VPN…"
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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)."
@@ -2969,93 +3024,11 @@ 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/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "Không thể cấu hình Bluetooth (kết nối D-Bus thất bại: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "Không thể cấu hình Bluetooth (lỗi tìm trình NetworkManager: (%s) %s)."
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "Dùng điện thoại di động làm thiết bị mạng (PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "Truy cập Internet thông qua điện thoại di động (DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "Lỗi: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "Gặp lỗi khi tạo kết nối DUN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:952
-msgid "Your phone is now ready to use!"
-msgstr "Điện thoại bạn đã có thể dùng!"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "Đã hủy bỏ Thuật sĩ cấu hình băng thông rộng"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "Loại điện thoại lạ (không phải GSM cũng như CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:721
-#: ../src/gnome-bluetooth/nma-bt-device.c:727
-msgid "failed to connect to the phone."
-msgstr "lỗi kết nối đến điện thoại."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:740
-msgid "error getting bus connection"
-msgstr "gặp lỗi khi lấy kết nối bus"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:794
-msgid "unexpectedly disconnected from the phone."
-msgstr "kết nối bị ngắt bất ngờ từ điện thoại."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:804
-msgid "timed out detecting phone details."
-msgstr "quá hạn dò tìm chi tiết điện thoại."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:815
-msgid "Detecting phone configuration..."
-msgstr "Đang tìm cấu hình điện thoại…"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:913
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr ""
-"Phải bật thiết bị điều hợp Bluetooth trước khi muốn thiết lập một Kết nối "
-"Mạng qua điện thoại."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:950
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "Lỗi tạo kết nối PAN: %s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:971
-#, c-format
-msgid "%s Network"
-msgstr "Mạng %s"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "_Bỏ khoá"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "Tự động gỡ khoá thiết bị này"
 
@@ -3063,31 +3036,36 @@ msgstr "Tự động gỡ khoá thiết bị này"
 msgid "Connection Information"
 msgstr "Thông tin kết nối"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "Kết nối mạng hoạt động"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../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/libnm-gtk/nm-mobile-wizard.c:222
+#: ../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/libnm-gtk/nm-mobile-wizard.c:233
+#: ../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/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3101,23 +3079,28 @@ msgstr ""
 "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/libnm-gtk/nm-mobile-wizard.c:267
+#: ../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/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "Không liệt kê"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../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/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3130,67 +3113,83 @@ msgstr ""
 "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/libnm-gtk/nm-mobile-wizard.c:514
+#: ../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/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "Không thấy gói cước của tôi…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "Nhà cung cấp"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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 "Không tìm thấy nhà cung cấp, để tôi nhập _tay:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "Nhà cung cấp:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../src/libnma/nma-mobile-wizard.c:1126
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1127
 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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "Thiết bị GSM đã cài đặt"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "Thiết bị CDMA đã cài đặt"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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."
@@ -3198,148 +3197,195 @@ 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/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "Tên nhà cung cấp"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "Tên gói cước"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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 "(trong vài trường hợp) APN (Access Point Name) của gói cước"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "Tạo kết nối đến thiết bị di động băng thông rộng _này:"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../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/libnm-gtk/nm-ui-utils.c:305 ../src/libnm-gtk/nm-ui-utils.c:374
-msgid "Wired"
-msgstr "Dây"
+#: ../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/libnm-gtk/nm-ui-utils.c:330
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:346
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:409
-msgid "PCI"
-msgstr "PCI"
+#: ../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/libnm-gtk/nm-ui-utils.c:411
-msgid "USB"
-msgstr "USB"
+#: ../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ụ:"
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:487 ../src/libnm-gtk/nm-ui-utils.c:507
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%2$s %1$s"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "Mật khẩu _phụ:"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:441
+#: ../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-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "Mới…"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "Không"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "_Tạo"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, 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/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Cần xác thực mạng Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Cần xác thực mạng Wi-Fi"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "Tạo mạng Wi-Fi mới"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "Mạng Wi-Fi mới"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 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/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "Kết nối đến mạng Wi-Fi ẩn"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "Mạng Wi-Fi ẩn"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 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/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "Mật khẩu _phụ:"
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "_Hiện mật khẩu"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "_An ninh Wi-Fi:"
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "_Kết nối:"
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "_Bộ điều hợp Wi-Fi:"
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%2$s %1$s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "Cách dùng:"
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3347,7 +3393,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:76
+#: ../src/main.c:45
 msgid ""
 "It is not intended for command-line interaction but instead runs in the "
 "GNOME desktop environment."
@@ -3355,138 +3401,151 @@ 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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "chưa bật"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "chưa đăng ký"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "Mạng nhà (%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "Mạng nhà"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "đang tìm"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "đăng ký bị từ chối"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../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:165
+#: ../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:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "Mạng chuyển vùng"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, 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:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "Cần mã PIN"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 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:619
+#, 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:622
+msgid "roaming"
+msgstr "chuyển vùng"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "Kết nối %s"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "Chỉ lưu mật khẩu cho tài _khoản này"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-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/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "Chứng nhậng DER hoặc PEM (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "Chọn tập tin PAC…"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "Tập tin PAC (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "Mọi tập tin"
 
@@ -3522,15 +3581,32 @@ msgstr "Xác thực _trong:"
 msgid "Allow automatic PAC pro_visioning"
 msgstr "Cho phép tự động dự liệ_u PAC"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "Chọn chứng nhận CA (Certificate Authority)…"
 
@@ -3558,15 +3634,46 @@ msgstr "Không có chứng nhận CA như _yêu cầu"
 msgid "PEAP _version:"
 msgstr "Phiên bản _PEAP:"
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "_Hỏi mật khẩu mỗi lần"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "_Chứng nhận CA:"
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "Khoá riêng mà không mã hoá là không an toàn"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3580,11 +3687,11 @@ msgstr ""
 "\n"
 "(Bạn có thể bảo vệ bằng mật khẩu khoá cá nhân của bạn với openssl)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "Chọn chứng nhận cá nhân…"
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "Chọn khoá riêng…"
 
@@ -3604,23 +3711,36 @@ msgstr "_Khoá riêng:"
 msgid "_Private key password:"
 msgstr "_Mật khẩu khoá riêng:"
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "Đường hầm TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "EAP Bảo vệ (PEAP)"
 
@@ -3630,6 +3750,44 @@ msgstr "EAP Bảo vệ (PEAP)"
 msgid "Au_thentication:"
 msgstr "_Xác thực:"
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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)"
@@ -3654,6 +3812,281 @@ msgstr "_Hiện khoá"
 msgid "WEP inde_x:"
 msgstr "_Chỉ mục WEP:"
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "_Kiểu:"
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "Bật di động băng thông rộng WiMA_X"
+
+#~ msgid "_Help"
+#~ msgstr "Trợ _giúp"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "Bạn đã kết nối đến mạng bond."
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "Đang chuẩn bị kết nối kiểu bond “%s”…"
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "Đang cấu hình kết nối kiểu bond “%s”…"
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "Cần xác thực cho kết nối bond “%s”…"
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "Đang lấy địa chỉ cho “%s”…"
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "Kết nối bond “%s” đang hoạt động"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "Bạn đã kết nối đến mạng kiểu cầu."
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "Đang chuẩn bị kết nối kiểu cầu “%s”…"
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "Đang cấu hình kết nối kiểu cầu “%s”…"
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "Cần xác thực cho kết nối kiểu cầu “%s”…"
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "Kết nối Bridge “%s” đã hoạt động"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "Kết nối di động băng thông rộng (CDMA) mới…"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "Bạn đã kết nối đến mạng CDMA."
+
+#~ msgid "CDMA network."
+#~ msgstr "Mạng CDMA."
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "Kết nối di động băng thông rộng (GSM) mới…"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "Bạn đã kết nối đến mạng GSM."
+
+#~ msgid "GSM network."
+#~ msgstr "Mạng GSM."
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "InfiniBand tự động"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "Mạng InfiniBand (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "Mạng InfiniBand (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "Mạng InfiniBand"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "Mạng InfiniBand"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "Bạn đã kết nối đến mạng InfiniBand."
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "Đang chuẩn bị kết nối InfiniBand “%s”…"
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "Đang cấu hình kết nối Infini “%s”…"
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "Cần xác thực cho kết nối InfiniBand “%s”…"
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "Kết nối InfiniBand “%s” đã hoạt động"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "Bạn đã kết nối đến mạng team."
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "Đang chuẩn bị kết nối team “%s”…"
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "Đang cấu hình kết nối team “%s”…"
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "Cần xác thực cho kết nối Vteam “%s”…"
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "Kết nối Team “%s” đã hoạt động"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "Bạn đã kết nối đến mạng VLAN."
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "Đang bắt đầu kết nối VLAN “%s”…"
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "Đang cấu hình kết nối VLAN “%s”…"
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "Cần xác thực cho kết nối VLAN “%s”…"
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "Kết nối VLAN “%s” đã hoạt động"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX di động băng thông rộng (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX di động băng thông rộng"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX bị tắt"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX bị tắt phần cứng"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "Bạn đã kết nối đến mạng WiMAX."
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "không rõ"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "không rõ"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR:"
+
+#~ msgid "BSID:"
+#~ msgstr "BSID:"
+
+#~ msgid "_Mode:"
+#~ msgstr "_Chế độ:"
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "Đị_a chỉ MAC thiết bị:"
+
+#~ msgid "Any"
+#~ msgstr "Bất kỳ"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "Ưu tiên 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "Ưu tiên 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "Ưu tiên 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "Chỉ dùng 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "N_hập cấu hình team đã lưu từ tập tin…"
+
+#~ msgid "Infrastructure"
+#~ msgstr "Cơ sở hạ tầng"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "Lỗi lưu kết nối"
+
+#~ 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)."
+#~ msgstr "Không thể cấu hình Bluetooth (kết nối D-Bus thất bại: (%s) %s)."
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr ""
+#~ "Không thể cấu hình Bluetooth (lỗi tìm trình NetworkManager: (%s) %s)."
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "Dùng điện thoại di động làm thiết bị mạng (PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "Truy cập Internet thông qua điện thoại di động (DUN)"
+
+#~ 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!"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "Đã hủy bỏ Thuật sĩ cấu hình băng thông rộng"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "Loại điện thoại lạ (không phải GSM cũng như CDMA)"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "lỗi kết nối đến điện thoại."
+
+#~ msgid "error getting bus connection"
+#~ msgstr "gặp lỗi khi lấy kết nối bus"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "kết nối bị ngắt bất ngờ từ điện thoại."
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "quá hạn dò tìm chi tiết điện thoại."
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "Đang tìm cấu hình điện thoại…"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr ""
+#~ "Phải bật thiết bị điều hợp Bluetooth trước khi muốn thiết lập một Kết nối "
+#~ "Mạng qua điện thoại."
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "Lỗi tạo kết nối PAN: %s"
+
+#~ msgid "%s Network"
+#~ msgstr "Mạng %s"
+
 #~ msgid "Secondary DNS:"
 #~ msgstr "DNS phụ:"
 
@@ -3755,9 +4188,6 @@ msgstr "_Chỉ mục WEP:"
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "Không biết cách sửa kết nối “%s”"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "không thể tìm thiết bị Bluetooth."
-
 #~ msgid "Click on this icon to connect to a wireless network"
 #~ msgstr "Nhấn biểu tượng để kết nối mạng không dây"
 
diff --git a/po/wa.po b/po/wa.po
index 41bccf2a..4541c0d7 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,170 +7,3750 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-19 13:38-0400\n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: info-daemon/networks.glade:11
-msgid "Modify Wireless Networks"
-msgstr "Candjî les rantoeles sins fyis"
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
+#, fuzzy
+msgid "Network"
+msgstr "Rantoeles sins fyis"
 
-#: info-daemon/networks.glade:92
-msgid "<span weight=\"bold\">Wireless Networks:</span>"
-msgstr "<span weight=\"bold\">Rantoeles sins fyis:</span>"
+#: ../nm-applet.desktop.in.h:2
+#, fuzzy
+msgid "Manage your network connections"
+msgstr "Raloyaedjes rantoele"
 
-#: info-daemon/passphrase.glade:9
-msgid "Wireless Network Key Required"
-msgstr "I gn a mezåjhe d' ene clé d' ecriptaedje pol rantoele sins fyis"
+#: ../nm-connection-editor.desktop.in.h:1
+#: ../src/connection-editor/nm-connection-editor.ui.h:1
+msgid "Network Connections"
+msgstr "Raloyaedjes rantoele"
 
-#: info-daemon/passphrase.glade:52
-msgid "_Login to Network"
-msgstr "S' _elodjî sol rantoele"
+#: ../nm-connection-editor.desktop.in.h:2
+msgid "Manage and change your network connection settings"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:1
+msgid "Disable connected notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:2
+msgid "Set this to true to disable notifications when connecting to a network."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:3
+msgid "Disable disconnected notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:4
+msgid ""
+"Set this to true to disable notifications when disconnecting from a network."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:5
+msgid "Disable VPN notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:6
+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
+msgid "Suppress networks available notifications"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:8
+msgid ""
+"Set this to true to disable notifications when Wi-Fi networks are available."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:9
+msgid "Stamp"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:10
+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 WiFi Create"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:12
+msgid ""
+"Set to true to disable creation of adhoc networks when using the applet."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:13
+msgid "Show the applet in notification area"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:14
+msgid "Set to FALSE to disable displaying the applet in the notification area."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:15
+msgid "Ignore CA certificate"
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:16
+msgid ""
+"Set this to true to disable warnings about CA certificates in EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-applet.gschema.xml.in.h:17
+msgid ""
+"Set this to true to disable warnings about CA certificates in phase 2 of EAP "
+"authentication."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../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: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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr ""
 
-#: info-daemon/passphrase.glade:100
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 #, fuzzy
+msgid "_Network name:"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr ""
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
+msgid "Failed to add/activate connection"
+msgstr ""
+
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
+msgid "Unknown error"
+msgstr ""
+
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
+msgid "Connection failure"
+msgstr ""
+
+#: ../src/applet.c:399
+msgid "Device disconnect failed"
+msgstr ""
+
+#: ../src/applet.c:404
+msgid "Disconnect failure"
+msgstr ""
+
+#: ../src/applet.c:434
+msgid "Connection activation failed"
+msgstr ""
+
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
+msgid "Don't show this message again"
+msgstr ""
+
+#: ../src/applet.c:844
+#, c-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-"Network</span>\n"
 "\n"
-"A passphrase or encryption key is required to access the wireless network '%"
-"s'."
+"The VPN connection '%s' failed because the network connection was "
+"interrupted."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Li rantoele sins fyis a mezåjhe d' on "
-"scret</span>\n"
+
+#: ../src/applet.c:847
+#, c-format
+msgid ""
 "\n"
-"I gn a mezåjhe d' on sicret ou d' ene clé WEP po-z aveur accès al rantoele "
-"sins fyis «%s»."
+"The VPN connection '%s' failed because the VPN service stopped unexpectedly."
+msgstr ""
 
-#: info-daemon/passphrase.glade:129
-msgid "Key Type:"
+#: ../src/applet.c:850
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service returned invalid "
+"configuration."
 msgstr ""
 
-#: info-daemon/passphrase.glade:150
+#: ../src/applet.c:853
+#, c-format
 msgid ""
-"128-bit Passphrase\n"
-"128-bit Raw Hex Key"
+"\n"
+"The VPN connection '%s' failed because the connection attempt timed out."
 msgstr ""
 
-#: info-daemon/passphrase.glade:180
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:101
-msgid "Passphrase:"
-msgstr "Sicret:"
+#: ../src/applet.c:856
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service did not start in time."
+msgstr ""
 
-#: info-daemon/passphrase.glade:208 panel-applet/essid.glade:162
-msgid "*"
-msgstr "*"
+#: ../src/applet.c:859
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start."
+msgstr ""
 
-#: info-daemon/NetworkManagerInfoPassphraseDialog.c:104
-msgid "Key:"
+#: ../src/applet.c:862
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because there were no valid VPN secrets."
 msgstr ""
 
-#. Reuse the above string to make the translators less angry.
-#: panel-applet/NMWirelessApplet.c:691 panel-applet/NMWirelessApplet.c:701
+#: ../src/applet.c:865
+#, c-format
 msgid ""
-"The NetworkManager Applet could not find some required resources (the glade "
-"file was not found)."
+"\n"
+"The VPN connection '%s' failed because of invalid VPN secrets."
+msgstr ""
+
+#: ../src/applet.c:872
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed."
+msgstr ""
+
+#: ../src/applet.c:888
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the network connection was "
+"interrupted."
+msgstr ""
+
+#: ../src/applet.c:891
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected because the VPN service stopped."
 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é)."
 
-#: panel-applet/NMWirelessApplet.c:716
+#: ../src/applet.c:897
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' disconnected."
+msgstr ""
+
+#: ../src/applet.c:927
+#, c-format
+msgid ""
+"VPN connection has been successfully established.\n"
+"\n"
+"%s\n"
+msgstr ""
+
+#: ../src/applet.c:929
+msgid "VPN connection has been successfully established.\n"
+msgstr ""
+
+#: ../src/applet.c:931
+msgid "VPN Login Message"
+msgstr ""
+
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 #, fuzzy
-msgid "Custom wireless network"
-msgstr "Rantoeles sins fyis"
+msgid "VPN Connection Failed"
+msgstr "Raloyaedjes rantoele"
 
-#: panel-applet/NMWirelessApplet.c:717
-msgid "Enter the ESSID of the wireless network to which you wish to connect."
+#: ../src/applet.c:990
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed because the VPN service failed to start.\n"
+"\n"
+"%s"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:800
+#: ../src/applet.c:993
+#, c-format
+msgid ""
+"\n"
+"The VPN connection '%s' failed to start.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/applet.c:1280
+msgid "device not ready (firmware missing)"
+msgstr ""
+
+#: ../src/applet.c:1282
+msgid "device not ready"
+msgstr ""
+
+#. Notify user of unmanaged or unavailable device
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
+msgid "disconnected"
+msgstr ""
+
+#: ../src/applet.c:1308
+msgid "Disconnect"
+msgstr ""
+
+#: ../src/applet.c:1322
+msgid "device not managed"
+msgstr ""
+
+#: ../src/applet.c:1395
+msgid "No network devices available"
+msgstr ""
+
+#: ../src/applet.c:1449
 #, fuzzy
-msgid "Other Wireless Networks..."
-msgstr "Rantoeles sins fyis"
+msgid "_VPN Connections"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/applet.c:1503
+msgid "_Configure VPN..."
+msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:911
-msgid "No network devices have been found"
+#: ../src/applet.c:1508
+msgid "_Disconnect VPN"
 msgstr ""
 
-#: panel-applet/NMWirelessApplet.c:1028
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
 
-#: panel-applet/essid.glade:52
-msgid "C_onnect"
+#: ../src/applet.c:1620 ../src/applet.c:2612
+msgid "Networking disabled"
 msgstr ""
 
-#: panel-applet/essid.glade:131
+#. 'Enable Networking' item
+#: ../src/applet.c:1830
 #, fuzzy
-msgid "Wireless _Network:"
+msgid "Enable _Networking"
 msgstr "Rantoeles sins fyis"
 
-#: panel-applet/essid.glade:177
+#. 'Enable Wi-Fi' item
+#: ../src/applet.c:1839
+msgid "Enable _Wi-Fi"
+msgstr ""
+
+#. 'Enable Mobile Broadband' item
+#: ../src/applet.c:1848
+msgid "Enable _Mobile Broadband"
+msgstr ""
+
+#. Toggle notifications item
+#: ../src/applet.c:1860
+msgid "Enable N_otifications"
+msgstr ""
+
+#. 'Connection Information' item
+#: ../src/applet.c:1872
+msgid "Connection _Information"
+msgstr ""
+
+#. 'Edit Connections...' item
+#: ../src/applet.c:1880
+#, fuzzy
+msgid "Edit Connections..."
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/applet.c:1894
+#, fuzzy
+msgid "_About"
+msgstr "Å_d fwait..."
+
+#: ../src/applet.c:2179
+#, c-format
+msgid "You are now connected to '%s'."
+msgstr ""
+
+#: ../src/applet.c:2222
+msgid "Disconnected"
+msgstr ""
+
+#: ../src/applet.c:2223
+#, fuzzy
+msgid "The network connection has been disconnected."
+msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
+
+#: ../src/applet.c:2474
+#, fuzzy, c-format
+msgid "Preparing network connection '%s'..."
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/applet.c:2477
+#, c-format
+msgid "User authentication required for network connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
+#, c-format
+msgid "Requesting a network address for '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2483
+#, fuzzy, c-format
+msgid "Network connection '%s' active"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/applet.c:2557
+#, c-format
+msgid "Starting VPN connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2560
+#, c-format
+msgid "User authentication required for VPN connection '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2563
+#, c-format
+msgid "Requesting a VPN address for '%s'..."
+msgstr ""
+
+#: ../src/applet.c:2566
+#, fuzzy, c-format
+msgid "VPN connection '%s' active"
+msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
+
+#: ../src/applet.c:2616
+#, fuzzy
+msgid "No network connection"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/applet.c:3204
 #, fuzzy
-msgid "Wireless _adapter:"
+msgid "NetworkManager Applet"
+msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
+
+#: ../src/applet-device-broadband.c:159
+msgid "Wrong PUK code; please contact your provider."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:201
+msgid "Wrong PIN code; please contact your provider."
+msgstr ""
+
+#. Start the spinner to show the progress of the unlock
+#: ../src/applet-device-broadband.c:252
+msgid "Sending unlock code..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
+#, c-format
+msgid "Mobile Broadband (%s)"
+msgstr ""
+
+#: ../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
+msgid "Mobile Broadband"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr ""
+
+#. Default connection item
+#: ../src/applet-device-broadband.c:801
+msgid "New Mobile Broadband connection..."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr ""
+
+#: ../src/applet-device-broadband.c:816
+msgid "You are now connected to the Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
+msgid "Mobile Broadband network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:957
+msgid "You are now registered on the home network."
+msgstr ""
+
+#: ../src/applet-device-broadband.c:963
+msgid "You are now registered on a roaming network."
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "Preparing mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
+#, c-format
+msgid "Configuring mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
+#, c-format
+msgid "User authentication required for mobile broadband connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
+#, c-format
+msgid "Mobile broadband connection '%s' active"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:30
+msgid "Auto Ethernet"
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:82
+#, fuzzy, c-format
+msgid "Ethernet Networks (%s)"
 msgstr "Rantoeles sins fyis"
 
-#: panel-applet/menu-info.c:101
+#: ../src/applet-device-ethernet.c:84
 #, fuzzy, c-format
-msgid "Wired Network (%s)"
+msgid "Ethernet Network (%s)"
 msgstr "Rantoeles sins fyis"
 
-#: panel-applet/menu-info.c:103
+#: ../src/applet-device-ethernet.c:87
 #, fuzzy
-msgid "Wired Network"
+msgid "Ethernet Networks"
 msgstr "Rantoeles sins fyis"
 
-#: panel-applet/menu-info.c:168
+#: ../src/applet-device-ethernet.c:89
+#, fuzzy
+msgid "Ethernet Network"
+msgstr "Rantoeles sins fyis"
+
+#: ../src/applet-device-ethernet.c:133
+msgid "You are now connected to the ethernet network."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:161
+#, c-format
+msgid "Preparing ethernet network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:164
+#, c-format
+msgid "Configuring ethernet network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:167
+#, c-format
+msgid "User authentication required for ethernet network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:170
+#, c-format
+msgid "Requesting an ethernet network address for '%s'..."
+msgstr ""
+
+#: ../src/applet-device-ethernet.c:174
 #, fuzzy, c-format
-msgid "Wireless Network (%s)"
-msgid_plural "Wireless Networks (%s)"
-msgstr[0] "Rantoeles sins fyis"
-msgstr[1] "Rantoeles sins fyis"
+msgid "Ethernet network connection '%s' active"
+msgstr "On raloyaedje rantoele, mins so fyis, est en alaedje pol moumint..."
+
+#: ../src/applet-device-ethernet.c:346
+msgid "DSL authentication"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:230
+msgid "_Connect to Hidden Wi-Fi Network..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:281
+msgid "Create _New Wi-Fi Network..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:431
+msgid "(none)"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:901
+#, fuzzy, c-format
+msgid "Wi-Fi Networks (%s)"
+msgstr "Rantoeles sins fyis"
+
+#: ../src/applet-device-wifi.c:903
+#, fuzzy, c-format
+msgid "Wi-Fi Network (%s)"
+msgstr "Rantoeles sins fyis"
 
-#: panel-applet/menu-info.c:170
+#: ../src/applet-device-wifi.c:905
 #, fuzzy
-msgid "Wireless Network"
-msgid_plural "Wireless Networks"
+msgid "Wi-Fi Network"
+msgid_plural "Wi-Fi Networks"
 msgstr[0] "Rantoeles sins fyis"
 msgstr[1] "Rantoeles sins fyis"
 
-#: panel-applet/menu-info.c:307
-msgid " (invalid Unicode)"
+#: ../src/applet-device-wifi.c:934
+msgid "Wi-Fi is disabled"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:111
-msgid "Orientation"
+#: ../src/applet-device-wifi.c:935
+msgid "Wi-Fi is disabled by hardware switch"
 msgstr ""
 
-#: examples/python/systray/eggtrayicon.c:112
-msgid "The orientation of the tray."
+#: ../src/applet-device-wifi.c:996
+#, fuzzy
+msgid "More networks"
+msgstr "Rantoeles sins fyis"
+
+#: ../src/applet-device-wifi.c:1180
+msgid "Wi-Fi Networks Available"
 msgstr ""
 
-#~ msgid "There are no network devices..."
-#~ msgstr "I gn a nou éndjin rantoele...."
+#: ../src/applet-device-wifi.c:1181
+msgid "Use the network menu to connect to a Wi-Fi network"
+msgstr ""
 
-#~ msgid "There are no wireless networks..."
-#~ msgstr "I gn a nole rantoele sins fyis..."
+#: ../src/applet-device-wifi.c:1364
+#, c-format
+msgid "You are now connected to the Wi-Fi network '%s'."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1399
+#, c-format
+msgid "Preparing Wi-Fi network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1402
+#, c-format
+msgid "Configuring Wi-Fi network connection '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1405
+#, c-format
+msgid "User authentication required for Wi-Fi network '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1408
+#, c-format
+msgid "Requesting a Wi-Fi network address for '%s'..."
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1419
+#, 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:1423
+#, fuzzy, c-format
+msgid "Wi-Fi network connection '%s' active"
+msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
+
+#: ../src/applet-device-wifi.c:1442
+msgid "Failed to activate connection"
+msgstr ""
+
+#: ../src/applet-device-wifi.c:1465
+msgid "Failed to add new connection"
+msgstr ""
+
+#: ../src/applet-dialogs.c:41
+msgid "Error displaying connection information:"
+msgstr ""
+
+#: ../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
+msgid "LEAP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:74
+msgid "Dynamic WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
+msgid "WPA/WPA2"
+msgstr ""
+
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+msgid "More addresses"
+msgstr ""
+
+#: ../src/applet-dialogs.c:226
+msgid "WEP"
+msgstr ""
+
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
+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
+#, c-format
+msgid "%u Mb/s"
+msgstr ""
+
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
+msgctxt "Speed"
+msgid "Unknown"
+msgstr ""
+
+#. Address
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
+msgctxt "Address"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:369
+msgid "Broadcast Address:"
+msgstr ""
+
+#. Prefix
+#: ../src/applet-dialogs.c:381
+msgctxt "Subnet Mask"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:492
+#, c-format
+msgid "Ethernet (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:495
+#, c-format
+msgid "802.11 WiFi (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:502
+#, c-format
+msgid "GSM (%s)"
+msgstr ""
+
+#: ../src/applet-dialogs.c:504
+#, c-format
+msgid "CDMA (%s)"
+msgstr ""
+
+#. --- General ---
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
+msgid "General"
+msgstr ""
+
+#: ../src/applet-dialogs.c:516
+msgid "Interface:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:536
+msgid "Hardware Address:"
+msgstr ""
+
+#. Driver
+#: ../src/applet-dialogs.c:550
+msgid "Driver:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:585
+msgid "Speed:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:600
+msgid "Security:"
+msgstr ""
+
+#. --- IPv4 ---
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
+msgid "IPv4"
+msgstr ""
+
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr ""
+
+#. --- IPv6 ---
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
+msgid "IPv6"
+msgstr ""
+
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
+msgid "Ignored"
+msgstr ""
+
+#: ../src/applet-dialogs.c:815
+msgid "VPN Type:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:822
+msgid "VPN Gateway:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:828
+msgid "VPN Username:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:834
+msgid "VPN Banner:"
+msgstr ""
+
+#: ../src/applet-dialogs.c:840
+#, fuzzy
+msgid "Base Connection:"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
+msgid "Unknown"
+msgstr ""
+
+#. Shouldn't really happen but ...
+#: ../src/applet-dialogs.c:957
+msgid "No valid active connections found!"
+msgstr ""
+
+#: ../src/applet-dialogs.c:985
+msgid ""
+"Copyright © 2004-2014 Red Hat, Inc.\n"
+"Copyright © 2005-2008 Novell, Inc.\n"
+"and many other community contributors and translators"
+msgstr ""
+
+#: ../src/applet-dialogs.c:988
+msgid ""
+"Notification area applet for managing your network devices and connections."
+msgstr ""
+
+#: ../src/applet-dialogs.c:990
+#, fuzzy
+msgid "NetworkManager Website"
+msgstr "Li manaedjeu d' rantoeles n' est nén en alaedje..."
+
+#: ../src/applet-dialogs.c:1005
+msgid "Missing resources"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1030
+msgid "Mobile broadband network password"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1039
+#, c-format
+msgid "A password is required to connect to '%s'."
+msgstr ""
+
+#: ../src/applet-dialogs.c:1054
+#, fuzzy
+msgid "Password:"
+msgstr "Sicret:"
+
+#: ../src/applet-dialogs.c:1336
+msgid "SIM PIN unlock required"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1337
+msgid "SIM PIN Unlock Required"
+msgstr ""
+
+#. FIXME: some warning about # of times you can enter incorrect PIN
+#: ../src/applet-dialogs.c:1339
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PIN code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PIN code entry label
+#: ../src/applet-dialogs.c:1341
+msgid "PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN checkbox label
+#: ../src/applet-dialogs.c:1345
+msgid "Show PIN code"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1347
+msgid "SIM PUK unlock required"
+msgstr ""
+
+#: ../src/applet-dialogs.c:1348
+msgid "SIM PUK Unlock Required"
+msgstr ""
+
+#. FIXME: some warning about # of times you can enter incorrect PUK
+#: ../src/applet-dialogs.c:1350
+#, c-format
+msgid ""
+"The mobile broadband device '%s' requires a SIM PUK code before it can be "
+"used."
+msgstr ""
+
+#. Translators: PUK code entry label
+#: ../src/applet-dialogs.c:1352
+msgid "PUK code:"
+msgstr ""
+
+#. Translators: New PIN entry label
+#: ../src/applet-dialogs.c:1355
+msgid "New PIN code:"
+msgstr ""
+
+#. Translators: New PIN verification entry label
+#: ../src/applet-dialogs.c:1357
+msgid "Re-enter new PIN code:"
+msgstr ""
+
+#. Translators: Show/obscure PIN/PUK checkbox label
+#: ../src/applet-dialogs.c:1362
+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:26
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+msgid "_OK"
+msgstr ""
+
+#: ../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
+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: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
+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: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
+msgid "_Delete"
+msgstr ""
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
+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
+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
+msgid ""
+"If enabled, this connection will never be used as the default network "
+"connection."
+msgstr ""
+
+#: ../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…"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:4
+msgid "Choose a Connection Type"
+msgstr ""
+
+#: ../src/connection-editor/ce-new-connection.ui.h:5
+msgid ""
+"Select the type of connection you wish to create.\n"
+"\n"
+"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."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:1
+msgid "Round-robin"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:2
+msgid "Active backup"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:3
+msgid "XOR"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:4
+msgid "Broadcast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:5
+msgid "802.3ad"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:6
+msgid "Adaptive transmit load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:7
+msgid "Adaptive load balancing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:8
+msgid "MII (recommended)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:9
+msgid "ARP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:10
+#, fuzzy
+msgid "Bonded _connections:"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/connection-editor/ce-page-bond.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+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:5
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:15
+msgid "Monitoring _frequency:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:16
+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:7
+msgid "_Interface name:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:18
+msgid "_Link Monitoring:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:19
+msgid "ARP _targets:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:20
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:22
+msgid "Link _down delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:23
+msgid "_Primary:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bond.ui.h:24
+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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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:9
+#: ../src/connection-editor/ce-page-vlan.ui.h:5
+#: ../src/connection-editor/ce-page-wifi.ui.h:7
+msgid "bytes"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge-port.ui.h:1
+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.h:3
+msgid "_Hairpin mode:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:1
+#, fuzzy
+msgid "Bridged _connections:"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
+msgid "_Forward delay:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
+msgid "_Hello time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
+msgid "s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+msgid "Enable I_GMP snooping"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
+msgid "Enable _STP (Spanning Tree Protocol)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
+msgid "_Max age:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
+msgid "_Aging time:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:78
+msgid "automatic"
+msgstr ""
+
+#: ../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
+msgid "default"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+msgid "MAC address"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+msgid "HW address"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+msgid "device"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:591
+msgid "Failed to update connection secrets due to an unknown error."
+msgstr ""
+
+#: ../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.h:2
+msgid "FCoE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:3
+msgid "iSCSI"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:4
+msgid "FIP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:5
+msgid "Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:6
+msgid "Feature"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:7
+msgid "Enable"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:8
+msgid "Advertise"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:9
+msgid "Willing"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:10
+msgid "Priority"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:11
+msgid "Options..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:12
+msgid "Priority Groups"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:14
+msgid "0"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:15
+msgid "1"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:16
+#: ../src/wireless-security/ws-wep-key.ui.h:2
+msgid "2"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:17
+#: ../src/wireless-security/ws-wep-key.ui.h:3
+msgid "3"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:18
+#: ../src/wireless-security/ws-wep-key.ui.h:4
+msgid "4"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:19
+msgid "5"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:20
+msgid "6"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:21
+msgid "7"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:22
+msgid "Fabric"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:23
+msgid "VN2VN"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:24
+msgid "Priority Flow Control"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
+msgid "Enable or disable priority pause transmission for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
+msgid "Priority:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
+msgid "0:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
+msgid "1:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
+msgid "2:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
+msgid "3:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
+msgid "4:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
+msgid "5:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
+msgid "6:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
+msgid "7:"
+msgstr ""
+
+#: ../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.h:41
+msgid "Group ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
+msgid "15"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
+msgid "Enter the priority group ID for each User Priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#, no-c-format
+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:46
+msgid ""
+"Enter the percentage of priority group bandwidth each user priority may use."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
+msgid "Enable or disable strict bandwidth for each user priority."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-dsl.ui.h:2
+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/eap-method-tls.ui.h:7
+#: ../src/wireless-security/ws-leap.ui.h:3
+#: ../src/wireless-security/ws-wpa-psk.ui.h:3
+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:"
+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-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
+msgid "Automatic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:2
+msgid "Twisted Pair (TP)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:3
+msgid "Attachment Unit Interface (AUI)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:4
+msgid "BNC"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:5
+msgid "Media Independent Interface (MII)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:6
+msgid "10 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:7
+msgid "100 Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:8
+msgid "1 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:9
+msgid "10 Gb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:10
+msgid "_Port:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:11
+msgid "_Speed:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:12
+msgid "Full duple_x"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:13
+msgid "Aut_onegotiate"
+msgstr ""
+
+#: ../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
+msgid "_Device:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
+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 ""
+"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-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+msgid "De_fault"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+msgid "_Ignore"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+msgid "_Broadcast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+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.h:29
+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"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-general.ui.h:2
+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.h:4
+msgid "Firewall _zone:"
+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
+msgid "Datagram"
+msgstr ""
+
+#. IP-over-InfiniBand "connected mode"
+#: ../src/connection-editor/ce-page-infiniband.ui.h:8
+msgid "Connected"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:2
+#: ../src/connection-editor/ce-page-ip6.ui.h:2
+msgid "Automatic with manual DNS settings"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:4
+#: ../src/connection-editor/ce-page-ip6.ui.h:4
+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:186
+#: ../src/connection-editor/page-ip6.c:204
+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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:7
+#: ../src/connection-editor/ce-page-ip6.ui.h:10
+msgid "Addresses"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
+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:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
+msgid ""
+"Domains used when resolving host names. Use commas to separate multiple "
+"domains."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:13
+msgid "D_HCP client ID:"
+msgstr ""
+
+#: ../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
+msgid "S_earch domains:"
+msgstr ""
+
+#: ../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:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
+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:17
+msgid "Require IPv_4 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip4.ui.h:18
+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:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
+msgid "_Routes…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:6
+#: ../src/connection-editor/page-ip4.c:196
+msgid "Disabled"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:7
+msgid "Enabled (prefer public address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:8
+msgid "Enabled (prefer temporary address)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
+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
+msgid "IPv6 _privacy extensions:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
+msgid "Require IPv_6 addressing for this connection to complete"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ip6.ui.h:20
+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
+msgid "Basic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
+msgid "Nu_mber:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
+msgid "Advanced"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
+msgid "_APN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
+msgid "N_etwork ID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
+msgid "Change..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
+msgid "P_IN:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
+msgid "Allow _roaming if home network is not available"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
+msgid "Sho_w passwords"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:1
+msgid "Authentication"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:2
+msgid "Allowed methods:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:3
+msgid "Configure _Methods…"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:4
+msgid "Compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:5
+msgid "_Use point-to-point encryption (MPPE)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:6
+msgid "_Require 128-bit encryption"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:7
+msgid "Use _stateful MPPE"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:8
+msgid "Allow _BSD data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:9
+msgid "Allow _Deflate data compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:10
+msgid "Use TCP _header compression"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:11
+msgid "Echo"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ppp.ui.h:12
+msgid "Send PPP _echo packets"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:1
+#: ../src/connection-editor/ce-page-team.ui.h:2
+msgid "_JSON config:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team-port.ui.h:2
+msgid "_Import team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-team.ui.h:1
+#, fuzzy
+msgid "_Teamed connections:"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/connection-editor/ce-page-team.ui.h:3
+msgid "Im_port team configuration from a file..."
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:1
+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.h:3
+msgid "Cloned MAC _address:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:6
+msgid "VLAN _id:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
+msgid "Device name + number"
+msgstr ""
+
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
+msgid "\"vlan\" + number"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi-security.ui.h:1
+msgid "S_ecurity:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:2
+msgid "A (5 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:3
+msgid "B/G (2.4 GHz)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:4
+msgid "Client"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
+msgid "Ad-hoc"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
+msgid "mW"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
+msgid "Transmission po_wer:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
+msgid "Mb/s"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
+msgid "_Rate:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
+msgid "_BSSID:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
+msgid "C_hannel:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
+msgid "Ban_d:"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
+msgid "SS_ID:"
+msgstr ""
+
+#: ../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
+msgid "Allowed Authentication Methods"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+msgid "_EAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+msgid "Extensible Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+msgid "_PAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+msgid "Password Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+msgid "C_HAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+msgid "Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+msgid "_MSCHAP"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+msgid "Microsoft Challenge Handshake Authentication Protocol"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+msgid "MSCHAP v_2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
+msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
+msgstr ""
+
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
+msgid ""
+"In most cases, the provider's PPP servers will support all authentication "
+"methods.  If connections fail, try disabling support for some methods."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
+msgid "Ethernet"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../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
+msgid "Bluetooth"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
+msgid "DSL"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../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
+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
+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
+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"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
+msgid "VPN"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:196
+msgid "Hardware"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:223
+msgid "Virtual"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
+msgid "Import a saved VPN configuration..."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:323
+msgid ""
+"The connection editor dialog could not be initialized due to an unknown "
+"error."
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:332
+msgid "Could not create new connection"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:469
+msgid "Connection delete failed"
+msgstr ""
+
+#: ../src/connection-editor/connection-helpers.c:517
+#, c-format
+msgid "Are you sure you wish to delete the connection %s?"
+msgstr ""
+
+#: ../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
+msgid "Address"
+msgstr ""
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr ""
+
+#: ../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
+msgid "Gateway"
+msgstr ""
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr ""
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:100
+#, c-format
+msgid "Editing %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:104
+msgid "Editing un-named connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:124
+msgid "Missing connection name"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+msgid "Editor initializing..."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+msgid "Connection cannot be modified"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
+#, fuzzy
+msgid ""
+"The connection editor could not find some required resources (the .ui file "
+"was not found)."
+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:419
+msgid "_Save"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:420
+msgid "Save any changes made to this connection."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:421
+msgid "Authenticate to save this connection for all users of this machine."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not create connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:437
+msgid "Could not edit connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:439
+msgid "Unknown error creating connection editor dialog."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:581
+msgid "Error initializing editor"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:921
+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
+msgid "Connection _name:"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
+#, fuzzy
+msgid "_Export..."
+msgstr "Å_d fwait..."
+
+#: ../src/connection-editor/nm-connection-list.c:127
+msgid "never"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
+msgid "now"
+msgstr ""
+
+#. less than an hour ago
+#: ../src/connection-editor/nm-connection-list.c:156
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:160
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:172
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:178
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:182
+#, c-format
+msgid "%d year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/connection-editor/nm-connection-list.c:623
+msgid "Name"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:636
+msgid "Last Used"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:684
+msgid "Edit the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:685
+msgid "Authenticate to edit the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:700
+msgid "Delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:701
+msgid "Authenticate to delete the selected connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:929
+msgid "No VPN plugins are installed."
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:931
+#, c-format
+msgid "Don't know how to create '%s' connections"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:933
+msgid "Error creating connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:955
+msgid "Error editing connection"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-list.c:956
+#, c-format
+msgid "Did not find a connection with UUID '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:109
+msgid "802.1x Security"
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:111
+msgid "Could not load 802.1x Security user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-8021x-security.c:125
+msgid "Use 802.1_X security for this connection"
+msgstr ""
+
+#: ../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
+msgid "Could not load Bluetooth user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+msgid "Bluetooth Type"
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "S' _elodjî sol rantoele"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Rantoeles sins fyis"
+
+#: ../src/connection-editor/page-bond.c:447
+msgid "Could not load bond user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bond.c:566
+msgid "primary"
+msgstr ""
+
+#: ../src/connection-editor/page-bond.c:616
+#, c-format
+msgid "Bond connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge.c:213
+msgid "Could not load bridge user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-bridge.c:310
+#, c-format
+msgid "Bridge connection %d"
+msgstr ""
+
+#. Translators: a "Bridge Port" is a network
+#. * device that is part of a bridge.
+#.
+#: ../src/connection-editor/page-bridge-port.c:108
+msgid "Bridge Port"
+msgstr ""
+
+#: ../src/connection-editor/page-bridge-port.c:110
+msgid "Could not load bridge port user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:603
+msgid "DCB"
+msgstr ""
+
+#: ../src/connection-editor/page-dcb.c:605
+msgid "Could not load DCB user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:129
+msgid "Could not load DSL user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-dsl.c:214
+#, c-format
+msgid "DSL connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:74
+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:328
+msgid "Could not load ethernet user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:457
+msgid "Ethernet device"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+msgid "cloned MAC"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
+#, c-format
+msgid "Ethernet connection %d"
+msgstr ""
+
+#. 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
+msgid "Default"
+msgstr ""
+
+#: ../src/connection-editor/page-general.c:52
+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 "Li manaedjeu d' rantoeles n' est nén en alaedje..."
+
+#: ../src/connection-editor/page-general.c:350
+msgid "Could not load General user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
+msgid "Could not load InfiniBand user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
+#, c-format
+msgid "InfiniBand connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
+msgid "Automatic (VPN)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
+msgid "Automatic (VPN) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
+msgid "Automatic (PPPoE)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
+msgid "Automatic (PPPoE) addresses only"
+msgstr ""
 
-#~ msgid "Network Connections"
-#~ msgstr "Raloyaedjes rantoele"
+#: ../src/connection-editor/page-ip4.c:135
+msgid "Automatic (DHCP)"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:136
+msgid "Automatic (DHCP) addresses only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
+msgid "Link-Local Only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:297
+#: ../src/connection-editor/page-ip6.c:295
+msgid "Additional DNS ser_vers:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:306
+#: ../src/connection-editor/page-ip6.c:304
+msgid "Additional s_earch domains:"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:965
+#, c-format
+msgid "Editing IPv4 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1158
+msgid "IPv4 Settings"
+msgstr ""
 
-#~ msgid "No network connection is currently active..."
-#~ msgstr "Nou raloyaedje rantoele en alaedje pol moumint..."
+#: ../src/connection-editor/page-ip4.c:1160
+msgid "Could not load IPv4 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#~ msgid "A wired network connection is currently active..."
-#~ msgstr "On raloyaedje rantoele, mins so fyis, est en alaedje pol moumint..."
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
 
-#~ msgid "_About..."
-#~ msgstr "Å_d fwait..."
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
+msgid "Ignore"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:172
+msgid "Automatic, DHCP only"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:964
+#, c-format
+msgid "Editing IPv6 routes for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1155
+msgid "IPv6 Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1157
+msgid "Could not load IPv6 user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
+msgid "Duplicate slaves"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:249
+#, c-format
+msgid "Slaves '%s' and '%s' both apply to device '%s'"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:260
+#, 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
+#, c-format
+msgid "%s slave %d"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:310
+msgid "Could not load mobile broadband user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:327
+msgid "Unsupported mobile broadband connection type."
+msgstr ""
+
+#. Fall back to just asking for GSM vs. CDMA
+#: ../src/connection-editor/page-mobile.c:529
+msgid "Select Mobile Broadband Provider Type"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:556
+msgid ""
+"Select the technology your mobile broadband provider uses.  If you are "
+"unsure, ask your provider."
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:561
+msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:568
+msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
+msgid "CDMA"
+msgstr ""
+
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
+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:258
+msgid "PAP"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
+msgid "CHAP"
+msgstr ""
+
+#: ../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
+msgid "MSCHAPv2"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
+msgid "MSCHAP"
+msgstr ""
+
+#. Translators: "none" refers to authentication methods
+#: ../src/connection-editor/page-ppp.c:136
+msgid "none"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:196
+#, c-format
+msgid "Editing PPP authentication methods for %s"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:279
+msgid "PPP Settings"
+msgstr ""
+
+#: ../src/connection-editor/page-ppp.c:281
+msgid "Could not load PPP user interface."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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"
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:270
+msgid "Could not load team user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-team.c:377
+#, c-format
+msgid "Team connection %d"
+msgstr ""
+
+#. Translators: a "Team Port" is a network
+#. * device that is part of a team.
+#.
+#: ../src/connection-editor/page-team-port.c:151
+msgid "Team Port"
+msgstr ""
+
+#: ../src/connection-editor/page-team-port.c:153
+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:414
+#, c-format
+msgid "%s (via \"%s\")"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/connection-editor/page-vlan.c:596
+msgid "Could not load vlan user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
+#, c-format
+msgid "VLAN connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:103
+msgid "Could not load VPN user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:118
+#, c-format
+msgid "Could not find VPN plugin service for '%s'."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
+#, fuzzy, c-format
+msgid "VPN connection %d"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/connection-editor/page-vpn.c:229
+msgid ""
+"The VPN plugin failed to import the VPN connection correctly\n"
+"\n"
+"Error: no VPN service type."
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:254
+msgid "Choose a VPN Connection Type"
+msgstr ""
+
+#: ../src/connection-editor/page-vpn.c:255
+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
+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
+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
+#, c-format
+msgid "%u (%u MHz)"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:450
+msgid "Could not load Wi-Fi user interface."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+msgid "Wi-Fi device"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:619
+#, c-format
+msgid "Wi-Fi connection %d"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
+#, fuzzy
+msgid "WEP 128-bit Passphrase"
+msgstr "Sicret:"
+
+#: ../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)"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
+msgid "WPA & WPA2 Personal"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
+msgid "WPA & WPA2 Enterprise"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:413
+msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting."
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:424
+msgid "Wi-Fi Security"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:426
+msgid "Could not load Wi-Fi security user interface."
+msgstr ""
 
-#~ msgid " "
-#~ msgstr " "
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi-security.c:512
+#, c-format
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:138
+msgid "Cannot import VPN connection"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/connection-editor/vpn-helpers.c:141
+msgid "unknown error"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:215
+#, c-format
+msgid "A file named \"%s\" already exists."
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:217
+msgid "_Replace"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:219
+#, c-format
+msgid "Do you want to replace %s with the VPN connection you are saving?"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:255
+msgid "Cannot export VPN connection"
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:257
+#, c-format
+msgid ""
+"The VPN connection '%s' could not be exported to %s.\n"
+"\n"
+"Error: %s."
+msgstr ""
+
+#: ../src/connection-editor/vpn-helpers.c:292
+msgid "Export VPN connection..."
+msgstr ""
+
+#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94
+#, fuzzy
+msgid ""
+"The NetworkManager Applet could not find some required resources (the .ui "
+"file was not found)."
+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/gsm-unlock.ui.h:2
+msgid "_Unlock"
+msgstr ""
+
+#: ../src/gsm-unlock.ui.h:3
+msgid "Automatically unlock this device"
+msgstr ""
+
+#: ../src/info.ui.h:1
+msgid "Connection Information"
+msgstr ""
+
+#: ../src/info.ui.h:3
+#, fuzzy
+msgid "Active Network Connections"
+msgstr "Raloyaedjes rantoele"
+
+#: ../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-wizard.c:325
+#: ../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 ""
+
+#: ../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
+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
+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 ""
+
+#: ../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
+msgid "Installed GSM device"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../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
+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:"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../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
+msgid "Your broadband billing plan name"
+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 ""
+
+#: ../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 ""
+
+#: ../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
+msgid "Set up a Mobile Broadband Connection"
+msgstr ""
+
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
+#, fuzzy
+msgid "New Mobile Broadband Connection"
+msgstr "Raloyaedjes rantoele"
+
+#: ../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
+msgid "Store the password for all users"
+msgstr ""
+
+#: ../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
+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.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+msgid "_Ternary 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-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
+msgid "New..."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
+msgctxt "Wifi/wired security"
+msgid "None"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
+msgid "C_reate"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the Wi-Fi network '%s'."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
+#, 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:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
+msgid "Authentication required by Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
+msgid "Create New Wi-Fi Network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
+#, fuzzy
+msgid "New Wi-Fi network"
+msgstr "Rantoeles sins fyis"
+
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
+msgid "Enter a name for the Wi-Fi network you wish to create."
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
+msgid "Connect to Hidden Wi-Fi Network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
+msgid "Hidden Wi-Fi network"
+msgstr ""
+
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
+msgid ""
+"Enter the name and security details of the hidden Wi-Fi network you wish to "
+"connect to."
+msgstr ""
+
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
+msgid "Wi-Fi _security:"
+msgstr ""
+
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
+#, fuzzy
+msgid "C_onnection:"
+msgstr "Raloyaedjes rantoele"
+
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
+#, fuzzy
+msgid "Wi-Fi _adapter:"
+msgstr "Rantoeles sins fyis"
+
+#: ../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
+msgid "OLPC Mesh"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr ""
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr ""
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr ""
+
+#: ../src/main.c:42
+msgid "Usage:"
+msgstr ""
+
+#: ../src/main.c:44
+msgid ""
+"This program is a component of NetworkManager (https://wiki.gnome.org/"
+"Projects/NetworkManager/)."
+msgstr ""
+
+#: ../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
+msgid "EVDO"
+msgstr ""
+
+#: ../src/mb-menu-item.c:56
+msgid "GPRS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:58
+msgid "EDGE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:60
+msgid "UMTS"
+msgstr ""
+
+#: ../src/mb-menu-item.c:62
+msgid "HSDPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:64
+msgid "HSUPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:66
+msgid "HSPA"
+msgstr ""
+
+#: ../src/mb-menu-item.c:68
+msgid "HSPA+"
+msgstr ""
+
+#: ../src/mb-menu-item.c:70
+msgid "LTE"
+msgstr ""
+
+#: ../src/mb-menu-item.c:117
+msgid "not enabled"
+msgstr ""
+
+#: ../src/mb-menu-item.c:123
+msgid "not registered"
+msgstr ""
+
+#: ../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
+msgid "Home network"
+msgstr "Rantoeles sins fyis"
+
+#: ../src/mb-menu-item.c:151
+msgid "searching"
+msgstr ""
+
+#: ../src/mb-menu-item.c:154
+msgid "registration denied"
+msgstr ""
+
+#: ../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
+#, c-format
+msgid "%s (roaming)"
+msgstr ""
+
+#: ../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
+msgid "Roaming network"
+msgstr "S' _elodjî sol rantoele"
+
+#: ../src/mobile-helpers.c:331
+#, c-format
+msgid "PIN code for SIM card '%s' on '%s'"
+msgstr ""
+
+#: ../src/mobile-helpers.c:464
+msgid "PIN code required"
+msgstr ""
+
+#: ../src/mobile-helpers.c:472
+msgid "PIN code is needed for the mobile broadband device"
+msgstr ""
+
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr ""
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr ""
+
+#. The %s is a mobile provider name, eg "T-Mobile"
+#: ../src/utils/utils.c:179
+#, fuzzy, c-format
+msgid "%s connection"
+msgstr "Raloyaedjes rantoele"
+
+#: ../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/wireless-security/eap-method.c:452
+msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method.c:455
+msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:70
+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
+msgid "GTC"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:403
+msgid "Choose a PAC file..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:410
+msgid "PAC files (*.pac)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.c:414
+msgid "All files"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:2
+msgid "Anonymous"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:3
+msgid "Authenticated"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:4
+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:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:6
+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
+msgid "_Inner authentication:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-fast.ui.h:8
+msgid "Allow automatic PAC pro_visioning"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
+msgid "MD5"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:3
+msgid "Version 0"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:4
+msgid "Version 1"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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
+msgid "No CA certificate is _required"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-peap.ui.h:9
+msgid "PEAP _version:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
+msgid "Unencrypted private keys are insecure"
+msgstr ""
+
+#: ../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)"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:475
+msgid "Choose your personal certificate..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:487
+msgid "Choose your private key..."
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:1
+msgid "I_dentity:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:2
+msgid "_User certificate:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:5
+msgid "Private _key:"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.ui.h:6
+msgid "_Private key password:"
+msgstr ""
+
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
+msgid "TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:460
+msgid "PWD"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:471
+msgid "FAST"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:482
+msgid "Tunneled TLS"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:493
+msgid "Protected EAP (PEAP)"
+msgstr ""
+
+#: ../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
+msgid "Au_thentication:"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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:5
+msgid "Open System"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:6
+msgid "Shared Key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:7
+msgid "_Key:"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:8
+msgid "Sho_w key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.ui.h:10
+msgid "WEP inde_x:"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr ""
+
+#~ msgid "Modify Wireless Networks"
+#~ msgstr "Candjî les rantoeles sins fyis"
+
+#~ msgid "<span weight=\"bold\">Wireless Networks:</span>"
+#~ msgstr "<span weight=\"bold\">Rantoeles sins fyis:</span>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
+#~ "Network</span>\n"
+#~ "\n"
+#~ "A passphrase or encryption key is required to access the wireless network "
+#~ "'%s'."
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Li rantoele sins fyis a mezåjhe "
+#~ "d' on scret</span>\n"
+#~ "\n"
+#~ "I gn a mezåjhe d' on sicret ou d' ene clé WEP po-z aveur accès al "
+#~ "rantoele sins fyis «%s»."
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#, fuzzy
+#~ msgid "Custom wireless network"
+#~ msgstr "Rantoeles sins fyis"
+
+#, fuzzy
+#~ msgid "Other Wireless Networks..."
+#~ msgstr "Rantoeles sins fyis"
+
+#, fuzzy
+#~ msgid "Wireless Network (%s)"
+#~ msgid_plural "Wireless Networks (%s)"
+#~ msgstr[0] "Rantoeles sins fyis"
+#~ msgstr[1] "Rantoeles sins fyis"
+
+#~ msgid "There are no network devices..."
+#~ msgstr "I gn a nou éndjin rantoele...."
+
+#~ msgid "There are no wireless networks..."
+#~ msgstr "I gn a nole rantoele sins fyis..."
 
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b22f1ff3..b89febc4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,9 +20,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-08-29 11:47+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-08-03 19:33+0800\n"
 "Last-Translator: Tong Hui <tonghuix@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -32,7 +31,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "网络"
 
@@ -126,46 +125,90 @@ msgid ""
 "authentication."
 msgstr "将此项设为 true 以禁用在 EAP 认证第 2 阶段中关于 CA 证书的警告。"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "网络管理器"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "网络管理器"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X 认证"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "连接(_O)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "网络名称(_N)："
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+#, fuzzy
+msgid "ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr ""
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "无法添加/启用连接"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "连接失败"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "设备断开失败"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "断开失败"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "连接启用失败"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "不再显示此信息"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -175,7 +218,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。网络连接被中断。"
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -184,7 +227,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。VPN 服务异常中断。"
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -194,7 +237,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。VPN 服务返回了一个非法配置。"
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -203,7 +246,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。连接超时。"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -212,7 +255,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。VPN 服务未在所需时间内启动。"
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -221,7 +264,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。VPN 服务启动失败。"
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -230,7 +273,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。没有合法的 VPN secret。"
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -239,7 +282,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。VPN secret 非法。"
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -248,7 +291,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”失败。"
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -258,7 +301,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”已断开。网络连接被中断。"
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -267,7 +310,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”已断开。VPN 服务已停止。"
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -276,7 +319,7 @@ msgstr ""
 "\n"
 "VPN 连接“%s”已断开。"
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -287,19 +330,19 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "已成功建立 VPN 连接。\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN 登录消息"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN 连接失败"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -312,7 +355,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -325,799 +368,545 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "设备未就绪(缺少固件)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "设备未就绪"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "已断开"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "断开"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "设备未托管"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "没有可用的网络设备"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN 连接"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "配置 VPN(_C)..."
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "断开 VPN(_D)"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "网络管理器未运行..."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "网络已禁用"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "启用联网(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "启用 _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "启用移动宽带(_M)"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "启用 WiMA_X 移动宽带"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "启用通知(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "连接信息(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "编辑连接..."
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "您现在已连接到“%s”。"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "网络连接现已断开。"
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "正在准备网络连接“%s”..."
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "网络连接“%s”需要用户认证..."
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "正在为“%s”请求一个网络地址..."
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "网络连接“%s”已处于活动状态"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "正在启动 VPN 连接“%s”..."
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN 连接“%s”需要用户认证..."
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "正在为“%s”请求一个 VPN 地址..."
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN 连接“%s”已处于活动状态"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "没有网络连接"
 
-#: ../src/applet.c:3629
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "网络管理器小程序"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "可用的"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "连接已建立"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "您现在已连接到绑定的网络。"
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "正在准备绑定连接“%s”..."
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "正在配置绑定连接“%s”..."
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "绑定连接“%s”需要用户认证..."
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "正在为“%s”请求地址..."
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "绑定连接“%s”已处于活动状态"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "您现在已连接到桥接的网络。"
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "正在准备桥接网络连接“%s”..."
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "正在配置桥接网络连接 %s..."
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "桥接网络“%s”需要用户认证..."
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "桥接网络连接“%s”已处于活动状态"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "错误的 PUK 代码；请联络您的供应商。"
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "正在发送解锁码..."
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "移动宽带(%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "移动宽带"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "可用的"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "新移动宽带连接..."
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "连接已建立"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "您现在已连接到移动宽带网络。"
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "移动宽带网络。"
 
 # 这里的"home network"与下面的“漫游网络”是对比的关闭，应和下文的其他地方译法一致为“主网络”才说的通。
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "您现在已注册到主网络。"
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "您现在已注册到一个漫游网络。"
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "您现在已连接到移动宽带网络。"
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "正在准备移动宽带连接“%s”..."
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "正在配置移动宽带连接“%s”..."
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "移动宽带连接“%s”需要用户认证..."
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "移动宽带连接“%s”已处于活动状态"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "新建移动宽带(CDMA)连接..."
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "您现在已连接到 CDMA 网络。"
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "CDMA 网络。"
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "自动以太网"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "以太网(%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "以太网(%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "以太网"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "以太网"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "您现已连接到以太网。"
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "正在准备以太网连接 %s..."
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "正在配置以太网连接 %s..."
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "以太网连接 %s 需要用户认证..."
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "正在为 %s 请求一个以太网连接地址..."
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "以太网连接 %s 已处于活动状态"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL 认证"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "新建移动宽带(GSM)连接..."
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "您现在已连接到 GSM 网络。"
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "GSM 网络。"
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "自动 InfiniBand"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand 网络（%s）"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand 网络（%s）"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "InfiniBand 网络"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "InfiniBand 网络"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "您现在已连接到 InfiniBand 网络。"
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "正在准备 InfiniBand 网络连接“%s”..."
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "正在配置 InfiniBand 网络连接 %s..."
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "InfiniBand 网络“%s”需要用户认证..."
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand 连接“%s”开启 "
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "您现已连接到组队网络。"
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "正在准备组队网络连接“%s”..."
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "正在配置组队网络连接 %s..."
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "组队连接“%s”需要用户认证..."
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "组队连接“%s”开启"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "您现在已连接到 VLAN 网络。"
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "正在启动 VLAN 连接“%s”..."
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "正在启动 VLAN 连接“%s”..."
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "VLAN 连接“%s”需要用户认证..."
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VLAN 连接“%s”已处于活动状态"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "连接到隐藏的 Wi-Fi 网络(_C)..."
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "创建新的 Wi-Fi 网络(_N)..."
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(无)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi 网络(%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi 网络(%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi 网络"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi 已禁用"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi 已通过硬件开关禁用"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "更多网络"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "Wi-Fi 网络可用"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "使用网络菜单连接到 Wi-Fi 网络"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "您现在已连接到 Wi-Fi 网络 %s。"
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "正在准备 Wi-Fi 网络连接 %s..."
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "正在配置 Wi-Fi 网络连接 %s..."
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Wi-Fi 网络 %s 需要用户认证..."
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "正在为 %s 请求一个网络地址..."
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wi-Fi 网络连接 %s 处于活动状态：%s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi 网络连接 %s 已处于活动状态"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "无法启用连接"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "无法添加新连接"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX 移动宽带(%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX 移动宽带"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX 已禁用"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX 已通过硬件开关禁用"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "您现在已连接到 WiMAX 网络。"
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "移动宽带连接“%s”已处于活动状态：(%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "漫游中"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "显示连接信息时出错："
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "动态 WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "地址"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "无"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (默认)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "未知"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "未知"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP 地址："
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP 地址："
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "广播地址："
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "子网掩码："
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "默认路由："
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "子网掩码："
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "以太网(%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "常规"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "接口："
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "硬件地址："
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "驱动程序："
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "速度："
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "安全性："
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR："
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID："
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "默认路由："
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "已忽略"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN 类型："
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN 网关："
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN 用户名："
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN Banner："
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "基本连接："
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "未知"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "未找到合法的活动连接！"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1125,42 +914,42 @@ msgstr ""
 "版权所有 (C) 2005-2008 Novell 公司\n"
 "和其他众多社区贡献者和翻译者"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "管理您网络设备和连接的通知区域小程序。"
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager 网站"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "缺少资源"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "移动宽带网络密码"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "连接到“%s”需要密码。"
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "密码："
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "需要解锁 SIM PIN"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "需要解锁 SIM PIN"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1168,25 +957,25 @@ msgid ""
 msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PIN 码。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN 代码："
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "显示 PIN 码"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "需要解锁 SIM PUK"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "需要解锁 SIM PUK"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1194,27 +983,34 @@ msgid ""
 msgstr "移动宽带设备“%s”在可以使用之前需要一个 SIM PUK 码。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK 码："
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "新的 PIN 码："
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "再次输入新的 PIN 码："
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "显示 PIN/PUK 码："
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1222,26 +1018,48 @@ msgid ""
 "button to add an IP address."
 msgstr "IP 地址可在网络上标识您的计算机。单击“添加”按钮添加一个 IP 地址。"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "删除(_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "忽略自动获取的路由(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "仅将此连接用于相对应的网络上的资源(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "如启用，此连接将不会被用于默认网络连接。"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1249,15 +1067,15 @@ msgstr "如启用，此连接将不会被用于默认网络连接。"
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "新建..."
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "选择连接类型"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1310,77 +1128,88 @@ msgid "Bonded _connections:"
 msgstr "已绑定连接(_C)："
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "模式(_M)："
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "模式(_O)："
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "删除(_D)"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "编辑(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "监控频率(_F)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "毫秒"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "接口名称(_I)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "链路监视(_L)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP 目标(_T)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "链接建立延时(_U)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "链接断开延时(_D)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "主要(_P)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "字节"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "路径成本(_C):"
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "优先级(_P)："
 
@@ -1392,44 +1221,89 @@ msgstr "_Hairpin 模式："
 msgid "Bridged _connections:"
 msgstr "桥接连接(_C)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "转发延时(_F)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "问候时间(_H)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "启用联网(_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "启用 _STP"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "最大老化时间(_M)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "老化时间(_A)："
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "自动"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "默认"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "地址"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "地址"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "任何设备"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "由于一个未知错误，更新连接 secret 时失败。"
 
@@ -1529,96 +1403,96 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "优先级流控制"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "对每个用户优先级启用或禁用按优先级暂停传输。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "优先级："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "流量等级："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "严格带宽："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "优先级带宽："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "组带宽："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "组标识："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr "为每个 用户优先级 输入 优先级组 标识。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 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:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr "输入允许各个 用户优先级 使用的 优先级组 带宽百分比。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "为各个 用户优先级 启用或禁用带宽限制。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1631,7 +1505,7 @@ 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:4
+#: ../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
@@ -1639,8 +1513,9 @@ msgid "Sho_w password"
 msgstr "显示密码(_W)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1652,7 +1527,8 @@ msgstr "密码(_P)："
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "自动"
@@ -1707,18 +1583,18 @@ msgstr "自动握手(_O)"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "设备 MAC 地址(_D)："
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "服务(_S)："
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "克隆 MAC 地址(_L)："
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1727,19 +1603,54 @@ msgstr ""
 "此处输入的 MAC 地址将在设备启动时被标记为网络设备硬件地址，该特性被称作MAC 克"
 "隆。例如：00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU："
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "字节"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "默认"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "忽略"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "广播"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "私钥密码(_P)："
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1778,8 +1689,8 @@ msgstr "自动使用手工设置的 DNS"
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "手动"
 
@@ -1790,8 +1701,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "与其它计算机共享"
 
@@ -1805,7 +1716,7 @@ msgstr "方法(_M)："
 msgid "Addresses"
 msgstr "地址"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1814,42 +1725,42 @@ 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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 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.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS 服务器："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 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.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1857,13 +1768,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "路由(_R)..."
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "已禁用"
 
@@ -1875,7 +1786,7 @@ msgstr "已启用(公共地址优先)"
 msgid "Enabled (prefer temporary address)"
 msgstr "已启用(临时地址优先)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 "
@@ -1884,15 +1795,15 @@ msgstr ""
 "用来解析主机名的域名服务器的 IP 地址。用逗号分隔多个域名服务器地址。本地连接"
 "地址会自动配置到连接中的接口。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "IPv6 隐私扩展(_P)："
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1901,71 +1812,38 @@ msgstr ""
 "成。"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "任意"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "优先使用 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "优先使用 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "优先使用 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "仅使用 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "编号(_M)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "高级"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "网络 ID (_E)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "类型(_T)："
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "更改..."
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "如果主网络不可用则允许漫游(_R)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "显示密码(_W)"
 
@@ -2031,32 +1909,55 @@ msgid "_Teamed connections:"
 msgstr "已组队的连接(_T)："
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "从文件导入组队配置(_M)..."
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "从文件导入组队配置(_I)..."
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "上级接口(_P)："
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN 接口名称(_N)："
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "克隆 MAC 地址(_C)："
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN 标签(_I)："
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "设备名称 + 编号"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "vlan + 数字"
 
@@ -2073,94 +1974,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "架构"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "传输功率(_W)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/秒"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "速率(_R)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "频道(_H)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "波段(_D)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "模式(_O)："
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID："
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "允许的认证方法"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "可扩展认证协议"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "密码认证协议"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "挑战握手认证协议"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "微软挑战握手认证协议"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "微软挑战握手认证协议第二版"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2168,301 +2073,360 @@ msgstr ""
 "大多数情况下，服务商的 PPP 服务器支持所有的认证方法。如连接失败，请尝试禁用一"
 "些方法的支持。"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "地址"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "子网掩码"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "网关"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "度量"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "前缀"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "以太网"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "蓝牙"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "绑定"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "组队"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "桥接"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "虚拟"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "导入 VPN 配置..."
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "由于一个未知错误，连接编辑器对话框无法初始化。"
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "无法建立新连接"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "删除连接失败"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "是否确认删除连接 %s？"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "地址"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "子网掩码"
+
+#: ../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
+msgid "Gateway"
+msgstr "网关"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "度量"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "前缀"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "正在编辑 %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "编辑未命名连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "连接名称(_N)："
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "初始化编辑器错误"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "添加连接失败"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "保存对此连接的全部更改。"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "为本机所有用户保存此连接需要认证。"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "无法创建连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "无法编辑连接"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "创建连接编辑器对话框出现未知错误。"
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "初始化编辑器错误"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "添加连接失败"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "保存连接出错"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "属性“%s”/“%s”非法：%d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "连接名称(_N)："
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "导出(_E)..."
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "从不"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "现在"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟以前"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时以前"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以前"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 个月以前"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以前"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "名称"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "最后使用的"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "编辑选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "进行认证以编辑选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "删除选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "进行认证以删除选中的连接"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "未安装 VPN 插件。"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "不知道如何创建“%s”连接"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "编辑连接出错"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "没有找到“%s”连接"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1X 安全性"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "无法加载 802.1X 安全配置用户界面。"
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "对此连接使用 802.1_X 安全配置"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "无法加载 DSL 用户界面。"
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "无法找到蓝牙设备。"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "绑定连接 %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "蓝牙"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "以太网"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Wi-Fi 网络"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "无法加载绑定用户界面。"
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "主要(_P)："
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "绑定连接 %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "无法加载桥接用户界面。"
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "桥接连接 %d"
@@ -2470,58 +2434,74 @@ msgstr "桥接连接 %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "桥接端口"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "无法加载桥接端口用户界面。"
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "无法加载 DSL 用户界面。"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "无法加载 DSL 用户界面。"
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 连接 %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 地址指定的网络设备。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "无法加载以太网用户界面。"
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "以太网"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "克隆 MAC 地址(_L)："
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "默认"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2530,233 +2510,276 @@ msgstr ""
 "区(zone)定义了连接的信任等级。默认值不是常规区，选择它会使用防火墙的默认区设"
 "置。只在防火墙启用时有用。"
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD 未运行。"
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "无法加载常规用户界面。"
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "无法加载 InfiniBand 用户界面。"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 连接 %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "自动(VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "自动(VPN)仅地址"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "自动(PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "自动(PPP)仅地址"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "自动，仅地址"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "自动(PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "自动(PPPoE)仅地址"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "自动(DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "自动(DHCP)仅地址"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "仅本地连接"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "附加 _DNS 服务器："
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "附加搜索域(_E)："
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "正在编辑 %s 的 IPv4 路由"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 设置"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "无法加载 IPv4 用户界面。"
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "自动，仅地址"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "自动，仅 DHCP"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "正在编辑 %s 的 IPv6 路由"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 设置"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "无法加载 IPv6 用户界面。"
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "重叠的从机"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "从机“%s”与“%s”都应用于设备“%s“"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, 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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s 从机 %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "无法加载移动宽带用户界面。"
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "不支持的移动宽带连接类型。"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "选择移动宽带提供商类型"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr "选择您的移动宽带提供商使用的技术。如不确定，请询问您的提供商。"
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "我的提供商使用基于 _GSM 的技术(如 GPRS、EDGE、UMTS、HSDPA)"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的提供商使用基于 C_DMA 的技术(如 1xRTT、EVDO)"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "无"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP 设置"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "无法加载 PPP 用户界面。"
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "选择要导入的文件"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "错误：此文件不含任何有效的 JSON 配置"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "无法加载组队用户界面。"
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "组队连接 %d"
@@ -2764,47 +2787,56 @@ msgstr "组队连接 %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "组队端口"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (通过“%s”）"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "没有网络连接"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "无法加载 VLAN 用户界面。"
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 连接 %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "无法加载 VPN 用户界面。"
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "无法找到用于 %s 的 VPN 插件服务。"
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 连接 %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2814,11 +2846,11 @@ msgstr ""
 "\n"
 "错误：没有 VPN 服务类型。"
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "选择 VPN 连接类型"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2827,7 +2859,7 @@ msgstr ""
 "请为新建连接选择一个 VPN 类型。如果您希望建立的 VPN 连接类型未出现在列表中，"
 "您可能没有安装正确的 VPN 插件。"
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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"
@@ -2835,71 +2867,91 @@ msgstr ""
 "此选项可将此连接锁定至以在此输入的 BSSID 指定的 Wi-Fi 访问点(AP)。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"此选项可将此连接锁定至以在此输入的 MAC 地址指定的网络设备。例如："
+"00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "无法加载 Wi-Fi 用户界面。"
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "任何设备"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 连接 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128 位密码句"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "动态 WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA 及 WPA2 个人"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA 及 WPA2 企业"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi 安全性"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "无法加载 Wi-Fi 安全性用户界面。"
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "无法加载 WiMAX 用户界面。"
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX 连接 %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "无法导入 VPN 连接"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2911,25 +2963,30 @@ msgstr ""
 "\n"
 "错误：%s。"
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "未知错误"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "名为“%s”的文件已存在。"
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "无法导出 VPN 连接"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2940,105 +2997,21 @@ msgstr ""
 "\n"
 "错误：%s。"
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "导出 VPN 连接..."
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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 "网络管理器小程序找不到所需的资源(.ui 文件未找到)。"
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "蓝牙配置不可用(无法连接 D-Bus：(%s) %s)。"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "蓝牙配置不可用(查找 NetworkManager 出错：(%s) %s)。"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "使用您的移动电话作为网络设备(PAN/NAP)"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "使用您的手机访问互联网(DUN)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "错误：%s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "无法建立 DUN 连接：%s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "您的电话已经可以使用！"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "移动连接向导已被取消"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "未知电话设备类型(不是 GSM 或者 CDMA)"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "未知调制解调器类型。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "连接到电话失败。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "获取总线连接出错"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "意外断开与电话的连接。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "检测电话详细信息时超时。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "正在检测电话配置..."
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr "在设置拨号网络连接前必须启用默认蓝牙适配器。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "无法建立 PAN 连接：%s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "%s 网络"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "解锁(_U)"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "自动解锁此设备"
 
@@ -3046,31 +3019,36 @@ msgstr "自动解锁此设备"
 msgid "Connection Information"
 msgstr "连接信息"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "活动的网络连接"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "您的设备："
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "您的服务商："
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "您的套餐："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3082,23 +3060,28 @@ msgstr ""
 "访问网络资源，请检查您的设置。要修改您的移动宽带设置，在系统 >> 首选项菜单中"
 "选择“网络连接”。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "确认移动宽带设置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "未列出"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "选择您的套餐(_S)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3109,218 +3092,277 @@ msgstr ""
 "\n"
 "如果您不确定您的套餐，请询问您的提供商以获取套餐的 APN。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "选择您的付费套餐"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "我的套餐未被列出..."
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "提供商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "提供商："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "选择您的提供商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "国家或地区列表："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "国家或地区"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "我所在国家/地区没有被列出"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "已安装的 GSM 设备"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "已安装的 CDMA 设备"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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 "此助手程序可帮助您简单地设置一个到蜂窝(3G)网络的移动宽带连接。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "您将需要以下信息："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "您的宽带提供商名称"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "您的宽带付费套餐名称"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "为此移动宽带设备创建一个连接(_T)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "任何设备"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "设置一个移动宽带连接"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "新移动宽带连接"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "有线"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "蓝牙"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "次要密码(_S)："
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "次要密码(_S)："
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %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/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:132 ../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:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "新建..."
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "无"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "需要密码或密钥来访问 Wi-Fi 网络 %s。"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "需要 Wi-Fi 网络认证"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 网络要求认证"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "创建新的 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "新建 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "输入您要创建的 Wi-Fi 网络的名称。"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "连接到隐藏的 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "隐藏的 Wi-Fi 网络"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "输入您要连接的隐藏的 Wi-Fi 网络的名称及安全性详细信息。"
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "次要密码(_S)："
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "显示密码(_O)"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi 安全性(_S)："
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "连接(_O)："
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi 适配器(_A)："
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "用法："
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3328,144 +3370,157 @@ msgstr ""
 "此程序是 NetworkManager 的一个组件(https://wiki.gnome.org/Projects/"
 "NetworkManager/)。"
 
-#: ../src/main.c:76
+#: ../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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "未启用"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "未注册"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "家庭网络(%s)"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "家庭网络"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "正在搜索"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "注册被拒绝"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s(漫游中)"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "漫游网络(%s)"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "漫游网络"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "%2$s 上 SIM 卡 %1$s 的 PIN 码"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "需要 PIN 码"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "移动宽带设备需要 PIN 码。"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "移动宽带连接“%s”已处于活动状态：(%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "漫游中"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s 连接"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "只为当前用户保存密码(_U)"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "为所有用户保存密码(_A)"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 证书(*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "选择一个 PAC 文件..."
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC 文件(*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "所有文件"
 
@@ -3501,15 +3556,32 @@ msgstr "内部认证(_I)："
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允许自动 PAC 配置(_V)"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "选择一个认证中心证书..."
 
@@ -3537,15 +3609,46 @@ msgstr "不需要 CA 证书(_R)"
 msgid "PEAP _version:"
 msgstr "PEAP 版本(_V)："
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "总是询问该密码(_K)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A 证书："
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私钥是不安全的"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3558,11 +3661,11 @@ msgstr ""
 "\n"
 "(您可以使用 openssl 来对私钥进行密码保护)"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "选择您的个人证书..."
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "选择您的私钥..."
 
@@ -3582,23 +3685,36 @@ msgstr "私钥(_K)："
 msgid "_Private key password:"
 msgstr "私钥密码(_P)："
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "FAST"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "隧道 TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "受保护的 EAP (PEAP)"
 
@@ -3608,6 +3724,44 @@ msgstr "受保护的 EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "认证(_T)："
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (默认)"
@@ -3632,6 +3786,287 @@ msgstr "显示密钥(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP 索引(_X)："
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "类型(_T)："
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "启用 WiMA_X 移动宽带"
+
+#~ msgid "_Help"
+#~ msgstr "帮助(_H)"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "您现在已连接到绑定的网络。"
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "正在准备绑定连接“%s”..."
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "正在配置绑定连接“%s”..."
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "绑定连接“%s”需要用户认证..."
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "正在为“%s”请求地址..."
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "绑定连接“%s”已处于活动状态"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "您现在已连接到桥接的网络。"
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "正在准备桥接网络连接“%s”..."
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "正在配置桥接网络连接 %s..."
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "桥接网络“%s”需要用户认证..."
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "桥接网络连接“%s”已处于活动状态"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "新建移动宽带(CDMA)连接..."
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "您现在已连接到 CDMA 网络。"
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA 网络。"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "新建移动宽带(GSM)连接..."
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "您现在已连接到 GSM 网络。"
+
+#~ msgid "GSM network."
+#~ msgstr "GSM 网络。"
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "自动 InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand 网络（%s）"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand 网络（%s）"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand 网络"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand 网络"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "您现在已连接到 InfiniBand 网络。"
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "正在准备 InfiniBand 网络连接“%s”..."
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "正在配置 InfiniBand 网络连接 %s..."
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand 网络“%s”需要用户认证..."
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand 连接“%s”开启 "
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "您现已连接到组队网络。"
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "正在准备组队网络连接“%s”..."
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "正在配置组队网络连接 %s..."
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "组队连接“%s”需要用户认证..."
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "组队连接“%s”开启"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "您现在已连接到 VLAN 网络。"
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "正在启动 VLAN 连接“%s”..."
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "正在启动 VLAN 连接“%s”..."
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "VLAN 连接“%s”需要用户认证..."
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN 连接“%s”已处于活动状态"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX 移动宽带(%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX 移动宽带"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX 已禁用"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX 已通过硬件开关禁用"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "您现在已连接到 WiMAX 网络。"
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "未知"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "未知"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR："
+
+#~ msgid "BSID:"
+#~ msgstr "BSID："
+
+#~ msgid "_Mode:"
+#~ msgstr "模式(_M)："
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "设备 MAC 地址(_D)："
+
+#~ msgid "Any"
+#~ msgstr "任意"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "优先使用 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "优先使用 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "优先使用 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "仅使用 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "从文件导入组队配置(_M)..."
+
+#~ msgid "Infrastructure"
+#~ msgstr "架构"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "保存连接出错"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "属性“%s”/“%s”非法：%d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "自动(PPP)"
+
+#~ 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)."
+#~ msgstr "蓝牙配置不可用(无法连接 D-Bus：(%s) %s)。"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "蓝牙配置不可用(查找 NetworkManager 出错：(%s) %s)。"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "使用您的移动电话作为网络设备(PAN/NAP)"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "使用您的手机访问互联网(DUN)"
+
+#~ msgid "Error: %s"
+#~ msgstr "错误：%s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "无法建立 DUN 连接：%s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "您的电话已经可以使用！"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "移动连接向导已被取消"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "未知电话设备类型(不是 GSM 或者 CDMA)"
+
+#~ msgid "unknown modem type."
+#~ msgstr "未知调制解调器类型。"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "连接到电话失败。"
+
+#~ msgid "error getting bus connection"
+#~ msgstr "获取总线连接出错"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "意外断开与电话的连接。"
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "检测电话详细信息时超时。"
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "正在检测电话配置..."
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr "在设置拨号网络连接前必须启用默认蓝牙适配器。"
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "无法建立 PAN 连接：%s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s 网络"
+
 #~ msgid "Primary DNS:"
 #~ msgstr "主 DNS："
 
@@ -3728,9 +4163,6 @@ msgstr "WEP 索引(_X)："
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "不知道如何编辑“%s”连接"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "无法找到蓝牙设备。"
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "蓝牙配置不可用(创建 D-Bus 代理服务器失败)。"
 
@@ -3749,9 +4181,6 @@ msgstr "WEP 索引(_X)："
 #~ msgid "label"
 #~ msgstr "标签"
 
-#~ msgid "Network Manager"
-#~ msgstr "网络管理器"
-
 #~ msgid "An instance of nm-applet is already running.\n"
 #~ msgstr "一个 nm-applet 的实例已经在运行。\n"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index c280e100..2f8d5148 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -12,9 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 0.9.8\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-08-25 22:06+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+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"
@@ -25,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.6.5\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "網絡"
 
@@ -119,46 +118,89 @@ msgid ""
 "authentication."
 msgstr "將這設為 True，以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "NetworkManager 面板程式"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "NetworkManager 面板程式"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X 驗證"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "連線(_O)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "網絡名稱(_N)："
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr "ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr "安全。"
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "無法加入/使用連線"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "連線失敗"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "裝置斷線失敗"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "斷線失敗"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "連線生效失敗"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "不要再顯示這個訊息"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -168,7 +210,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為網絡連線被中斷了。"
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -177,7 +219,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務意外的停止了。"
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -187,7 +229,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務傳回無效的組態。"
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -196,7 +238,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為連線的嘗試已逾時。"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -205,7 +247,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務沒有及時啟動。"
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -214,7 +256,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務啟動失敗。"
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -223,7 +265,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為沒有有效的 VPN 服務。"
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -232,7 +274,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為無效的 VPN 機密。"
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -241,7 +283,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗。"
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -251,7 +293,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為網絡連線中斷了。"
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -260,7 +302,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務已停止。"
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -269,7 +311,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」已斷線。"
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -279,19 +321,19 @@ msgstr ""
 "VPN 連線已成功的。\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN 連線已成功的。\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN 登錄訊息"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN 連線失敗"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -304,7 +346,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -317,798 +359,544 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "裝置尚未就緒 (缺少韌體)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "裝置尚未就緒"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "裝置無法管理"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "沒有可用的網絡裝置"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN 連線"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "設置 VPN(_C)…"
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "與 VPN 斷線(_D)"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager 沒有執行…."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "網絡已停用"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "啟用網絡(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "啟用 _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "啟用流動寬頻(_M)"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "啟用 WiMA_X 流動寬頻"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "啟用通知功能(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "連線資訊(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "編輯連線…"
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "求助(_H)"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "你現在已連線至「%s」。"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "網絡連線已中斷。"
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "正在準備網絡連線「%s」…"
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "網絡連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "正在要求提供「%s」的網絡位址…"
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "網絡連線「%s」在使用中"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "正在啟動 VPN 連線「%s」…"
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN 連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "正在要求 VPN 提供「%s」的網絡位址…"
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN 連線「%s」在使用中"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "沒有網絡連接"
 
-#: ../src/applet.c:3628
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager 面板程式"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "可用"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "已建立連線"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "你現在已連線至繫結的網絡。"
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "正在準備繫結的連線「%s」…"
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "正在設定繫結的連線「%s」…"
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "繫結的連線「%s」需要使用者驗證…"
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "正在要求「%s」的網絡位址…"
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "繫結的連線「%s」在使用中"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "你現在已連線至橋接的網絡。"
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "正在準備橋接的網絡連線「%s」…"
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "正在設定橋接的網絡連線「%s」…"
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "橋接的連線「%s」需要使用者驗證…"
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "橋接的連線「%s」在使用中"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK 碼錯誤，請聯絡你的供應商。"
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "發送解鎖用的密碼…"
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "流動寬頻 (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "流動寬頻"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "可用"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "新的流動寬頻連線…"
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "已建立連線"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "你現在已連線至流動寬頻網絡。"
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "流動寬頻網絡。"
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "你現在已註冊至家用網絡。"
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "你現在已註冊至漫遊網絡。"
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "你現在已連線至流動寬頻網絡。"
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "正在準備流動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "正在設定流動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "流動寬頻連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "流動寬頻連線「%s」在使用中"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "新的流動寬頻 (CDMA) 連線…"
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "你現在已連線至 CDMA 網絡。"
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "CDMA 網絡。"
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "自動乙太網絡"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "有線網絡 (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "有線網絡 (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "有線網絡"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "有線網絡"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "你現在已連線至有線網絡。"
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "正在準備有線網絡連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "正在設定有線網絡連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "有線網絡連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "正要求有線網絡「%s」提供網絡位址…"
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "有線網絡連線「%s」在使用中"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL 驗證"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "新的流動寬頻 (GSM) 連線…"
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "你現在已連線至 GSM 網絡。"
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "GSM 網絡。"
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "自動 InfiniBand"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand 網絡 (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand 網絡 (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "InfiniBand 網絡"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "InfiniBand 網絡"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "你現在已連線至 InfiniBand 網絡。"
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "正在準備 InfiniBand 連線「%s」…"
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "正在設定 InfiniBand 連線「%s」…"
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "InfiniBand 連線「%s」需要使用者驗證…"
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand 連線「%s」在使用中"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "你現在已連線至隊伍網絡。"
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "正在準備隊伍的網絡連線「%s」…"
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "正在設定隊伍的網絡連線「%s」…"
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "隊伍連線「%s」需要使用者驗證…"
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "隊伍連線「%s」在使用中"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "你現在已連線至 VLAN 網絡。"
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "正在啟動 VLAN 連線「%s」…"
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "正在啟動 VLAN 連線「%s」…"
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "VLAN 連線「%s」需要使用者驗證…"
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VLAN 連線「%s」在使用中"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "連接到隱藏的 Wi-Fi 網絡(_C)…"
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "建立新的 Wi-Fi 網絡(_N)…"
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(無)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi 網絡 (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi 網絡 (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi 網絡"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi 已停用"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi 已被硬件開關停用"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "更多網絡"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "有 Wi-Fi 網絡可用"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "使用網絡選單來連線到 Wi-Fi 網絡"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "你現在已連線至 Wi-Fi 網絡「%s」。"
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "正在準備 Wi-Fi 網絡連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "正在設定 Wi-Fi 網絡連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Wi-Fi 網絡連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "正在要求提供「%s」的 Wi-Fi 網絡位址…"
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wi-Fi 網絡連線「%s」在使用中： %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi 網絡連線「%s」在使用中"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "無法使用連線"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "無法加入新連線"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX 流動寬頻 (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX 流動寬頻"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX 已停用"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX 已被硬件開關停用"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "你現在已連線至 WiMAX 網絡。"
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "流動寬頻連線「%s」在使用中：(%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "漫遊"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "顯示連線資訊發生錯誤："
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "動態 WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "地址"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (預設值)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "不明"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "不明"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP 位址："
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP 位址："
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "廣播位址："
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "子網絡遮罩："
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "預設路由："
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "子網絡遮罩："
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "乙太網絡 (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "一般"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "介面："
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "硬件位址："
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "驅動程式："
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "速度："
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "安全性："
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR："
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID："
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "預設路由："
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "已忽略"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN 類型："
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN 閘道器："
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN 使用者名稱："
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN 旗幟："
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "基礎連線："
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "不明"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "找不到有效的使用中連線！"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1116,42 +904,42 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "與許多其他社羣貢獻者與翻譯者"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "用來管理你的網絡裝置與連線的通知區面板程式。"
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager 網站"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "遺失資源"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "流動寬頻網絡密碼"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "連線至「%s」需要密碼。"
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "密碼："
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "需要解鎖 SIM PIN 碼"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "需要解鎖 SIM PIN 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1159,25 +947,25 @@ msgid ""
 msgstr "要使用流動寬頻裝置「%s」之前，需要 SIM PIN 碼。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN 碼："
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "顯示 PIN 碼"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "需要解鎖 SIM PUK 碼"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "需要解鎖 SIM PUK 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1185,27 +973,34 @@ msgid ""
 msgstr "要使用流動寬頻裝置「%s」之前，需要 SIM PUK 碼。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK 碼："
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "新的 PIN 碼："
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "重新輸入 PIN 碼："
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "顯示 PIN/PUK 碼"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 "確定(_O)"
+
+#: ../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
 msgid ""
@@ -1213,26 +1008,48 @@ msgid ""
 "button to add an IP address."
 msgstr "用來在網絡上區別你的電腦的 IP 位址。請按下「新增」按鈕，加入 IP 位址。"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "刪除(_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "忽略自動獲得的路由(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "只在使用這個連線的網絡資源時，才使用此連線(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "如果啟用，這個連線將永遠不會做為預設網絡連線。"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1240,15 +1057,15 @@ msgstr "如果啟用，這個連線將永遠不會做為預設網絡連線。"
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "建立…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "請選擇連線類型"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1257,7 +1074,8 @@ msgid ""
 msgstr ""
 "選擇你想要建立的連線類型。\n"
 "\n"
-"如果要建立 VPN，而你想要建立的 VPN 連線類型沒有出現在清單中，可能是沒有安裝正確的 VPN 外掛程式。"
+"如果要建立 VPN，而你想要建立的 VPN 連線類型沒有出現在清單中，可能是沒有安裝正"
+"確的 VPN 外掛程式。"
 
 #: ../src/connection-editor/ce-page-bond.ui.h:1
 msgid "Round-robin"
@@ -1300,77 +1118,89 @@ msgid "Bonded _connections:"
 msgstr "繫結的連線(_C)："
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "模式(_M)："
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "模式(_O)："
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "刪除(_D)"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "編輯(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "監控頻率(_F)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "毫秒"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "介面名稱(_I)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "連線監控(_L)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP 目標(_T)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 msgid ""
 "An IP address, or a comma-separated list of IP addresses, to look for when "
 "checking the link status."
-msgstr "一個 IP 位址，或以逗號分隔的 IP 位址清單，這是在檢查連線狀態時查詢用的。"
+msgstr ""
+"一個 IP 位址，或以逗號分隔的 IP 位址清單，這是在檢查連線狀態時查詢用的。"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "連線延遲(_U)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "斷線延遲(_D)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "主要(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "位元組"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "路徑成本(_C)："
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "優先順序(_P)："
 
@@ -1382,44 +1212,89 @@ msgstr "_Hairpin 模式："
 msgid "Bridged _connections:"
 msgstr "橋接的連線(_C)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "轉送延遲(_F)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Hello 時間："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "啟用網絡(_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "啟用 _STP (生成樹協議)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "最大時間(_M)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "存續時間(_A)："
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "自動"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "預設"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "地址"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "地址"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "任何裝置"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "由於不明的錯誤使連線機密的更新失敗。"
 
@@ -1518,96 +1393,97 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "優先順序流量控制"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "根據每個使用者優先順序啟用或停用優先順序暫停傳輸。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "優先順序："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "流量類別："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "限制頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "優先順序頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "羣組頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "羣組 ID："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr "根據每個使用者優先順序輸入優先順序羣組 ID。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
 "sum of all groups must total 100%."
-msgstr "輸入每個優先順序羣組可以使用的連線頻寬。所有羣組的總合加起來必須為 100%。"
+msgstr ""
+"輸入每個優先順序羣組可以使用的連線頻寬。所有羣組的總合加起來必須為 100%。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr "輸入每個使用者優先順序可以使用的優先順序羣組頻寬百分比。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "根據每個使用者優先順序啟用或停用限制頻寬。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1620,7 +1496,7 @@ 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:4
+#: ../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
@@ -1628,8 +1504,9 @@ msgid "Sho_w password"
 msgstr "顯示密碼(_W)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1641,7 +1518,8 @@ msgstr "密碼(_P)："
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "自動"
@@ -1696,37 +1574,74 @@ msgstr "自動協議(_O)"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "裝置的 MAC 位址(_D)："
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "服務(_S)："
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "複製的 MAC 位址(_L)："
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "在這裏輸入的 MAC 位址會成為這個連線使用的網絡裝置的硬件位址。這個功能也稱為 MAC 複製或偽裝。例如：00:11:22:33:44:55"
+msgstr ""
+"在這裏輸入的 MAC 位址會成為這個連線使用的網絡裝置的硬件位址。這個功能也稱為 "
+"MAC 複製或偽裝。例如：00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU："
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "位元組"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "預設"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "忽略"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "廣播"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "私密密碼匙密碼(_P)："
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1765,8 +1680,8 @@ msgstr "自動使用手動 DNS 設定值"
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "手動"
 
@@ -1777,8 +1692,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "分享給其他電腦"
 
@@ -1792,61 +1707,67 @@ msgstr "方法(_M)："
 msgid "Addresses"
 msgstr "地址"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 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 用戶端識別，請在此輸入。"
+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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 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.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS 伺服器："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
-msgstr "網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的位址。"
+msgstr ""
+"網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的"
+"位址。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
-msgstr "當連至可使用 IPv6 的網絡時，若 IPv4 配置失敗，不過 IPv6 配置卻成功的話，請允許連線完成。"
+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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "路由(_R)…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "已停用"
 
@@ -1858,93 +1779,64 @@ msgstr "啟用 (偏好公開位址)"
 msgid "Enabled (prefer temporary address)"
 msgstr "啟用 (偏好暫時位址)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的位址。Link-local 位址會自動設定到連線中的介面。"
+msgstr ""
+"網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的"
+"位址。Link-local 位址會自動設定到連線中的介面。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "I_Pv6 私隱擴充功能："
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
-msgstr "當連至可使用 IPv4 的網絡時，若 IPv6 配置失敗，不過 IPv4 配置卻成功的話，請允許連線完成。"
+msgstr ""
+"當連至可使用 IPv4 的網絡時，若 IPv6 配置失敗，不過 IPv4 配置卻成功的話，請允"
+"許連線完成。"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "任何"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "偏好 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "偏好 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "偏好 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "只使用 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "數字(_M)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "進階"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "網絡 ID(_E)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "類型(_T)："
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "更改…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "如果家用網絡無法使用，允許使用漫遊(_R)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "顯示密碼(_W)"
 
@@ -2010,32 +1902,55 @@ msgid "_Teamed connections:"
 msgstr "隊伍連線(_T):"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "從檔案匯入隊伍組態(_M)…"
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "從檔案匯入隊伍組態(_I)…"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "父介面(_P)："
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN 介面名稱(_N)："
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "複製的 MA_C 位址："
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN _id："
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "裝置名稱 + 編號"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + 編號"
 
@@ -2052,394 +1967,459 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "基礎架構"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "傳輸耗能(_W)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "速率(_R)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "頻道(_H)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "波段(_D)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "模式(_O)："
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID："
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "允許的驗證方式"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "可延伸的驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "密碼驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake 驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake 驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake 驗證通訊協定第 2 版"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
-msgstr "在大多數情況下，網絡供應者的 PPP 伺服器會支援所有的驗證方法。如果連線失敗，請嘗試停用某些方法的支援。"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "地址"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "網絡遮罩"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "通訊閘"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "度量 (Metric)"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "前綴"
+msgstr ""
+"在大多數情況下，網絡供應者的 PPP 伺服器會支援所有的驗證方法。如果連線失敗，請"
+"嘗試停用某些方法的支援。"
 
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "有線網絡"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "藍牙"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "繫結"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "隊伍"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "橋接"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "虛擬"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "匯入已儲存的 VPN 組態…"
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "由於不明的錯誤使連線編輯器對話盒無法初始化。"
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "無法建立新連線"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "刪除連線失敗"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "你確定要刪除連線 %s ？"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "地址"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "網絡遮罩"
+
+#: ../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
+msgid "Gateway"
+msgstr "通訊閘"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "度量 (Metric)"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "前綴"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "編輯 %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "編輯未命名的連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "連線名稱(_N)："
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "初始化編輯器時發生錯誤"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "新增連線失敗"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "儲存任何對這個連線進行的更改。"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "驗證以儲存這個連線給此電腦上的所有使用者。"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "無法建立連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "無法編輯連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "建立連線編輯器對話盒時發生不明錯誤。"
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "初始化編輯器時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "新增連線失敗"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "儲存連線時錯誤"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "屬性「%s」/「%s」是無效的：%d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "連線名稱(_N)："
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "匯出(_E)…"
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "永不"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "現在"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘以前"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時以前"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以前"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月以前"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以前"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "最後使用的"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "編輯選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "驗證以編輯選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "驗證以刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "尚未安裝任何 VPN 外掛程式。"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "不知道如何建立「%s」連線"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "建立連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "編輯連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "找不到 UUID「%s」的連線"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x 防護"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "無法載入 802.1x 安全性使用者介面。"
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "在這個連線使用 802.1_X 防護"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "無法載入 DCB 使用者介面。"
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "找不到藍牙裝置。"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "繫結的連線 %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "藍牙"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "有線網絡"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Wi-Fi 網絡"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "無法載入繫結的使用者介面。"
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "主要(_P):"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "繫結的連線 %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "無法載入橋接的使用者介面。"
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "橋接的連線 %d"
@@ -2447,289 +2427,352 @@ msgstr "橋接的連線 %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "橋接連接埠"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "無法載入橋接連接埠使用者介面。"
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "無法載入 DCB 使用者介面。"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "無法載入 DSL 使用者介面。"
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 連線 %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
-msgstr "此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網絡裝置。例如：00:11:22:33:44:55"
+"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 位址所指定的網絡裝置。例如："
+"00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "無法載入有線網絡使用者介面。"
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "有線網絡"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "複製的 MAC 位址(_L)："
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "預設"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 啟用時有用。"
+msgstr ""
+"定義連線信任等級的地帶。預設值不是正常的地帶，選擇它會直接使用防火牆中預設的"
+"地帶設定。只有在 firewalld 啟用時有用。"
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD 沒有執行。"
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "無法載入一般使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "無法載入 InfiniBand 使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 連線 %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "自動 (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "只用自動 (VPN) 位址"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "自動 (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "只用自動 (PPP) 位址"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "自動，僅限位址"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "自動 (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "只用自動 (PPPoE) 位址"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "只用自動 (DHCP) 位址"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "額外的 _DNS 伺服器："
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "額外的搜尋網域(_E)："
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "編輯 %s 的 IPv4 路由"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 設定"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "無法載入 IPv4 使用者介面。"
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "自動，僅限位址"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "自動，僅使用 DHCP"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "為 %s 編輯 IPv6 路由"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 設定"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "無法載入 IPv6 使用者介面。"
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "重製從屬"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "從屬「%s」與「%s」都套用到裝置「%s」"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, 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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "無法載入流動寬頻使用者介面。"
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "不支援的流動寬頻連線類型。"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "選擇流動寬頻供應商類型"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr "請選擇你的無線寬頻供應商所使用的技術。如果你不確定，請洽詢供應商。"
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "我的供應商使用 _GSM 為主的技術（例如 GPRS、EDGE、UMTS、HSDPA）"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的供應商使用 C_DMA 為主的技術（例如 1xRTT、EVDO）"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "沒有"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP 設定值"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "無法載入 PPP 使用者介面。"
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "選擇要匯入的檔案"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "錯誤：檔案不含有效的 JSON 組態"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "無法載入隊伍使用者介面。"
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "隊伍連線 %d"
@@ -2737,47 +2780,56 @@ msgstr "隊伍連線 %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "隊伍連接埠"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (經由「%s」)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "沒有網絡連接"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "無法載入 vlan 使用者介面。"
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 連線 %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "無法載入 VPN 使用者介面。"
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "找不到「%s」的 VPN 外掛程式服務。"
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 連線 %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2787,88 +2839,112 @@ msgstr ""
 "\n"
 "錯誤：沒有 VPN 服務類型。"
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "請選擇 VPN 的連線類型"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 外掛程式。"
+msgstr ""
+"選擇你想要用在新連線中的 VPN 類型。如果你想要建立的 VPN 連線類型沒有出現在清"
+"單中，可能是沒有安裝正確的 VPN 外掛程式。"
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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 "此選項會將此連線鎖定至在此所輸入的 BSSID 所指定的 Wi-Fi 存取點（AP）。例如：00:11:22:33:44:55"
+msgstr ""
+"此選項會將此連線鎖定至在此所輸入的 BSSID 所指定的 Wi-Fi 存取點（AP）。例如："
+"00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網絡裝置。例如："
+"00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "無法載入 Wi-Fi 使用者介面。"
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "任何裝置"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 連線 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元 密語"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "動態 WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 個人版"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企業版"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi 安全性"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "無法載入 Wi-Fi 安全性使用者介面。"
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "無法載入 WiMAX 使用者介面。"
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX 連線 %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "無法匯入 VPN 網絡連線"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2880,25 +2956,30 @@ msgstr ""
 "\n"
 "錯誤：%s。"
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "不明的錯誤"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "名為「%s」的檔案已經存在。"
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "取代(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "不能匯出 VPN 連線"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2909,105 +2990,21 @@ msgstr ""
 "\n"
 "錯誤：%s。"
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "匯出 VPN 連線…"
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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 "NetworkManager 面板程式無法找到一些需要的資源（找不到 .ui 檔）。"
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "無法進行藍牙的配置（無法連至 D-Bus：(%s) %s）。"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "無法進行藍牙的配置（找不到 NetworkManager：(%s) %s）。"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "使用手機作為網絡裝置（PAN/NAP）"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "使用手機存取互聯網（DUN）"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "錯誤：%s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "無法建立 DUN 連線：%s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "你的電話現在已經可以使用！"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "行動精靈已經取消"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "不明的電話裝置類型（非 GSM 或 CDMA）"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "不明的數據機類型。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "無法連線至電話。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "取得匯流排連線時發生錯誤"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "電話無預期離線。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "在時間內偵測不到電話的詳細資料。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "偵測電話的配置…"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr "預設的藍牙配接卡必須在設定撥號網絡連線前啟用。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "無法建立 PAN 連線：%s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "%s 網絡"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "解鎖(_U)"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "自動解鎖這個裝置"
 
@@ -3015,56 +3012,69 @@ msgstr "自動解鎖這個裝置"
 msgid "Connection Information"
 msgstr "連線資訊"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "啟用網絡連線"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "你的裝置："
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "你的供應商："
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "你的計劃："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "現在，根據你所選取的設定，電腦將連上你的流動寬頻供應商。如果連線失敗，或是你無法存取網絡資源，請檢查設定。要修改流動寬頻連線的設定，請從「系統」 >> 「偏好設定」中，選擇「網絡連線」。"
+msgstr ""
+"現在，根據你所選取的設定，電腦將連上你的流動寬頻供應商。如果連線失敗，或是你"
+"無法存取網絡資源，請檢查設定。要修改流動寬頻連線的設定，請從「系統」 >> 「偏"
+"好設定」中，選擇「網絡連線」。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "確認流動寬頻設定"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "未列出的"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "選擇你的計劃(_S)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3075,361 +3085,435 @@ msgstr ""
 "\n"
 "如果你不確定所使用的計劃，請洽詢供應商，以得知計劃的 APN 為何。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "選擇你的計費計劃"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "我的計劃沒有列出…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "供應商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "供應商："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "選擇你的供應商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "國家或地區清單："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "國家或地區"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "我的國家並沒有列出來"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "已安裝的 GSM 裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "已安裝的 CDMA 裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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 "這能幫助你輕易地設定流動寬頻連線，連至手機 (3G) 網絡。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "你需要以下資訊："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "寬頻供應商的名稱"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "寬頻計費計劃的名稱"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "為這個流動寬頻裝置建立連線(_T)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "任何裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "設定流動寬頻連線"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "新的流動寬頻連線"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "有線"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "藍牙"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "第二密碼(_S)："
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "第二密碼(_S)："
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %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-wifi-dialog.c:132 ../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/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "新增…"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "需要密碼或是加密密碼匙來存取 Wi-Fi 網絡「%s」。"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi 網絡連線需要驗證"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 網絡連線需要驗證"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "建立新的 Wi-Fi 網絡"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "新的 Wi-Fi 網絡"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "輸入你要建立的 Wi-Fi 網絡的名稱。"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "連接到隱藏的 Wi-Fi 網絡"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "隱藏的 Wi-Fi 網絡"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "輸入你要連接的隱藏 Wi-Fi 網絡的名稱與安全性詳細資料。"
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "第二密碼(_S)："
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "顯示密碼(_O)"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi 安全性(_S)："
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "連線(_N)："
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi 介面卡(_A)："
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "用法："
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
-msgstr "本程式是 NetworkManager（https://wiki.gnome.org/Projects/NetworkManager/）的元件"
+msgstr ""
+"本程式是 NetworkManager（https://wiki.gnome.org/Projects/NetworkManager/）的"
+"元件"
 
-#: ../src/main.c:76
+#: ../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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "未啟用"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "未註冊"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "家用網絡（%s）"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "家用網絡"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "搜尋中"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "註冊被拒"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s（漫遊）"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "漫遊網絡（%s）"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "漫遊網絡"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "SIM 卡「%s」在「%s」的 PIN 碼"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "需要 PIN 碼"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "這個流動寬頻裝置需要 PIN 碼"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "流動寬頻連線「%s」在使用中：(%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "漫遊"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s 連線"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "只儲存這個使用者的密碼(_U)"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "儲存所有使用者的密碼(_A)"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 證書 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "選擇一個 PAC 檔案…"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "所有檔案"
 
@@ -3465,15 +3549,32 @@ msgstr "內部驗證(_I)："
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "選擇證書授權單位 (CA) 證書…"
 
@@ -3501,15 +3602,46 @@ msgstr "不需要 CA 證書(_R)"
 msgid "PEAP _version:"
 msgstr "PEAP 版本(_V)："
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "每次都詢問密碼(_K)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A 證書："
+
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私密密碼匙是不安全的"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3517,15 +3649,16 @@ msgid ""
 "\n"
 "(You can password-protect your private key with openssl)"
 msgstr ""
-"所選擇的私密密碼匙似乎沒有密碼保護。 這可能會導致不安全的後果。請選擇用密碼保護的私密密碼匙。\n"
+"所選擇的私密密碼匙似乎沒有密碼保護。 這可能會導致不安全的後果。請選擇用密碼保"
+"護的私密密碼匙。\n"
 "\n"
 "（你可以使用 openssl 來加密你的私密密碼匙）"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "選擇你的個人證書…"
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "選擇你的私密密碼匙…"
 
@@ -3545,23 +3678,36 @@ msgstr "私密密碼匙(_K)："
 msgid "_Private key password:"
 msgstr "私密密碼匙密碼(_P)："
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "快"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "穿隧式 TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "保護式 EAP (PEAP)"
 
@@ -3571,6 +3717,44 @@ msgstr "保護式 EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "驗證(_E)："
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (預設值)"
@@ -3595,6 +3779,287 @@ msgstr "顯示密碼匙(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP 索引(_X)："
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "類型(_T)："
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "啟用 WiMA_X 流動寬頻"
+
+#~ msgid "_Help"
+#~ msgstr "求助(_H)"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "你現在已連線至繫結的網絡。"
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "正在準備繫結的連線「%s」…"
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "正在設定繫結的連線「%s」…"
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "繫結的連線「%s」需要使用者驗證…"
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "正在要求「%s」的網絡位址…"
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "繫結的連線「%s」在使用中"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "你現在已連線至橋接的網絡。"
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "正在準備橋接的網絡連線「%s」…"
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "正在設定橋接的網絡連線「%s」…"
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "橋接的連線「%s」需要使用者驗證…"
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "橋接的連線「%s」在使用中"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "新的流動寬頻 (CDMA) 連線…"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "你現在已連線至 CDMA 網絡。"
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA 網絡。"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "新的流動寬頻 (GSM) 連線…"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "你現在已連線至 GSM 網絡。"
+
+#~ msgid "GSM network."
+#~ msgstr "GSM 網絡。"
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "自動 InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand 網絡 (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand 網絡 (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand 網絡"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand 網絡"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "你現在已連線至 InfiniBand 網絡。"
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "正在準備 InfiniBand 連線「%s」…"
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "正在設定 InfiniBand 連線「%s」…"
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand 連線「%s」需要使用者驗證…"
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand 連線「%s」在使用中"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "你現在已連線至隊伍網絡。"
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "正在準備隊伍的網絡連線「%s」…"
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "正在設定隊伍的網絡連線「%s」…"
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "隊伍連線「%s」需要使用者驗證…"
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "隊伍連線「%s」在使用中"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "你現在已連線至 VLAN 網絡。"
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "正在啟動 VLAN 連線「%s」…"
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "正在啟動 VLAN 連線「%s」…"
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "VLAN 連線「%s」需要使用者驗證…"
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN 連線「%s」在使用中"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX 流動寬頻 (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX 流動寬頻"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX 已停用"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX 已被硬件開關停用"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "你現在已連線至 WiMAX 網絡。"
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "不明"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "不明"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR："
+
+#~ msgid "BSID:"
+#~ msgstr "BSID："
+
+#~ msgid "_Mode:"
+#~ msgstr "模式(_M)："
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "裝置的 MAC 位址(_D)："
+
+#~ msgid "Any"
+#~ msgstr "任何"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "偏好 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "偏好 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "偏好 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "只使用 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "從檔案匯入隊伍組態(_M)…"
+
+#~ msgid "Infrastructure"
+#~ msgstr "基礎架構"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "儲存連線時錯誤"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "屬性「%s」/「%s」是無效的：%d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "自動 (PPP)"
+
+#~ 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)."
+#~ msgstr "無法進行藍牙的配置（無法連至 D-Bus：(%s) %s）。"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "無法進行藍牙的配置（找不到 NetworkManager：(%s) %s）。"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "使用手機作為網絡裝置（PAN/NAP）"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "使用手機存取互聯網（DUN）"
+
+#~ msgid "Error: %s"
+#~ msgstr "錯誤：%s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "無法建立 DUN 連線：%s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "你的電話現在已經可以使用！"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "行動精靈已經取消"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "不明的電話裝置類型（非 GSM 或 CDMA）"
+
+#~ msgid "unknown modem type."
+#~ msgstr "不明的數據機類型。"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "無法連線至電話。"
+
+#~ msgid "error getting bus connection"
+#~ msgstr "取得匯流排連線時發生錯誤"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "電話無預期離線。"
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "在時間內偵測不到電話的詳細資料。"
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "偵測電話的配置…"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr "預設的藍牙配接卡必須在設定撥號網絡連線前啟用。"
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "無法建立 PAN 連線：%s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s 網絡"
+
 #~ msgid "Primary DNS:"
 #~ msgstr "主要 DNS："
 
@@ -3700,9 +4165,6 @@ msgstr "WEP 索引(_X)："
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "不知道如何編輯「%s」連線"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "找不到藍牙裝置。"
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "無法進行藍牙的配置（無法建立 D-Bus proxy）。"
 
@@ -3730,12 +4192,6 @@ msgstr "WEP 索引(_X)："
 #~ msgid "Wired network"
 #~ msgstr "有線網路"
 
-#~ msgid "ad-hoc"
-#~ msgstr "ad-hoc"
-
-#~ msgid "secure."
-#~ msgstr "安全。"
-
 #~ msgid "WiMAX network"
 #~ msgstr "WiMAX 網路"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9b4a8745..a522b363 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,9 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-manager-applet 0.9.8\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n"
-"POT-Creation-Date: 2014-08-25 22:06+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-04-05 14:02+0200\n"
 "PO-Revision-Date: 2014-08-26 06:54+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese <zh-l10n@lists.linux.org.tw>\n"
@@ -25,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.6.5\n"
 
-#: ../nm-applet.desktop.in.h:1
+#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105
 msgid "Network"
 msgstr "網路"
 
@@ -119,46 +118,89 @@ msgid ""
 "authentication."
 msgstr "將這設為 True，以停用在 EAP 認證第二階段中關於 CA 證書的警告。"
 
-#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:105
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1
+#, fuzzy
+msgid "NetworkManager"
+msgstr "NetworkManager 面板程式"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2
+#, fuzzy
+msgid "NetworkManager for GNOME"
+msgstr "NetworkManager 面板程式"
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3
+msgid ""
+"NetworkManager is a system service for managing and configuring your network "
+"connections and devices."
+msgstr ""
+
+#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4
+msgid ""
+"The nm-connection-editor program works with NetworkManager to create and "
+"edit existing connection profiles for NetworkManager."
+msgstr ""
+
+#: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99
 msgid "802.1X authentication"
 msgstr "802.1X 驗證"
 
-#: ../src/8021x.ui.h:2 ../src/connection-editor/ce-page-wimax.ui.h:2
-#: ../src/libnm-gtk/wifi.ui.h:3
+#: ../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
+msgid "_Cancel"
+msgstr ""
+
+#: ../src/8021x.ui.h:3
+msgid "C_onnect"
+msgstr "連線(_O)"
+
+#: ../src/8021x.ui.h:4 ../src/libnma/wifi.ui.h:3 ../src/libnm-gtk/wifi.ui.h:3
 msgid "_Network name:"
 msgstr "網路名稱(_N)："
 
-#: ../src/applet.c:574
+#: ../src/ap-menu-item.c:82
+msgid "ad-hoc"
+msgstr "ad-hoc"
+
+#: ../src/ap-menu-item.c:87
+msgid "secure."
+msgstr "安全。"
+
+#: ../src/applet.c:345
 msgid "Failed to add/activate connection"
 msgstr "無法加入/使用連線"
 
-#: ../src/applet.c:576 ../src/applet.c:620 ../src/applet.c:646
-#: ../src/applet-device-wifi.c:1328 ../src/applet-device-wifi.c:1347
+#: ../src/applet.c:347 ../src/applet.c:401 ../src/applet.c:436
+#: ../src/applet-device-wifi.c:1444 ../src/applet-device-wifi.c:1467
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../src/applet.c:579 ../src/applet.c:649 ../src/applet-device-wifi.c:1331
-#: ../src/applet-device-wifi.c:1350
+#: ../src/applet.c:350 ../src/applet.c:439 ../src/applet-device-wifi.c:1447
+#: ../src/applet-device-wifi.c:1470
 msgid "Connection failure"
 msgstr "連線失敗"
 
-#: ../src/applet.c:618
+#: ../src/applet.c:399
 msgid "Device disconnect failed"
 msgstr "裝置斷線失敗"
 
-#: ../src/applet.c:623
+#: ../src/applet.c:404
 msgid "Disconnect failure"
 msgstr "斷線失敗"
 
-#: ../src/applet.c:644
+#: ../src/applet.c:434
 msgid "Connection activation failed"
 msgstr "連線生效失敗"
 
-#: ../src/applet.c:957 ../src/applet-device-wifi.c:1046
+#: ../src/applet.c:757 ../src/applet-device-wifi.c:1184
 msgid "Don't show this message again"
 msgstr "不要再顯示這個訊息"
 
-#: ../src/applet.c:1046
+#: ../src/applet.c:844
 #, c-format
 msgid ""
 "\n"
@@ -168,7 +210,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為網路連線被中斷了。"
 
-#: ../src/applet.c:1049
+#: ../src/applet.c:847
 #, c-format
 msgid ""
 "\n"
@@ -177,7 +219,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務意外的停止了。"
 
-#: ../src/applet.c:1052
+#: ../src/applet.c:850
 #, c-format
 msgid ""
 "\n"
@@ -187,7 +229,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務傳回無效的組態。"
 
-#: ../src/applet.c:1055
+#: ../src/applet.c:853
 #, c-format
 msgid ""
 "\n"
@@ -196,7 +238,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為連線的嘗試已逾時。"
 
-#: ../src/applet.c:1058
+#: ../src/applet.c:856
 #, c-format
 msgid ""
 "\n"
@@ -205,7 +247,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務沒有及時啟動。"
 
-#: ../src/applet.c:1061
+#: ../src/applet.c:859
 #, c-format
 msgid ""
 "\n"
@@ -214,7 +256,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務啟動失敗。"
 
-#: ../src/applet.c:1064
+#: ../src/applet.c:862
 #, c-format
 msgid ""
 "\n"
@@ -223,7 +265,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為沒有有效的 VPN 服務。"
 
-#: ../src/applet.c:1067
+#: ../src/applet.c:865
 #, c-format
 msgid ""
 "\n"
@@ -232,7 +274,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為無效的 VPN 機密。"
 
-#: ../src/applet.c:1074
+#: ../src/applet.c:872
 #, c-format
 msgid ""
 "\n"
@@ -241,7 +283,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗。"
 
-#: ../src/applet.c:1092
+#: ../src/applet.c:888
 #, c-format
 msgid ""
 "\n"
@@ -251,7 +293,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為網路連線中斷了。"
 
-#: ../src/applet.c:1095
+#: ../src/applet.c:891
 #, c-format
 msgid ""
 "\n"
@@ -260,7 +302,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」失敗，因為 VPN 服務已停止。"
 
-#: ../src/applet.c:1101
+#: ../src/applet.c:897
 #, c-format
 msgid ""
 "\n"
@@ -269,7 +311,7 @@ msgstr ""
 "\n"
 "VPN 連線「%s」已斷線。"
 
-#: ../src/applet.c:1131
+#: ../src/applet.c:927
 #, c-format
 msgid ""
 "VPN connection has been successfully established.\n"
@@ -279,19 +321,19 @@ msgstr ""
 "VPN 連線已成功的。\n"
 "%s\n"
 
-#: ../src/applet.c:1133
+#: ../src/applet.c:929
 msgid "VPN connection has been successfully established.\n"
 msgstr "VPN 連線已成功的。\n"
 
-#: ../src/applet.c:1135
+#: ../src/applet.c:931
 msgid "VPN Login Message"
 msgstr "VPN 登錄訊息"
 
-#: ../src/applet.c:1141 ../src/applet.c:1149 ../src/applet.c:1199
+#: ../src/applet.c:937 ../src/applet.c:945 ../src/applet.c:986
 msgid "VPN Connection Failed"
 msgstr "VPN 連線失敗"
 
-#: ../src/applet.c:1206
+#: ../src/applet.c:990
 #, c-format
 msgid ""
 "\n"
@@ -304,7 +346,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1209
+#: ../src/applet.c:993
 #, c-format
 msgid ""
 "\n"
@@ -317,798 +359,544 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/applet.c:1533
+#: ../src/applet.c:1280
 msgid "device not ready (firmware missing)"
 msgstr "裝置尚未就緒 (缺少韌體)"
 
-#: ../src/applet.c:1535
+#: ../src/applet.c:1282
 msgid "device not ready"
 msgstr "裝置尚未就緒"
 
 #. Notify user of unmanaged or unavailable device
-#: ../src/applet.c:1545 ../src/applet-device-ethernet.c:123
-#: ../src/applet-device-infiniband.c:119 ../src/applet-device-vlan.c:181
+#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109
 msgid "disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:1561
+#: ../src/applet.c:1308
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../src/applet.c:1575
+#: ../src/applet.c:1322
 msgid "device not managed"
 msgstr "裝置無法管理"
 
-#: ../src/applet.c:1735
+#: ../src/applet.c:1395
 msgid "No network devices available"
 msgstr "沒有可用的網路裝置"
 
-#: ../src/applet.c:1788
+#: ../src/applet.c:1449
 msgid "_VPN Connections"
 msgstr "_VPN 連線"
 
-#: ../src/applet.c:1845
+#: ../src/applet.c:1503
 msgid "_Configure VPN..."
 msgstr "設置 VPN(_C)…"
 
-#: ../src/applet.c:1849
+#: ../src/applet.c:1508
 msgid "_Disconnect VPN"
 msgstr "與 VPN 斷線(_D)"
 
-#: ../src/applet.c:1965
+#: ../src/applet.c:1615
 msgid "NetworkManager is not running..."
 msgstr "NetworkManager 沒有執行…."
 
-#: ../src/applet.c:1970 ../src/applet.c:2948
+#: ../src/applet.c:1620 ../src/applet.c:2612
 msgid "Networking disabled"
 msgstr "網路已停用"
 
 #. 'Enable Networking' item
-#: ../src/applet.c:2190
+#: ../src/applet.c:1830
 msgid "Enable _Networking"
 msgstr "啟用網路(_N)"
 
 #. 'Enable Wi-Fi' item
-#: ../src/applet.c:2199
+#: ../src/applet.c:1839
 msgid "Enable _Wi-Fi"
 msgstr "啟用 _Wi-Fi"
 
 #. 'Enable Mobile Broadband' item
-#: ../src/applet.c:2208
+#: ../src/applet.c:1848
 msgid "Enable _Mobile Broadband"
 msgstr "啟用行動寬頻(_M)"
 
-#. 'Enable WiMAX Mobile Broadband' item
-#: ../src/applet.c:2217
-msgid "Enable WiMA_X Mobile Broadband"
-msgstr "啟用 WiMA_X 行動寬頻"
-
 #. Toggle notifications item
-#: ../src/applet.c:2228
+#: ../src/applet.c:1860
 msgid "Enable N_otifications"
 msgstr "啟用通知功能(_O)"
 
 #. 'Connection Information' item
-#: ../src/applet.c:2239
+#: ../src/applet.c:1872
 msgid "Connection _Information"
 msgstr "連線資訊(_I)"
 
 #. 'Edit Connections...' item
-#: ../src/applet.c:2249
+#: ../src/applet.c:1880
 msgid "Edit Connections..."
 msgstr "編輯連線…"
 
-#. Help item
-#: ../src/applet.c:2263
-msgid "_Help"
-msgstr "求助(_H)"
-
-#. About item
-#: ../src/applet.c:2272
+#: ../src/applet.c:1894
 msgid "_About"
 msgstr "關於(_A)"
 
-#: ../src/applet.c:2525
+#: ../src/applet.c:2179
 #, c-format
 msgid "You are now connected to '%s'."
 msgstr "您現在已連線至「%s」。"
 
-#: ../src/applet.c:2566
+#: ../src/applet.c:2222
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: ../src/applet.c:2567
+#: ../src/applet.c:2223
 msgid "The network connection has been disconnected."
 msgstr "網路連線已中斷。"
 
-#: ../src/applet.c:2810
+#: ../src/applet.c:2474
 #, c-format
 msgid "Preparing network connection '%s'..."
 msgstr "正在準備網路連線「%s」…"
 
-#: ../src/applet.c:2813
+#: ../src/applet.c:2477
 #, c-format
 msgid "User authentication required for network connection '%s'..."
 msgstr "網路連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2816 ../src/applet-device-bt.c:136
-#: ../src/applet-device-wimax.c:445 ../src/mobile-helpers.c:591
+#: ../src/applet.c:2480 ../src/applet-device-bt.c:125
+#: ../src/mobile-helpers.c:608
 #, c-format
 msgid "Requesting a network address for '%s'..."
 msgstr "正在要求提供「%s」的網路位址…"
 
-#: ../src/applet.c:2819
+#: ../src/applet.c:2483
 #, c-format
 msgid "Network connection '%s' active"
 msgstr "網路連線「%s」在使用中"
 
-#: ../src/applet.c:2902
+#: ../src/applet.c:2557
 #, c-format
 msgid "Starting VPN connection '%s'..."
 msgstr "正在啟動 VPN 連線「%s」…"
 
-#: ../src/applet.c:2905
+#: ../src/applet.c:2560
 #, c-format
 msgid "User authentication required for VPN connection '%s'..."
 msgstr "VPN 連線「%s」需要使用者驗證…"
 
-#: ../src/applet.c:2908
+#: ../src/applet.c:2563
 #, c-format
 msgid "Requesting a VPN address for '%s'..."
 msgstr "正在要求 VPN 提供「%s」的網路位址…"
 
-#: ../src/applet.c:2911
+#: ../src/applet.c:2566
 #, c-format
 msgid "VPN connection '%s' active"
 msgstr "VPN 連線「%s」在使用中"
 
-#: ../src/applet.c:2953
+#: ../src/applet.c:2616
 msgid "No network connection"
 msgstr "沒有網路連接"
 
-#: ../src/applet.c:3628
+#: ../src/applet.c:3204
 msgid "NetworkManager Applet"
 msgstr "NetworkManager 面板程式"
 
-#: ../src/applet-device-bond.c:76 ../src/applet-device-bridge.c:76
-#: ../src/applet-device-broadband.c:770 ../src/applet-device-bt.c:90
-#: ../src/applet-device-cdma.c:301 ../src/applet-device-ethernet.c:131
-#: ../src/applet-device-gsm.c:357 ../src/applet-device-infiniband.c:127
-#: ../src/applet-device-team.c:72 ../src/applet-device-vlan.c:190
-#: ../src/applet-device-wifi.c:837 ../src/applet-device-wimax.c:276
-msgid "Available"
-msgstr "可用"
-
-#: ../src/applet-device-bond.c:89 ../src/applet-device-bridge.c:89
-#: ../src/applet-device-broadband.c:797 ../src/applet-device-bt.c:102
-#: ../src/applet-device-cdma.c:340 ../src/applet-device-ethernet.c:146
-#: ../src/applet-device-gsm.c:396 ../src/applet-device-infiniband.c:142
-#: ../src/applet-device-team.c:85 ../src/applet-device-vlan.c:203
-#: ../src/applet-device-wifi.c:1243 ../src/applet-device-wimax.c:401
-msgid "Connection Established"
-msgstr "已建立連線"
-
-#: ../src/applet-device-bond.c:90
-msgid "You are now connected to the bonded network."
-msgstr "您現在已連線至繫結的網路。"
-
-#: ../src/applet-device-bond.c:114
-#, c-format
-msgid "Preparing bond connection '%s'..."
-msgstr "正在準備繫結的連線「%s」…"
-
-#: ../src/applet-device-bond.c:117
-#, c-format
-msgid "Configuring bond connection '%s'..."
-msgstr "正在設定繫結的連線「%s」…"
-
-#: ../src/applet-device-bond.c:120
-#, c-format
-msgid "User authentication required for bond connection '%s'..."
-msgstr "繫結的連線「%s」需要使用者驗證…"
-
-#: ../src/applet-device-bond.c:123 ../src/applet-device-bridge.c:123
-#: ../src/applet-device-infiniband.c:176 ../src/applet-device-team.c:119
-#: ../src/applet-device-vlan.c:237
-#, c-format
-msgid "Requesting address for '%s'..."
-msgstr "正在要求「%s」的網路位址…"
-
-#: ../src/applet-device-bond.c:127
-#, c-format
-msgid "Bond connection '%s' active"
-msgstr "繫結的連線「%s」在使用中"
-
-#: ../src/applet-device-bridge.c:90
-msgid "You are now connected to the bridged network."
-msgstr "您現在已連線至橋接的網路。"
-
-#: ../src/applet-device-bridge.c:114
-#, c-format
-msgid "Preparing bridge connection '%s'..."
-msgstr "正在準備橋接的網路連線「%s」…"
-
-#: ../src/applet-device-bridge.c:117
-#, c-format
-msgid "Configuring bridge connection '%s'..."
-msgstr "正在設定橋接的網路連線「%s」…"
-
-#: ../src/applet-device-bridge.c:120
-#, c-format
-msgid "User authentication required for bridge connection '%s'..."
-msgstr "橋接的連線「%s」需要使用者驗證…"
-
-#: ../src/applet-device-bridge.c:127
-#, c-format
-msgid "Bridge connection '%s' active"
-msgstr "橋接的連線「%s」在使用中"
-
-#: ../src/applet-device-broadband.c:164 ../src/applet-device-gsm.c:505
+#: ../src/applet-device-broadband.c:159
 msgid "Wrong PUK code; please contact your provider."
 msgstr "PUK 碼錯誤，請聯絡您的供應商。"
 
-#: ../src/applet-device-broadband.c:206 ../src/applet-device-gsm.c:482
+#: ../src/applet-device-broadband.c:201
 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:257 ../src/applet-device-gsm.c:532
+#: ../src/applet-device-broadband.c:252
 msgid "Sending unlock code..."
 msgstr "發送解鎖用的密碼…"
 
-#: ../src/applet-device-broadband.c:716 ../src/applet-device-cdma.c:247
-#: ../src/applet-device-gsm.c:303 ../src/applet-dialogs.c:544
+#: ../src/applet-device-broadband.c:734 ../src/applet-dialogs.c:506
 #, c-format
 msgid "Mobile Broadband (%s)"
 msgstr "行動寬頻 (%s)"
 
-#: ../src/applet-device-broadband.c:718 ../src/applet-device-cdma.c:249
-#: ../src/applet-device-gsm.c:305
-#: ../src/connection-editor/new-connection.c:114
-#: ../src/connection-editor/page-mobile.c:351
-#: ../src/libnm-gtk/nm-ui-utils.c:333
+#: ../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
 msgid "Mobile Broadband"
 msgstr "行動寬頻"
 
+#: ../src/applet-device-broadband.c:788 ../src/applet-device-bt.c:75
+#: ../src/applet-device-ethernet.c:117 ../src/applet-device-wifi.c:969
+msgid "Available"
+msgstr "可用"
+
 #. Default connection item
-#: ../src/applet-device-broadband.c:783
+#: ../src/applet-device-broadband.c:801
 msgid "New Mobile Broadband connection..."
 msgstr "新的行動寬頻連線…"
 
-#: ../src/applet-device-broadband.c:798
+#: ../src/applet-device-broadband.c:815 ../src/applet-device-bt.c:87
+#: ../src/applet-device-ethernet.c:132 ../src/applet-device-wifi.c:1365
+msgid "Connection Established"
+msgstr "已建立連線"
+
+#: ../src/applet-device-broadband.c:816
 msgid "You are now connected to the Mobile Broadband network."
 msgstr "您現在已連線至行動寬頻網路。"
 
-#: ../src/applet-device-broadband.c:933 ../src/applet-device-broadband.c:939
+#: ../src/applet-device-broadband.c:956 ../src/applet-device-broadband.c:962
 msgid "Mobile Broadband network."
 msgstr "行動寬頻網路。"
 
-#: ../src/applet-device-broadband.c:934 ../src/applet-device-cdma.c:403
-#: ../src/applet-device-gsm.c:662
+#: ../src/applet-device-broadband.c:957
 msgid "You are now registered on the home network."
 msgstr "您現在已註冊至家用網路。"
 
-#: ../src/applet-device-broadband.c:940 ../src/applet-device-cdma.c:409
-#: ../src/applet-device-gsm.c:668
+#: ../src/applet-device-broadband.c:963
 msgid "You are now registered on a roaming network."
 msgstr "您現在已註冊至漫遊網路。"
 
-#: ../src/applet-device-bt.c:103
+#: ../src/applet-device-bt.c:88
 msgid "You are now connected to the mobile broadband network."
 msgstr "您現在已連線至行動寬頻網路。"
 
-#: ../src/applet-device-bt.c:127 ../src/applet-device-wimax.c:436
-#: ../src/mobile-helpers.c:582
+#: ../src/applet-device-bt.c:116 ../src/mobile-helpers.c:599
 #, c-format
 msgid "Preparing mobile broadband connection '%s'..."
 msgstr "正在準備行動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:130 ../src/applet-device-wimax.c:439
-#: ../src/mobile-helpers.c:585
+#: ../src/applet-device-bt.c:119 ../src/mobile-helpers.c:602
 #, c-format
 msgid "Configuring mobile broadband connection '%s'..."
 msgstr "正在設定行動寬頻連線「%s」…"
 
-#: ../src/applet-device-bt.c:133 ../src/applet-device-wimax.c:442
-#: ../src/mobile-helpers.c:588
+#: ../src/applet-device-bt.c:122 ../src/mobile-helpers.c:605
 #, c-format
 msgid "User authentication required for mobile broadband connection '%s'..."
 msgstr "行動寬頻連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-bt.c:140 ../src/mobile-helpers.c:608
+#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624
 #, c-format
 msgid "Mobile broadband connection '%s' active"
 msgstr "行動寬頻連線「%s」在使用中"
 
-#. Default connection item
-#: ../src/applet-device-cdma.c:314
-msgid "New Mobile Broadband (CDMA) connection..."
-msgstr "新的行動寬頻 (CDMA) 連線…"
-
-#: ../src/applet-device-cdma.c:341
-msgid "You are now connected to the CDMA network."
-msgstr "您現在已連線至 CDMA 網路。"
-
-#: ../src/applet-device-cdma.c:402 ../src/applet-device-cdma.c:408
-msgid "CDMA network."
-msgstr "CDMA 網路。"
-
-#: ../src/applet-device-ethernet.c:44
+#: ../src/applet-device-ethernet.c:30
 msgid "Auto Ethernet"
 msgstr "自動乙太網路"
 
-#: ../src/applet-device-ethernet.c:96
+#: ../src/applet-device-ethernet.c:82
 #, c-format
 msgid "Ethernet Networks (%s)"
 msgstr "有線網路 (%s)"
 
-#: ../src/applet-device-ethernet.c:98
+#: ../src/applet-device-ethernet.c:84
 #, c-format
 msgid "Ethernet Network (%s)"
 msgstr "有線網路 (%s)"
 
-#: ../src/applet-device-ethernet.c:101
+#: ../src/applet-device-ethernet.c:87
 msgid "Ethernet Networks"
 msgstr "有線網路"
 
-#: ../src/applet-device-ethernet.c:103
+#: ../src/applet-device-ethernet.c:89
 msgid "Ethernet Network"
 msgstr "有線網路"
 
-#: ../src/applet-device-ethernet.c:147
+#: ../src/applet-device-ethernet.c:133
 msgid "You are now connected to the ethernet network."
 msgstr "您現在已連線至有線網路。"
 
-#: ../src/applet-device-ethernet.c:171
+#: ../src/applet-device-ethernet.c:161
 #, c-format
 msgid "Preparing ethernet network connection '%s'..."
 msgstr "正在準備有線網路連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:174
+#: ../src/applet-device-ethernet.c:164
 #, c-format
 msgid "Configuring ethernet network connection '%s'..."
 msgstr "正在設定有線網路連線「%s」…"
 
-#: ../src/applet-device-ethernet.c:177
+#: ../src/applet-device-ethernet.c:167
 #, c-format
 msgid "User authentication required for ethernet network connection '%s'..."
 msgstr "有線網路連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-ethernet.c:180
+#: ../src/applet-device-ethernet.c:170
 #, c-format
 msgid "Requesting an ethernet network address for '%s'..."
 msgstr "正要求有線網路「%s」提供網路位址…"
 
-#: ../src/applet-device-ethernet.c:184
+#: ../src/applet-device-ethernet.c:174
 #, c-format
 msgid "Ethernet network connection '%s' active"
 msgstr "有線網路連線「%s」在使用中"
 
-#: ../src/applet-device-ethernet.c:365
+#: ../src/applet-device-ethernet.c:346
 msgid "DSL authentication"
 msgstr "DSL 驗證"
 
-#. Default connection item
-#: ../src/applet-device-gsm.c:370
-msgid "New Mobile Broadband (GSM) connection..."
-msgstr "新的行動寬頻 (GSM) 連線…"
-
-#: ../src/applet-device-gsm.c:397
-msgid "You are now connected to the GSM network."
-msgstr "您現在已連線至 GSM 網路。"
-
-#: ../src/applet-device-gsm.c:661 ../src/applet-device-gsm.c:667
-msgid "GSM network."
-msgstr "GSM 網路。"
-
-#: ../src/applet-device-infiniband.c:40
-msgid "Auto InfiniBand"
-msgstr "自動 InfiniBand"
-
-#: ../src/applet-device-infiniband.c:92
-#, c-format
-msgid "InfiniBand Networks (%s)"
-msgstr "InfiniBand 網路 (%s)"
-
-#: ../src/applet-device-infiniband.c:94
-#, c-format
-msgid "InfiniBand Network (%s)"
-msgstr "InfiniBand 網路 (%s)"
-
-#: ../src/applet-device-infiniband.c:97
-msgid "InfiniBand Networks"
-msgstr "InfiniBand 網路"
-
-#: ../src/applet-device-infiniband.c:99
-msgid "InfiniBand Network"
-msgstr "InfiniBand 網路"
-
-#: ../src/applet-device-infiniband.c:143
-msgid "You are now connected to the InfiniBand network."
-msgstr "您現在已連線至 InfiniBand 網路。"
-
-#: ../src/applet-device-infiniband.c:167
-#, c-format
-msgid "Preparing InfiniBand connection '%s'..."
-msgstr "正在準備 InfiniBand 連線「%s」…"
-
-#: ../src/applet-device-infiniband.c:170
-#, c-format
-msgid "Configuring InfiniBand connection '%s'..."
-msgstr "正在設定 InfiniBand 連線「%s」…"
-
-#: ../src/applet-device-infiniband.c:173
-#, c-format
-msgid "User authentication required for InfiniBand connection '%s'..."
-msgstr "InfiniBand 連線「%s」需要使用者驗證…"
-
-#: ../src/applet-device-infiniband.c:180
-#, c-format
-msgid "InfiniBand connection '%s' active"
-msgstr "InfiniBand 連線「%s」在使用中"
-
-#: ../src/applet-device-team.c:86
-msgid "You are now connected to the teamed network."
-msgstr "您現在已連線至團隊網路。"
-
-#: ../src/applet-device-team.c:110
-#, c-format
-msgid "Preparing team connection '%s'..."
-msgstr "正在準備團隊的網路連線「%s」…"
-
-#: ../src/applet-device-team.c:113
-#, c-format
-msgid "Configuring team connection '%s'..."
-msgstr "正在設定團隊的網路連線「%s」…"
-
-#: ../src/applet-device-team.c:116
-#, c-format
-msgid "User authentication required for team connection '%s'..."
-msgstr "團隊連線「%s」需要使用者驗證…"
-
-#: ../src/applet-device-team.c:123
-#, c-format
-msgid "Team connection '%s' active"
-msgstr "團隊連線「%s」在使用中"
-
-#: ../src/applet-device-vlan.c:204
-msgid "You are now connected to the VLAN."
-msgstr "您現在已連線至 VLAN 網路。"
-
-#: ../src/applet-device-vlan.c:228
-#, c-format
-msgid "Preparing VLAN connection '%s'..."
-msgstr "正在啟動 VLAN 連線「%s」…"
-
-#: ../src/applet-device-vlan.c:231
-#, c-format
-msgid "Configuring VLAN connection '%s'..."
-msgstr "正在啟動 VLAN 連線「%s」…"
-
-#: ../src/applet-device-vlan.c:234
-#, c-format
-msgid "User authentication required for VLAN connection '%s'..."
-msgstr "VLAN 連線「%s」需要使用者驗證…"
-
-#: ../src/applet-device-vlan.c:241
-#, c-format
-msgid "VLAN connection '%s' active"
-msgstr "VLAN 連線「%s」在使用中"
-
-#: ../src/applet-device-wifi.c:96
+#: ../src/applet-device-wifi.c:230
 msgid "_Connect to Hidden Wi-Fi Network..."
 msgstr "連接到隱藏的 Wi-Fi 網路(_C)…"
 
-#: ../src/applet-device-wifi.c:147
+#: ../src/applet-device-wifi.c:281
 msgid "Create _New Wi-Fi Network..."
 msgstr "建立新的 Wi-Fi 網路(_N)…"
 
-#: ../src/applet-device-wifi.c:291
+#: ../src/applet-device-wifi.c:431
 msgid "(none)"
 msgstr "(無)"
 
-#: ../src/applet-device-wifi.c:769
+#: ../src/applet-device-wifi.c:901
 #, c-format
 msgid "Wi-Fi Networks (%s)"
 msgstr "Wi-Fi 網路 (%s)"
 
-#: ../src/applet-device-wifi.c:771
+#: ../src/applet-device-wifi.c:903
 #, c-format
 msgid "Wi-Fi Network (%s)"
 msgstr "Wi-Fi 網路 (%s)"
 
-#: ../src/applet-device-wifi.c:773
+#: ../src/applet-device-wifi.c:905
 msgid "Wi-Fi Network"
 msgid_plural "Wi-Fi Networks"
 msgstr[0] "Wi-Fi 網路"
 
-#: ../src/applet-device-wifi.c:802
+#: ../src/applet-device-wifi.c:934
 msgid "Wi-Fi is disabled"
 msgstr "Wi-Fi 已停用"
 
-#: ../src/applet-device-wifi.c:803
+#: ../src/applet-device-wifi.c:935
 msgid "Wi-Fi is disabled by hardware switch"
 msgstr "Wi-Fi 已被硬體開關停用"
 
-#: ../src/applet-device-wifi.c:864
+#: ../src/applet-device-wifi.c:996
 msgid "More networks"
 msgstr "更多網路"
 
-#: ../src/applet-device-wifi.c:1042
+#: ../src/applet-device-wifi.c:1180
 msgid "Wi-Fi Networks Available"
 msgstr "有 Wi-Fi 網路可用"
 
-#: ../src/applet-device-wifi.c:1043
+#: ../src/applet-device-wifi.c:1181
 msgid "Use the network menu to connect to a Wi-Fi network"
 msgstr "使用網路選單來連線到 Wi-Fi 網路"
 
-#: ../src/applet-device-wifi.c:1242
+#: ../src/applet-device-wifi.c:1364
 #, c-format
 msgid "You are now connected to the Wi-Fi network '%s'."
 msgstr "您現在已連線至 Wi-Fi 網路「%s」。"
 
-#: ../src/applet-device-wifi.c:1273
+#: ../src/applet-device-wifi.c:1399
 #, c-format
 msgid "Preparing Wi-Fi network connection '%s'..."
 msgstr "正在準備 Wi-Fi 網路連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1276
+#: ../src/applet-device-wifi.c:1402
 #, c-format
 msgid "Configuring Wi-Fi network connection '%s'..."
 msgstr "正在設定 Wi-Fi 網路連線「%s」…"
 
-#: ../src/applet-device-wifi.c:1279
+#: ../src/applet-device-wifi.c:1405
 #, c-format
 msgid "User authentication required for Wi-Fi network '%s'..."
 msgstr "Wi-Fi 網路連線「%s」需要使用者驗證…"
 
-#: ../src/applet-device-wifi.c:1282
+#: ../src/applet-device-wifi.c:1408
 #, c-format
 msgid "Requesting a Wi-Fi network address for '%s'..."
 msgstr "正在要求提供「%s」的 Wi-Fi 網路位址…"
 
-#: ../src/applet-device-wifi.c:1303
+#: ../src/applet-device-wifi.c:1419
 #, c-format
 msgid "Wi-Fi network connection '%s' active: %s (%d%%)"
 msgstr "Wi-Fi 網路連線「%s」在使用中： %s (%d%%)"
 
-#: ../src/applet-device-wifi.c:1308
+#: ../src/applet-device-wifi.c:1423
 #, c-format
 msgid "Wi-Fi network connection '%s' active"
 msgstr "Wi-Fi 網路連線「%s」在使用中"
 
-#: ../src/applet-device-wifi.c:1326
+#: ../src/applet-device-wifi.c:1442
 msgid "Failed to activate connection"
 msgstr "無法使用連線"
 
-#: ../src/applet-device-wifi.c:1345
+#: ../src/applet-device-wifi.c:1465
 msgid "Failed to add new connection"
 msgstr "無法加入新連線"
 
-#: ../src/applet-device-wimax.c:228
-#, c-format
-msgid "WiMAX Mobile Broadband (%s)"
-msgstr "WiMAX 行動寬頻 (%s)"
-
-#: ../src/applet-device-wimax.c:230
-msgid "WiMAX Mobile Broadband"
-msgstr "WiMAX 行動寬頻"
-
-#: ../src/applet-device-wimax.c:256
-msgid "WiMAX is disabled"
-msgstr "WiMAX 已停用"
-
-#: ../src/applet-device-wimax.c:257
-msgid "WiMAX is disabled by hardware switch"
-msgstr "WiMAX 已被硬體開關停用"
-
-#: ../src/applet-device-wimax.c:402
-msgid "You are now connected to the WiMAX network."
-msgstr "您現在已連線至 WiMAX 網路。"
-
-#: ../src/applet-device-wimax.c:454 ../src/mobile-helpers.c:603
-#, c-format
-msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
-msgstr "行動寬頻連線「%s」在使用中：(%d%%%s%s)"
-
-#: ../src/applet-device-wimax.c:457 ../src/mobile-helpers.c:606
-msgid "roaming"
-msgstr "漫遊"
-
-#: ../src/applet-dialogs.c:57
+#: ../src/applet-dialogs.c:41
 msgid "Error displaying connection information:"
 msgstr "顯示連線資訊發生錯誤："
 
-#: ../src/applet-dialogs.c:109
-#: ../src/connection-editor/page-wifi-security.c:309
-#: ../src/libnm-gtk/nm-wifi-dialog.c:924
-#: ../src/wireless-security/wireless-security.c:442
+#: ../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
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../src/applet-dialogs.c:111
+#: ../src/applet-dialogs.c:74
 msgid "Dynamic WEP"
 msgstr "動態 WEP"
 
-#: ../src/applet-dialogs.c:113 ../src/applet-dialogs.c:242
-#: ../src/applet-dialogs.c:244
+#: ../src/applet-dialogs.c:76 ../src/applet-dialogs.c:228
+#: ../src/applet-dialogs.c:230
 msgid "WPA/WPA2"
 msgstr "WPA/WPA2"
 
-#: ../src/applet-dialogs.c:240
+#. Create the expander
+#: ../src/applet-dialogs.c:151
+#, fuzzy
+msgid "More addresses"
+msgstr "地址"
+
+#: ../src/applet-dialogs.c:226
 msgid "WEP"
 msgstr "WEP"
 
-#: ../src/applet-dialogs.c:248 ../src/applet-dialogs.c:257
-#: ../src/connection-editor/page-wifi-security.c:261
+#: ../src/applet-dialogs.c:234 ../src/applet-dialogs.c:243
+#: ../src/connection-editor/page-wifi-security.c:283
 msgctxt "Wi-Fi/Ethernet security"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/applet-dialogs.c:274
+#: ../src/applet-dialogs.c:260
 #, c-format
 msgid "%s (default)"
 msgstr "%s (預設值)"
 
-#: ../src/applet-dialogs.c:343 ../src/applet-dialogs.c:604
+#: ../src/applet-dialogs.c:329 ../src/applet-dialogs.c:580
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../src/applet-dialogs.c:345 ../src/applet-dialogs.c:606
+#: ../src/applet-dialogs.c:331 ../src/applet-dialogs.c:582
 msgctxt "Speed"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:358
-#, c-format
-msgid "%d dB"
-msgstr "%d dB"
-
-#: ../src/applet-dialogs.c:360
-msgctxt "WiMAX CINR"
-msgid "unknown"
-msgstr "不明"
-
-#: ../src/applet-dialogs.c:372
-msgctxt "WiMAX Base Station ID"
-msgid "unknown"
-msgstr "不明"
-
 #. Address
-#: ../src/applet-dialogs.c:384 ../src/applet-dialogs.c:440
-msgid "IP Address:"
-msgstr "IP 位址："
-
-#: ../src/applet-dialogs.c:386 ../src/applet-dialogs.c:402
+#: ../src/applet-dialogs.c:346 ../src/applet-dialogs.c:368
 msgctxt "Address"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:400
+#: ../src/applet-dialogs.c:347 ../src/applet-dialogs.c:420
+msgid "IP Address:"
+msgstr "IP 位址："
+
+#: ../src/applet-dialogs.c:369
 msgid "Broadcast Address:"
 msgstr "廣播位址："
 
 #. Prefix
-#: ../src/applet-dialogs.c:409
-msgid "Subnet Mask:"
-msgstr "子網路遮罩："
-
-#: ../src/applet-dialogs.c:411
+#: ../src/applet-dialogs.c:381
 msgctxt "Subnet Mask"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/applet-dialogs.c:419 ../src/applet-dialogs.c:454
-msgid "Default Route:"
-msgstr "預設路由："
+#: ../src/applet-dialogs.c:382
+msgid "Subnet Mask:"
+msgstr "子網路遮罩："
 
-#: ../src/applet-dialogs.c:530
+#: ../src/applet-dialogs.c:492
 #, c-format
 msgid "Ethernet (%s)"
 msgstr "乙太網路 (%s)"
 
-#: ../src/applet-dialogs.c:533
+#: ../src/applet-dialogs.c:495
 #, c-format
 msgid "802.11 WiFi (%s)"
 msgstr "802.11 WiFi (%s)"
 
-#: ../src/applet-dialogs.c:540
+#: ../src/applet-dialogs.c:502
 #, c-format
 msgid "GSM (%s)"
 msgstr "GSM (%s)"
 
-#: ../src/applet-dialogs.c:542
+#: ../src/applet-dialogs.c:504
 #, c-format
 msgid "CDMA (%s)"
 msgstr "CDMA (%s)"
 
-#: ../src/applet-dialogs.c:546
-#, c-format
-msgid "WiMAX (%s)"
-msgstr "WiMAX (%s)"
-
 #. --- General ---
-#: ../src/applet-dialogs.c:552 ../src/applet-dialogs.c:809
-#: ../src/connection-editor/page-general.c:327
+#: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810
+#: ../src/connection-editor/page-general.c:347
 msgid "General"
 msgstr "一般"
 
-#: ../src/applet-dialogs.c:556
+#: ../src/applet-dialogs.c:516
 msgid "Interface:"
 msgstr "介面："
 
-#: ../src/applet-dialogs.c:572
+#: ../src/applet-dialogs.c:536
 msgid "Hardware Address:"
 msgstr "硬體位址："
 
 #. Driver
-#: ../src/applet-dialogs.c:580
+#: ../src/applet-dialogs.c:550
 msgid "Driver:"
 msgstr "驅動程式："
 
-#: ../src/applet-dialogs.c:609
+#: ../src/applet-dialogs.c:585
 msgid "Speed:"
 msgstr "速度："
 
-#: ../src/applet-dialogs.c:619
+#: ../src/applet-dialogs.c:600
 msgid "Security:"
 msgstr "安全性："
 
-#: ../src/applet-dialogs.c:632
-msgid "CINR:"
-msgstr "CINR："
-
-#: ../src/applet-dialogs.c:645
-msgid "BSID:"
-msgstr "BSID："
-
 #. --- IPv4 ---
-#: ../src/applet-dialogs.c:662 ../src/applet-dialogs.c:850
+#: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851
 msgid "IPv4"
 msgstr "IPv4"
 
+#: ../src/applet-dialogs.c:638 ../src/applet-dialogs.c:689
+msgid "Default Route:"
+msgstr "預設路由："
+
 #. --- IPv6 ---
-#: ../src/applet-dialogs.c:682 ../src/applet-dialogs.c:872
+#: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873
 msgid "IPv6"
 msgstr "IPv6"
 
-#: ../src/applet-dialogs.c:691 ../src/applet-dialogs.c:881
+#: ../src/applet-dialogs.c:667 ../src/applet-dialogs.c:882
 msgid "Ignored"
 msgstr "已忽略"
 
-#: ../src/applet-dialogs.c:814
+#: ../src/applet-dialogs.c:815
 msgid "VPN Type:"
 msgstr "VPN 類型："
 
-#: ../src/applet-dialogs.c:821
+#: ../src/applet-dialogs.c:822
 msgid "VPN Gateway:"
 msgstr "VPN 閘道器："
 
-#: ../src/applet-dialogs.c:827
+#: ../src/applet-dialogs.c:828
 msgid "VPN Username:"
 msgstr "VPN 使用者名稱："
 
-#: ../src/applet-dialogs.c:833
+#: ../src/applet-dialogs.c:834
 msgid "VPN Banner:"
 msgstr "VPN 旗幟："
 
-#: ../src/applet-dialogs.c:839
+#: ../src/applet-dialogs.c:840
 msgid "Base Connection:"
 msgstr "基礎連線："
 
-#: ../src/applet-dialogs.c:841 ../src/libnm-gtk/nm-ui-utils.c:347
+#: ../src/applet-dialogs.c:842 ../src/libnm-gtk/nm-ui-utils.c:343
 msgid "Unknown"
 msgstr "不明"
 
 #. Shouldn't really happen but ...
-#: ../src/applet-dialogs.c:956
+#: ../src/applet-dialogs.c:957
 msgid "No valid active connections found!"
 msgstr "找不到有效的使用中連線！"
 
-#: ../src/applet-dialogs.c:984
+#: ../src/applet-dialogs.c:985
+#, fuzzy
 msgid ""
-"Copyright © 2004-2011 Red Hat, Inc.\n"
+"Copyright © 2004-2014 Red Hat, Inc.\n"
 "Copyright © 2005-2008 Novell, Inc.\n"
 "and many other community contributors and translators"
 msgstr ""
@@ -1116,42 +904,42 @@ msgstr ""
 "Copyright © 2005-2008 Novell, Inc.\n"
 "與許多其他社群貢獻者與翻譯者"
 
-#: ../src/applet-dialogs.c:987
+#: ../src/applet-dialogs.c:988
 msgid ""
 "Notification area applet for managing your network devices and connections."
 msgstr "用來管理您的網路裝置與連線的通知區面板程式。"
 
-#: ../src/applet-dialogs.c:989
+#: ../src/applet-dialogs.c:990
 msgid "NetworkManager Website"
 msgstr "NetworkManager 網站"
 
-#: ../src/applet-dialogs.c:1004
+#: ../src/applet-dialogs.c:1005
 msgid "Missing resources"
 msgstr "遺失資源"
 
-#: ../src/applet-dialogs.c:1029
+#: ../src/applet-dialogs.c:1030
 msgid "Mobile broadband network password"
 msgstr "行動寬頻網路密碼"
 
-#: ../src/applet-dialogs.c:1038
+#: ../src/applet-dialogs.c:1039
 #, c-format
 msgid "A password is required to connect to '%s'."
 msgstr "連線至「%s」需要密碼。"
 
-#: ../src/applet-dialogs.c:1053
+#: ../src/applet-dialogs.c:1054
 msgid "Password:"
 msgstr "密碼："
 
-#: ../src/applet-dialogs.c:1334
+#: ../src/applet-dialogs.c:1336
 msgid "SIM PIN unlock required"
 msgstr "需要解鎖 SIM PIN 碼"
 
-#: ../src/applet-dialogs.c:1335
+#: ../src/applet-dialogs.c:1337
 msgid "SIM PIN Unlock Required"
 msgstr "需要解鎖 SIM PIN 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PIN
-#: ../src/applet-dialogs.c:1337
+#: ../src/applet-dialogs.c:1339
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PIN code before it can be "
@@ -1159,25 +947,25 @@ msgid ""
 msgstr "要使用行動寬頻裝置「%s」之前，需要 SIM PIN 碼。"
 
 #. Translators: PIN code entry label
-#: ../src/applet-dialogs.c:1339
+#: ../src/applet-dialogs.c:1341
 msgid "PIN code:"
 msgstr "PIN 碼："
 
 #. Translators: Show/obscure PIN checkbox label
-#: ../src/applet-dialogs.c:1343
+#: ../src/applet-dialogs.c:1345
 msgid "Show PIN code"
 msgstr "顯示 PIN 碼"
 
-#: ../src/applet-dialogs.c:1345
+#: ../src/applet-dialogs.c:1347
 msgid "SIM PUK unlock required"
 msgstr "需要解鎖 SIM PUK 碼"
 
-#: ../src/applet-dialogs.c:1346
+#: ../src/applet-dialogs.c:1348
 msgid "SIM PUK Unlock Required"
 msgstr "需要解鎖 SIM PUK 碼"
 
 #. FIXME: some warning about # of times you can enter incorrect PUK
-#: ../src/applet-dialogs.c:1348
+#: ../src/applet-dialogs.c:1350
 #, c-format
 msgid ""
 "The mobile broadband device '%s' requires a SIM PUK code before it can be "
@@ -1185,27 +973,34 @@ msgid ""
 msgstr "要使用行動寬頻裝置「%s」之前，需要 SIM PUK 碼。"
 
 #. Translators: PUK code entry label
-#: ../src/applet-dialogs.c:1350
+#: ../src/applet-dialogs.c:1352
 msgid "PUK code:"
 msgstr "PUK 碼："
 
 #. Translators: New PIN entry label
-#: ../src/applet-dialogs.c:1353
+#: ../src/applet-dialogs.c:1355
 msgid "New PIN code:"
 msgstr "新的 PIN 碼："
 
 #. Translators: New PIN verification entry label
-#: ../src/applet-dialogs.c:1355
+#: ../src/applet-dialogs.c:1357
 msgid "Re-enter new PIN code:"
 msgstr "重新輸入 PIN 碼："
 
 #. Translators: Show/obscure PIN/PUK checkbox label
-#: ../src/applet-dialogs.c:1360
+#: ../src/applet-dialogs.c:1362
 msgid "Show PIN/PUK codes"
 msgstr "顯示 PIN/PUK 碼"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:1
-#: ../src/connection-editor/ce-ip6-routes.ui.h:1
+#: ../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 ""
+
+#: ../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
 msgid ""
@@ -1213,26 +1008,48 @@ msgid ""
 "button to add an IP address."
 msgstr "用來在網路上區別您的電腦的 IP 位址。請按下「新增」按鈕，加入 IP 位址。"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:2
-#: ../src/connection-editor/ce-ip6-routes.ui.h:2
+#: ../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
+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: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
+msgid "_Delete"
+msgstr "刪除(_D)"
+
+#: ../src/connection-editor/ce-ip4-routes.ui.h:6
+#: ../src/connection-editor/ce-ip6-routes.ui.h:6
 msgid "Ig_nore automatically obtained routes"
 msgstr "忽略自動獲得的路由(_N)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:3
-#: ../src/connection-editor/ce-ip6-routes.ui.h:3
+#: ../src/connection-editor/ce-ip4-routes.ui.h:7
+#: ../src/connection-editor/ce-ip6-routes.ui.h:7
 msgid "_Use this connection only for resources on its network"
 msgstr "只在使用這個連線的網路資源時，才使用此連線(_U)"
 
-#: ../src/connection-editor/ce-ip4-routes.ui.h:4
-#: ../src/connection-editor/ce-ip6-routes.ui.h:4
+#: ../src/connection-editor/ce-ip4-routes.ui.h:8
+#: ../src/connection-editor/ce-ip6-routes.ui.h:8
 msgid ""
 "If enabled, this connection will never be used as the default network "
 "connection."
 msgstr "如果啟用，這個連線將永遠不會做為預設網路連線。"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:1
-#: ../src/libnm-gtk/wifi.ui.h:1
-#: ../src/wireless-security/eap-method-fast.ui.h:1
+#: ../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
@@ -1240,15 +1057,15 @@ msgstr "如果啟用，這個連線將永遠不會做為預設網路連線。"
 msgid " "
 msgstr " "
 
-#: ../src/connection-editor/ce-new-connection.ui.h:2
+#: ../src/connection-editor/ce-new-connection.ui.h:3
 msgid "Create…"
 msgstr "建立…"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:3
+#: ../src/connection-editor/ce-new-connection.ui.h:4
 msgid "Choose a Connection Type"
 msgstr "請選擇連線類型"
 
-#: ../src/connection-editor/ce-new-connection.ui.h:4
+#: ../src/connection-editor/ce-new-connection.ui.h:5
 msgid ""
 "Select the type of connection you wish to create.\n"
 "\n"
@@ -1301,78 +1118,89 @@ msgid "Bonded _connections:"
 msgstr "繫結的連線(_C)："
 
 #: ../src/connection-editor/ce-page-bond.ui.h:11
-msgid "_Mode:"
-msgstr "模式(_M)："
+#: ../src/connection-editor/ce-page-wifi.ui.h:19
+msgid "M_ode:"
+msgstr "模式(_O)："
 
 #. Edit
-#: ../src/connection-editor/ce-page-bond.ui.h:12
-#: ../src/connection-editor/ce-page-bridge.ui.h:2
-#: ../src/connection-editor/ce-page-team.ui.h:4
-#: ../src/connection-editor/nm-connection-list.c:686
-msgid "_Edit"
-msgstr "編輯(_E)"
-
-#. Delete
 #: ../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:702
-msgid "_Delete"
-msgstr "刪除(_D)"
+#: ../src/connection-editor/nm-connection-list.c:683
+msgid "_Edit"
+msgstr "編輯(_E)"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:14
+#: ../src/connection-editor/ce-page-bond.ui.h:15
 msgid "Monitoring _frequency:"
 msgstr "監控頻率(_F)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:15
+#: ../src/connection-editor/ce-page-bond.ui.h:16
 msgid "ms"
 msgstr "毫秒"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:16
-#: ../src/connection-editor/ce-page-bridge.ui.h:5
-#: ../src/connection-editor/ce-page-team.ui.h:6
+#: ../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:"
 msgstr "介面名稱(_I)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:17
+#: ../src/connection-editor/ce-page-bond.ui.h:18
 msgid "_Link Monitoring:"
 msgstr "連線監控(_L)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:18
+#: ../src/connection-editor/ce-page-bond.ui.h:19
 msgid "ARP _targets:"
 msgstr "ARP 目標(_T)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:19
+#: ../src/connection-editor/ce-page-bond.ui.h:20
 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:20
+#: ../src/connection-editor/ce-page-bond.ui.h:21
 msgid "Link _up delay:"
 msgstr "連線延遲(_U)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:21
+#: ../src/connection-editor/ce-page-bond.ui.h:22
 msgid "Link _down delay:"
 msgstr "斷線延遲(_D)："
 
-#: ../src/connection-editor/ce-page-bond.ui.h:22
+#: ../src/connection-editor/ce-page-bond.ui.h:23
 msgid "_Primary:"
 msgstr "主要(_P):"
 
-#: ../src/connection-editor/ce-page-bond.ui.h:23
+#: ../src/connection-editor/ce-page-bond.ui.h:24
 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:8
+#: ../src/connection-editor/ce-page-vlan.ui.h:4
+#: ../src/connection-editor/ce-page-wifi.ui.h:8
+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
+msgid "bytes"
+msgstr "位元組"
+
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:1
 msgid "Path _cost:"
 msgstr "路徑成本(_C)："
 
 #: ../src/connection-editor/ce-page-bridge-port.ui.h:2
-#: ../src/connection-editor/ce-page-bridge.ui.h:4
+#: ../src/connection-editor/ce-page-bridge.ui.h:5
 msgid "_Priority:"
 msgstr "優先順序(_P)："
 
@@ -1384,44 +1212,89 @@ msgstr "_Hairpin 模式："
 msgid "Bridged _connections:"
 msgstr "橋接的連線(_C)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:6
+#: ../src/connection-editor/ce-page-bridge.ui.h:7
 msgid "_Forward delay:"
 msgstr "轉送延遲(_F)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:7
+#: ../src/connection-editor/ce-page-bridge.ui.h:8
 msgid "_Hello time:"
 msgstr "_Hello 時間："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:8
+#: ../src/connection-editor/ce-page-bridge.ui.h:9
 msgid "s"
 msgstr "秒"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:9
+#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#, fuzzy
+msgid "Enable I_GMP snooping"
+msgstr "啟用網路(_N)"
+
+#: ../src/connection-editor/ce-page-bridge.ui.h:11
 msgid "Enable _STP (Spanning Tree Protocol)"
 msgstr "啟用 _STP (生成樹協議)"
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:10
+#: ../src/connection-editor/ce-page-bridge.ui.h:12
 msgid "_Max age:"
 msgstr "最大時間(_M)："
 
-#: ../src/connection-editor/ce-page-bridge.ui.h:11
+#: ../src/connection-editor/ce-page-bridge.ui.h:13
 msgid "_Aging time:"
 msgstr "存續時間(_A)："
 
-#: ../src/connection-editor/ce-page.c:84
+#: ../src/connection-editor/ce-page.c:78
 msgid "automatic"
 msgstr "自動"
 
-#: ../src/connection-editor/ce-page.c:92
+#: ../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:176
-#: ../src/connection-editor/page-wifi.c:197
+#: ../src/connection-editor/page-wifi.c:193
 #, c-format
 msgid "default"
 msgstr "預設"
 
-#: ../src/connection-editor/ce-page.c:359
+#: ../src/connection-editor/ce-page.c:132
+msgid "unspecified error"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "MAC address"
+msgstr "地址"
+
+#: ../src/connection-editor/ce-page.c:245
+#, fuzzy
+msgid "HW address"
+msgstr "地址"
+
+#: ../src/connection-editor/ce-page.c:248
+#, c-format
+msgid "invalid %s for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:252
+#: ../src/connection-editor/ce-page.c:484
+#, c-format
+msgid "invalid %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:268
+#, c-format
+msgid "invalid interface-name for %s (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:272
+#, c-format
+msgid "invalid interface-name (%s)"
+msgstr ""
+
+#: ../src/connection-editor/ce-page.c:485
+#, fuzzy
+msgid "device"
+msgstr "任何裝置"
+
+#: ../src/connection-editor/ce-page.c:591
 msgid "Failed to update connection secrets due to an unknown error."
 msgstr "由於不明的錯誤使連線機密的更新失敗。"
 
@@ -1520,75 +1393,75 @@ msgstr "VN2VN"
 msgid "Priority Flow Control"
 msgstr "優先順序流量控制"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:25
+#: ../src/connection-editor/ce-page-dcb.ui.h:27
 msgid "Enable or disable priority pause transmission for each User Priority."
 msgstr "依每個使用者優先順序啟用或停用優先順序暫停傳輸。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:26
+#: ../src/connection-editor/ce-page-dcb.ui.h:28
 msgid "Priority:"
 msgstr "優先順序："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:27
+#: ../src/connection-editor/ce-page-dcb.ui.h:29
 msgid "0:"
 msgstr "0："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:28
+#: ../src/connection-editor/ce-page-dcb.ui.h:30
 msgid "1:"
 msgstr "1："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:29
+#: ../src/connection-editor/ce-page-dcb.ui.h:31
 msgid "2:"
 msgstr "2："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:30
+#: ../src/connection-editor/ce-page-dcb.ui.h:32
 msgid "3:"
 msgstr "3："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:31
+#: ../src/connection-editor/ce-page-dcb.ui.h:33
 msgid "4:"
 msgstr "4："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:32
+#: ../src/connection-editor/ce-page-dcb.ui.h:34
 msgid "5:"
 msgstr "5："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:33
+#: ../src/connection-editor/ce-page-dcb.ui.h:35
 msgid "6:"
 msgstr "6："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:34
+#: ../src/connection-editor/ce-page-dcb.ui.h:36
 msgid "7:"
 msgstr "7："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:35
+#: ../src/connection-editor/ce-page-dcb.ui.h:37
 msgid "Traffic Class:"
 msgstr "流量類別："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:36
+#: ../src/connection-editor/ce-page-dcb.ui.h:38
 msgid "Strict Bandwidth:"
 msgstr "限制頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:37
+#: ../src/connection-editor/ce-page-dcb.ui.h:39
 msgid "Priority Bandwidth:"
 msgstr "優先順序頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:38
+#: ../src/connection-editor/ce-page-dcb.ui.h:40
 msgid "Group Bandwidth:"
 msgstr "群組頻寬："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:39
+#: ../src/connection-editor/ce-page-dcb.ui.h:41
 msgid "Group ID:"
 msgstr "群組 ID："
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:40
+#: ../src/connection-editor/ce-page-dcb.ui.h:42
 msgid "15"
 msgstr "15"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:41
+#: ../src/connection-editor/ce-page-dcb.ui.h:43
 msgid "Enter the priority group ID for each User Priority."
 msgstr "依每個使用者優先順序輸入優先順序群組 ID。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:43
+#: ../src/connection-editor/ce-page-dcb.ui.h:45
 #, no-c-format
 msgid ""
 "Enter the allowed link bandwidth percent each Priority Group may use.  The "
@@ -1596,21 +1469,21 @@ msgid ""
 msgstr ""
 "輸入每個優先順序群組可以使用的連線頻寬。所有群組的總合加起來必須為 100%。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:44
+#: ../src/connection-editor/ce-page-dcb.ui.h:46
 msgid ""
 "Enter the percentage of priority group bandwidth each user priority may use."
 msgstr "輸入每個使用者優先順序可以使用的優先順序群組頻寬百分比。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:45
+#: ../src/connection-editor/ce-page-dcb.ui.h:47
 msgid "Enable or disable strict bandwidth for each user priority."
 msgstr "依每個使用者優先順序啟用或停用限制頻寬。"
 
-#: ../src/connection-editor/ce-page-dcb.ui.h:46
+#: ../src/connection-editor/ce-page-dcb.ui.h:48
 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:10
+#: ../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
@@ -1623,7 +1496,7 @@ 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:4
+#: ../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
@@ -1631,8 +1504,9 @@ msgid "Sho_w password"
 msgstr "顯示密碼(_W)"
 
 #: ../src/connection-editor/ce-page-dsl.ui.h:4
-#: ../src/connection-editor/ce-page-mobile.ui.h:11
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:95
+#: ../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
@@ -1644,7 +1518,8 @@ msgstr "密碼(_P)："
 #: ../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-ip6.c:150
+#: ../src/connection-editor/page-ip4.c:129
+#: ../src/connection-editor/page-ip6.c:135
 #: ../src/wireless-security/eap-method-peap.ui.h:2
 msgid "Automatic"
 msgstr "自動"
@@ -1699,18 +1574,18 @@ msgstr "自動協議(_O)"
 
 #: ../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:8
-#: ../src/connection-editor/ce-page-wimax.ui.h:1
-msgid "_Device MAC address:"
-msgstr "裝置的 MAC 位址(_D)："
+#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#, fuzzy
+msgid "_Device:"
+msgstr "服務(_S)："
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:15
-#: ../src/connection-editor/ce-page-wifi.ui.h:10
+#: ../src/connection-editor/ce-page-wifi.ui.h:11
 msgid "C_loned MAC address:"
 msgstr "複製的 MAC 位址(_L)："
 
 #: ../src/connection-editor/ce-page-ethernet.ui.h:16
-#: ../src/connection-editor/ce-page-wifi.ui.h:9
+#: ../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 "
@@ -1719,19 +1594,54 @@ msgstr ""
 "在這裡輸入的 MAC 位址會成為這個連線使用的網路裝置的硬體位址。這個功能也稱為 "
 "MAC 複製或偽裝。例如：00:11:22:33:44:55"
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:17
-#: ../src/connection-editor/ce-page-infiniband.ui.h:4
-#: ../src/connection-editor/ce-page-vlan.ui.h:4
-#: ../src/connection-editor/ce-page-wifi.ui.h:7
-msgid "_MTU:"
-msgstr "_MTU："
+#: ../src/connection-editor/ce-page-ethernet.ui.h:19
+msgid "Wake on LAN:"
+msgstr ""
 
-#: ../src/connection-editor/ce-page-ethernet.ui.h:18
-#: ../src/connection-editor/ce-page-infiniband.ui.h:3
-#: ../src/connection-editor/ce-page-vlan.ui.h:5
-#: ../src/connection-editor/ce-page-wifi.ui.h:6
-msgid "bytes"
-msgstr "位元組"
+#: ../src/connection-editor/ce-page-ethernet.ui.h:20
+#, fuzzy
+msgid "De_fault"
+msgstr "預設"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:21
+#, fuzzy
+msgid "_Ignore"
+msgstr "忽略"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:22
+msgid "_Phy"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:23
+msgid "_Unicast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:24
+msgid "Mul_ticast"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:25
+#, fuzzy
+msgid "_Broadcast"
+msgstr "廣播"
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:26
+msgid "_Arp"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:27
+msgid "Ma_gic"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:28
+#, fuzzy
+msgid "_Wake on LAN password:"
+msgstr "私密金鑰密碼(_P)："
+
+#: ../src/connection-editor/ce-page-ethernet.ui.h:29
+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"
@@ -1770,8 +1680,8 @@ msgstr "自動使用手動 DNS 設定值"
 
 #: ../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:199
+#: ../src/connection-editor/page-ip4.c:166
+#: ../src/connection-editor/page-ip6.c:184
 msgid "Manual"
 msgstr "手動"
 
@@ -1782,8 +1692,8 @@ 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:187
-#: ../src/connection-editor/page-ip6.c:219
+#: ../src/connection-editor/page-ip4.c:186
+#: ../src/connection-editor/page-ip6.c:204
 msgid "Shared to other computers"
 msgstr "分享給其他電腦"
 
@@ -1797,7 +1707,7 @@ msgstr "方法(_M)："
 msgid "Addresses"
 msgstr "地址"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:9
+#: ../src/connection-editor/ce-page-ip4.ui.h:11
 msgid ""
 "The DHCP client identifier allows the network administrator to customize "
 "your computer's configuration.  If you wish to use a DHCP client identifier, "
@@ -1806,32 +1716,32 @@ 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.h:12
+#: ../src/connection-editor/ce-page-ip6.ui.h:14
 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.h:13
 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/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:321
+#: ../src/connection-editor/page-ip6.c:306
 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/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:312
+#: ../src/connection-editor/page-ip6.c:297
 msgid "DNS ser_vers:"
 msgstr "_DNS 伺服器："
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:14
+#: ../src/connection-editor/ce-page-ip4.ui.h:16
 msgid ""
 "IP addresses of domain name servers used to resolve host names. Use commas "
 "to separate multiple domain name server addresses."
@@ -1839,11 +1749,11 @@ msgstr ""
 "網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的"
 "位址。"
 
-#: ../src/connection-editor/ce-page-ip4.ui.h:15
+#: ../src/connection-editor/ce-page-ip4.ui.h:17
 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.h:18
 msgid ""
 "When connecting to IPv6-capable networks, allows the connection to complete "
 "if IPv4 configuration fails but IPv6 configuration succeeds."
@@ -1851,13 +1761,13 @@ 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.h:19
+#: ../src/connection-editor/ce-page-ip6.ui.h:21
 msgid "_Routes…"
 msgstr "路由(_R)…"
 
 #: ../src/connection-editor/ce-page-ip6.ui.h:6
-#: ../src/connection-editor/page-ip4.c:197
+#: ../src/connection-editor/page-ip4.c:196
 msgid "Disabled"
 msgstr "已停用"
 
@@ -1869,7 +1779,7 @@ msgstr "啟用 (偏好公開位址)"
 msgid "Enabled (prefer temporary address)"
 msgstr "啟用 (偏好暫時位址)"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:15
+#: ../src/connection-editor/ce-page-ip6.ui.h:17
 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 "
@@ -1878,15 +1788,15 @@ msgstr ""
 "網域名稱伺服器的 IP 位址，用來解析主機名稱。請使用逗號來分開多個網域伺服器的"
 "位址。Link-local 位址會自動設定到連線中的介面。"
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:16
+#: ../src/connection-editor/ce-page-ip6.ui.h:18
 msgid "IPv6 _privacy extensions:"
 msgstr "I_Pv6 隱私擴充功能："
 
-#: ../src/connection-editor/ce-page-ip6.ui.h:17
+#: ../src/connection-editor/ce-page-ip6.ui.h:19
 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.h:20
 msgid ""
 "When connecting to IPv4-capable networks, allows the connection to complete "
 "if IPv6 configuration fails but IPv4 configuration succeeds."
@@ -1895,71 +1805,38 @@ msgstr ""
 "許連線完成。"
 
 #: ../src/connection-editor/ce-page-mobile.ui.h:1
-msgid "Any"
-msgstr "任何"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:2
-msgid "3G (UMTS/HSPA)"
-msgstr "3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:3
-msgid "2G (GPRS/EDGE)"
-msgstr "2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:4
-msgid "Prefer 3G (UMTS/HSPA)"
-msgstr "偏好 3G (UMTS/HSPA)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:5
-msgid "Prefer 2G (GPRS/EDGE)"
-msgstr "偏好 2G (GPRS/EDGE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:6
-msgid "Prefer 4G (LTE)"
-msgstr "偏好 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:7
-msgid "Use only 4G (LTE)"
-msgstr "只使用 4G (LTE)"
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Basic"
 msgstr "基本"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:9
+#: ../src/connection-editor/ce-page-mobile.ui.h:2
 msgid "Nu_mber:"
 msgstr "數字(_M)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:12
+#: ../src/connection-editor/ce-page-mobile.ui.h:5
 msgid "Advanced"
 msgstr "進階"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:13
+#: ../src/connection-editor/ce-page-mobile.ui.h:6
 msgid "_APN:"
 msgstr "_APN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:14
+#: ../src/connection-editor/ce-page-mobile.ui.h:7
 msgid "N_etwork ID:"
 msgstr "網路 ID(_E)："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:15
-#: ../src/wireless-security/ws-wpa-psk.ui.h:2
-msgid "_Type:"
-msgstr "類型(_T)："
-
-#: ../src/connection-editor/ce-page-mobile.ui.h:16
+#: ../src/connection-editor/ce-page-mobile.ui.h:8
 msgid "Change..."
 msgstr "變更…"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:17
+#: ../src/connection-editor/ce-page-mobile.ui.h:9
 msgid "P_IN:"
 msgstr "P_IN："
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:18
+#: ../src/connection-editor/ce-page-mobile.ui.h:10
 msgid "Allow _roaming if home network is not available"
 msgstr "如果家用網路無法使用，允許使用漫遊(_R)"
 
-#: ../src/connection-editor/ce-page-mobile.ui.h:19
+#: ../src/connection-editor/ce-page-mobile.ui.h:11
 msgid "Sho_w passwords"
 msgstr "顯示密碼(_W)"
 
@@ -2025,32 +1902,55 @@ msgid "_Teamed connections:"
 msgstr "團隊連線(_T):"
 
 #: ../src/connection-editor/ce-page-team.ui.h:3
-msgid "I_mport team configuration from a file..."
-msgstr "從檔案匯入團隊組態(_M)…"
+#, fuzzy
+msgid "Im_port team configuration from a file..."
+msgstr "從檔案匯入團隊組態(_I)…"
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:1
 msgid "_Parent interface:"
 msgstr "父介面(_P)："
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:2
-msgid "VLAN interface _name:"
+#, fuzzy
+msgid "VLAN inter_face name:"
 msgstr "VLAN 介面名稱(_N)："
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:3
-msgid "_Cloned MAC address:"
+#, fuzzy
+msgid "Cloned MAC _address:"
 msgstr "複製的 MA_C 位址："
 
 #: ../src/connection-editor/ce-page-vlan.ui.h:6
 msgid "VLAN _id:"
 msgstr "VLAN _id："
 
-#. In context, this means "concatenate the device name and the VLAN ID number together"
+#: ../src/connection-editor/ce-page-vlan.ui.h:7
+msgid "Flags:"
+msgstr ""
+
 #: ../src/connection-editor/ce-page-vlan.ui.h:8
+msgid "_Reorder headers"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:9
+msgid "_GVRP"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:10
+msgid "_Loose binding"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-vlan.ui.h:11
+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
 msgid "Device name + number"
 msgstr "裝置名稱 + 編號"
 
-#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string 'vlan' and the VLAN ID number together".
-#: ../src/connection-editor/ce-page-vlan.ui.h:10
+#. LEAVE "vlan" UNTRANSLATED. In context, this means "concatenate the string
+#: ../src/connection-editor/ce-page-vlan.ui.h:15
 msgid "\"vlan\" + number"
 msgstr "\"vlan\" + 編號"
 
@@ -2067,94 +1967,98 @@ msgid "B/G (2.4 GHz)"
 msgstr "B/G (2.4 GHz)"
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:4
-msgid "Infrastructure"
-msgstr "基礎架構"
+msgid "Client"
+msgstr ""
 
 #: ../src/connection-editor/ce-page-wifi.ui.h:5
+msgid "Hotspot"
+msgstr ""
+
+#: ../src/connection-editor/ce-page-wifi.ui.h:6
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:11
+#: ../src/connection-editor/ce-page-wifi.ui.h:12
 msgid "mW"
 msgstr "mW"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:12
+#: ../src/connection-editor/ce-page-wifi.ui.h:13
 msgid "Transmission po_wer:"
 msgstr "傳輸耗能(_W)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:13
+#: ../src/connection-editor/ce-page-wifi.ui.h:14
 msgid "Mb/s"
 msgstr "Mb/s"
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:14
+#: ../src/connection-editor/ce-page-wifi.ui.h:15
 msgid "_Rate:"
 msgstr "速率(_R)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:15
+#: ../src/connection-editor/ce-page-wifi.ui.h:16
 msgid "_BSSID:"
 msgstr "_BSSID："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:16
+#: ../src/connection-editor/ce-page-wifi.ui.h:17
 msgid "C_hannel:"
 msgstr "頻道(_H)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:17
+#: ../src/connection-editor/ce-page-wifi.ui.h:18
 msgid "Ban_d:"
 msgstr "波段(_D)："
 
-#: ../src/connection-editor/ce-page-wifi.ui.h:18
-msgid "M_ode:"
-msgstr "模式(_O)："
-
-#: ../src/connection-editor/ce-page-wifi.ui.h:19
+#: ../src/connection-editor/ce-page-wifi.ui.h:20
 msgid "SS_ID:"
 msgstr "SS_ID："
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:1
+#: ../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
 msgid "Allowed Authentication Methods"
 msgstr "允許的驗證方式"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:2
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
 msgid "_EAP"
 msgstr "_EAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:3
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
 msgid "Extensible Authentication Protocol"
 msgstr "可延伸的驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:4
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
 msgid "_PAP"
 msgstr "_PAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:5
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
 msgid "Password Authentication Protocol"
 msgstr "密碼驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:6
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
 msgid "C_HAP"
 msgstr "C_HAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:7
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
 msgid "Challenge Handshake Authentication Protocol"
 msgstr "Challenge Handshake 驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:8
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
 msgid "_MSCHAP"
 msgstr "_MSCHAP"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:9
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
 msgid "Microsoft Challenge Handshake Authentication Protocol"
 msgstr "Microsoft Challenge Handshake 驗證通訊協定"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:10
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
 msgid "MSCHAP v_2"
 msgstr "MSCHAP v_2"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:11
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:13
 msgid "Microsoft Challenge Handshake Authentication Protocol version 2"
 msgstr "Microsoft Challenge Handshake 驗證通訊協定第 2 版"
 
-#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:12
+#: ../src/connection-editor/ce-ppp-auth-methods.ui.h:14
 msgid ""
 "In most cases, the provider's PPP servers will support all authentication "
 "methods.  If connections fail, try disabling support for some methods."
@@ -2162,301 +2066,360 @@ msgstr ""
 "在大多數情況下，網路供應者的 PPP 伺服器會支援所有的驗證方法。如果連線失敗，請"
 "嘗試停用某些方法的支援。"
 
-#: ../src/connection-editor/ip4-routes-dialog.c:724
-#: ../src/connection-editor/ip6-routes-dialog.c:666
-#: ../src/connection-editor/page-ip4.c:924
-#: ../src/connection-editor/page-ip6.c:924
-msgid "Address"
-msgstr "地址"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:741
-#: ../src/connection-editor/page-ip4.c:941
-msgid "Netmask"
-msgstr "網路遮罩"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:758
-#: ../src/connection-editor/ip6-routes-dialog.c:700
-#: ../src/connection-editor/page-ip4.c:958
-#: ../src/connection-editor/page-ip6.c:958
-msgid "Gateway"
-msgstr "通訊閘"
-
-#: ../src/connection-editor/ip4-routes-dialog.c:775
-#: ../src/connection-editor/ip6-routes-dialog.c:717
-msgid "Metric"
-msgstr "度量 (Metric)"
-
-#: ../src/connection-editor/ip6-routes-dialog.c:683
-#: ../src/connection-editor/page-ip6.c:941
-msgid "Prefix"
-msgstr "前綴"
-
-#: ../src/connection-editor/new-connection.c:102
-#: ../src/connection-editor/page-ethernet.c:242
-#: ../src/libnm-gtk/nm-ui-utils.c:323
+#: ../src/connection-editor/connection-helpers.c:97
+#: ../src/connection-editor/page-ethernet.c:326
+#: ../src/libnm-gtk/nm-ui-utils.c:321
 msgid "Ethernet"
 msgstr "有線網路"
 
-#: ../src/connection-editor/new-connection.c:108
-#: ../src/connection-editor/page-wifi.c:465 ../src/libnm-gtk/nm-ui-utils.c:325
+#: ../src/connection-editor/connection-helpers.c:98
+#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../src/connection-editor/new-connection.c:120
-#: ../src/connection-editor/page-wimax.c:125
-#: ../src/libnm-gtk/nm-ui-utils.c:331 ../src/mb-menu-item.c:74
-msgid "WiMAX"
-msgstr "WiMAX"
+#: ../src/connection-editor/connection-helpers.c:106
+#: ../src/connection-editor/page-bluetooth.c:123
+#: ../src/libnm-gtk/nm-ui-utils.c:325
+msgid "Bluetooth"
+msgstr "藍牙"
 
-#: ../src/connection-editor/new-connection.c:126
-#: ../src/connection-editor/page-dsl.c:137
+#: ../src/connection-editor/connection-helpers.c:107
+#: ../src/connection-editor/page-dsl.c:127
 msgid "DSL"
 msgstr "DSL"
 
-#: ../src/connection-editor/new-connection.c:132
-#: ../src/connection-editor/page-infiniband.c:159
-#: ../src/libnm-gtk/nm-ui-utils.c:335
+#: ../src/connection-editor/connection-helpers.c:108
+#: ../src/connection-editor/page-infiniband.c:150
+#: ../src/libnm-gtk/nm-ui-utils.c:331
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../src/connection-editor/new-connection.c:138
-#: ../src/connection-editor/page-bond.c:433 ../src/libnm-gtk/nm-ui-utils.c:337
-#: ../src/libnm-gtk/nm-ui-utils.c:562
+#: ../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
 msgid "Bond"
 msgstr "繫結"
 
-#: ../src/connection-editor/new-connection.c:144
-#: ../src/connection-editor/page-team.c:244 ../src/libnm-gtk/nm-ui-utils.c:339
-#: ../src/libnm-gtk/nm-ui-utils.c:564
+#: ../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
 msgid "Team"
 msgstr "團隊"
 
-#: ../src/connection-editor/new-connection.c:150
-#: ../src/connection-editor/page-bridge.c:208
-#: ../src/libnm-gtk/nm-ui-utils.c:341 ../src/libnm-gtk/nm-ui-utils.c:566
+#: ../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
 msgid "Bridge"
 msgstr "橋接"
 
-#: ../src/connection-editor/new-connection.c:156
-#: ../src/connection-editor/page-vlan.c:487 ../src/libnm-gtk/nm-ui-utils.c:343
-#: ../src/libnm-gtk/nm-ui-utils.c:568
+#: ../src/connection-editor/connection-helpers.c:112
+#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339
+#: ../src/libnm-gtk/nm-ui-utils.c:583
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/connection-editor/new-connection.c:169
-#: ../src/connection-editor/new-connection.c:309
-#: ../src/connection-editor/page-vpn.c:113
+#: ../src/connection-editor/connection-helpers.c:116
+#: ../src/connection-editor/connection-helpers.c:254
+#: ../src/connection-editor/page-vpn.c:101
 msgid "VPN"
 msgstr "VPN"
 
-#: ../src/connection-editor/new-connection.c:259
+#: ../src/connection-editor/connection-helpers.c:196
 msgid "Hardware"
 msgstr "硬體"
 
-#: ../src/connection-editor/new-connection.c:279
+#: ../src/connection-editor/connection-helpers.c:223
 msgid "Virtual"
 msgstr "虛擬"
 
-#: ../src/connection-editor/new-connection.c:347
-#: ../src/connection-editor/new-connection.c:349
+#: ../src/connection-editor/connection-helpers.c:292
+#: ../src/connection-editor/connection-helpers.c:294
 msgid "Import a saved VPN configuration..."
 msgstr "匯入已儲存的 VPN 組態…"
 
-#: ../src/connection-editor/new-connection.c:378
+#: ../src/connection-editor/connection-helpers.c:323
 msgid ""
 "The connection editor dialog could not be initialized due to an unknown "
 "error."
 msgstr "由於不明的錯誤使連線編輯器對話盒無法初始化。"
 
-#: ../src/connection-editor/new-connection.c:387
+#: ../src/connection-editor/connection-helpers.c:332
 msgid "Could not create new connection"
 msgstr "無法建立新連線"
 
-#: ../src/connection-editor/new-connection.c:522
+#: ../src/connection-editor/connection-helpers.c:469
 msgid "Connection delete failed"
 msgstr "刪除連線失敗"
 
-#: ../src/connection-editor/new-connection.c:569
+#: ../src/connection-editor/connection-helpers.c:517
 #, c-format
 msgid "Are you sure you wish to delete the connection %s?"
 msgstr "您確定要刪除連線 %s ？"
 
-#: ../src/connection-editor/nm-connection-editor.c:123
+#: ../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
+msgid "Address"
+msgstr "地址"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:823
+#: ../src/connection-editor/page-ip4.c:1087
+msgid "Netmask"
+msgstr "網路遮罩"
+
+#: ../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
+msgid "Gateway"
+msgstr "通訊閘"
+
+#: ../src/connection-editor/ip4-routes-dialog.c:861
+#: ../src/connection-editor/ip6-routes-dialog.c:803
+msgid "Metric"
+msgstr "度量 (Metric)"
+
+#: ../src/connection-editor/ip6-routes-dialog.c:765
+#: ../src/connection-editor/page-ip6.c:1085
+msgid "Prefix"
+msgstr "前綴"
+
+#: ../src/connection-editor/nm-connection-editor.c:100
 #, c-format
 msgid "Editing %s"
 msgstr "編輯 %s"
 
-#: ../src/connection-editor/nm-connection-editor.c:127
+#: ../src/connection-editor/nm-connection-editor.c:104
 msgid "Editing un-named connection"
 msgstr "編輯未命名的連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:287
+#: ../src/connection-editor/nm-connection-editor.c:124
+#, fuzzy
+msgid "Missing connection name"
+msgstr "連線名稱(_N)："
+
+#: ../src/connection-editor/nm-connection-editor.c:187
+#, fuzzy
+msgid "Editor initializing..."
+msgstr "初始化編輯器時發生錯誤"
+
+#: ../src/connection-editor/nm-connection-editor.c:194
+#: ../src/connection-editor/nm-connection-list.c:397
+#, fuzzy
+msgid "Connection cannot be modified"
+msgstr "新增連線失敗"
+
+#: ../src/connection-editor/nm-connection-editor.c:207
+#, c-format
+msgid "Invalid setting %s: %s"
+msgstr ""
+
+#: ../src/connection-editor/nm-connection-editor.c:283
 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:418
+#: ../src/connection-editor/nm-connection-editor.c:419
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../src/connection-editor/nm-connection-editor.c:419
+#: ../src/connection-editor/nm-connection-editor.c:420
 msgid "Save any changes made to this connection."
 msgstr "儲存任何對這個連線進行的變更。"
 
-#: ../src/connection-editor/nm-connection-editor.c:420
+#: ../src/connection-editor/nm-connection-editor.c:421
 msgid "Authenticate to save this connection for all users of this machine."
 msgstr "驗證以儲存這個連線給此電腦上的所有使用者。"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not create connection"
 msgstr "無法建立連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:436
+#: ../src/connection-editor/nm-connection-editor.c:437
 msgid "Could not edit connection"
 msgstr "無法編輯連線"
 
-#: ../src/connection-editor/nm-connection-editor.c:438
+#: ../src/connection-editor/nm-connection-editor.c:439
 msgid "Unknown error creating connection editor dialog."
 msgstr "建立連線編輯器對話盒時發生不明錯誤。"
 
-#: ../src/connection-editor/nm-connection-editor.c:572
+#: ../src/connection-editor/nm-connection-editor.c:581
 msgid "Error initializing editor"
 msgstr "初始化編輯器時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-editor.c:905
+#: ../src/connection-editor/nm-connection-editor.c:921
 msgid "Connection add failed"
 msgstr "新增連線失敗"
 
-#: ../src/connection-editor/nm-connection-editor.c:945
-msgid "Error saving connection"
-msgstr "儲存連線時錯誤"
-
-#: ../src/connection-editor/nm-connection-editor.c:946
-#, c-format
-msgid "The property '%s' / '%s' is invalid: %d"
-msgstr "屬性「%s」/「%s」是無效的：%d"
+#: ../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:2
+#: ../src/connection-editor/nm-connection-editor.ui.h:4
 msgid "Connection _name:"
 msgstr "連線名稱(_N)："
 
-#: ../src/connection-editor/nm-connection-editor.ui.h:3
+#: ../src/connection-editor/nm-connection-editor.ui.h:5
 msgid "_Export..."
 msgstr "匯出(_E)…"
 
-#: ../src/connection-editor/nm-connection-list.c:143
+#: ../src/connection-editor/nm-connection-list.c:127
 msgid "never"
 msgstr "永不"
 
-#: ../src/connection-editor/nm-connection-list.c:154
-#: ../src/connection-editor/nm-connection-list.c:165
+#: ../src/connection-editor/nm-connection-list.c:138
+#: ../src/connection-editor/nm-connection-list.c:149
 msgid "now"
 msgstr "現在"
 
 #. less than an hour ago
-#: ../src/connection-editor/nm-connection-list.c:172
+#: ../src/connection-editor/nm-connection-list.c:156
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘以前"
 
-#: ../src/connection-editor/nm-connection-list.c:176
+#: ../src/connection-editor/nm-connection-list.c:160
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時以前"
 
-#: ../src/connection-editor/nm-connection-list.c:188
+#: ../src/connection-editor/nm-connection-list.c:172
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以前"
 
-#: ../src/connection-editor/nm-connection-list.c:194
+#: ../src/connection-editor/nm-connection-list.c:178
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月以前"
 
-#: ../src/connection-editor/nm-connection-list.c:198
+#: ../src/connection-editor/nm-connection-list.c:182
 #, c-format
 msgid "%d year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年以前"
 
-#: ../src/connection-editor/nm-connection-list.c:632
+#: ../src/connection-editor/nm-connection-list.c:623
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/connection-editor/nm-connection-list.c:645
+#: ../src/connection-editor/nm-connection-list.c:636
 msgid "Last Used"
 msgstr "最後使用的"
 
-#: ../src/connection-editor/nm-connection-list.c:687
+#: ../src/connection-editor/nm-connection-list.c:684
 msgid "Edit the selected connection"
 msgstr "編輯選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:688
+#: ../src/connection-editor/nm-connection-list.c:685
 msgid "Authenticate to edit the selected connection"
 msgstr "驗證以編輯選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:703
+#: ../src/connection-editor/nm-connection-list.c:700
 msgid "Delete the selected connection"
 msgstr "刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:704
+#: ../src/connection-editor/nm-connection-list.c:701
 msgid "Authenticate to delete the selected connection"
 msgstr "驗證以刪除選取的連線"
 
-#: ../src/connection-editor/nm-connection-list.c:933
+#: ../src/connection-editor/nm-connection-list.c:929
 msgid "No VPN plugins are installed."
 msgstr "尚未安裝任何 VPN 外掛程式。"
 
-#: ../src/connection-editor/nm-connection-list.c:935
+#: ../src/connection-editor/nm-connection-list.c:931
 #, c-format
 msgid "Don't know how to create '%s' connections"
 msgstr "不知道如何建立「%s」連線"
 
-#: ../src/connection-editor/nm-connection-list.c:937
+#: ../src/connection-editor/nm-connection-list.c:933
 msgid "Error creating connection"
 msgstr "建立連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:993
+#: ../src/connection-editor/nm-connection-list.c:955
 msgid "Error editing connection"
 msgstr "編輯連線時發生錯誤"
 
-#: ../src/connection-editor/nm-connection-list.c:994
+#: ../src/connection-editor/nm-connection-list.c:956
 #, c-format
 msgid "Did not find a connection with UUID '%s'"
 msgstr "找不到 UUID「%s」的連線"
 
-#: ../src/connection-editor/page-8021x-security.c:121
+#: ../src/connection-editor/page-8021x-security.c:109
 msgid "802.1x Security"
 msgstr "802.1x 防護"
 
-#: ../src/connection-editor/page-8021x-security.c:123
+#: ../src/connection-editor/page-8021x-security.c:111
 msgid "Could not load 802.1x Security user interface."
 msgstr "無法載入 802.1x 安全性使用者介面。"
 
-#: ../src/connection-editor/page-8021x-security.c:137
+#: ../src/connection-editor/page-8021x-security.c:125
 msgid "Use 802.1_X security for this connection"
 msgstr "在這個連線使用 802.1_X 防護"
 
-#: ../src/connection-editor/page-bond.c:436
+#: ../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
+#, fuzzy
+msgid "Could not load Bluetooth user interface."
+msgstr "無法載入 DCB 使用者介面。"
+
+#: ../src/connection-editor/page-bluetooth.c:175
+#, fuzzy, c-format
+msgid "invalid Bluetooth device (%s)"
+msgstr "找不到藍牙裝置。"
+
+#: ../src/connection-editor/page-bluetooth.c:258
+#, fuzzy, c-format
+msgid "Bluetooth connection %d"
+msgstr "繫結的連線 %d"
+
+#: ../src/connection-editor/page-bluetooth.c:302
+#, fuzzy
+msgid "Bluetooth Type"
+msgstr "藍牙"
+
+#: ../src/connection-editor/page-bluetooth.c:320
+msgid "Select the type of the Bluetooth connection profile."
+msgstr ""
+
+#: ../src/connection-editor/page-bluetooth.c:325
+#, fuzzy
+msgid "_Personal Area Network"
+msgstr "有線網路"
+
+#: ../src/connection-editor/page-bluetooth.c:330
+#, fuzzy
+msgid "_Dial-Up Network"
+msgstr "Wi-Fi 網路"
+
+#: ../src/connection-editor/page-bond.c:447
 msgid "Could not load bond user interface."
 msgstr "無法載入繫結的使用者介面。"
 
-#: ../src/connection-editor/page-bond.c:590
+#: ../src/connection-editor/page-bond.c:566
+#, fuzzy
+msgid "primary"
+msgstr "主要(_P):"
+
+#: ../src/connection-editor/page-bond.c:616
 #, c-format
 msgid "Bond connection %d"
 msgstr "繫結的連線 %d"
 
-#: ../src/connection-editor/page-bridge.c:211
+#: ../src/connection-editor/page-bridge.c:213
 msgid "Could not load bridge user interface."
 msgstr "無法載入橋接的使用者介面。"
 
-#: ../src/connection-editor/page-bridge.c:306
+#: ../src/connection-editor/page-bridge.c:310
 #, c-format
 msgid "Bridge connection %d"
 msgstr "橋接的連線 %d"
@@ -2464,58 +2427,74 @@ msgstr "橋接的連線 %d"
 #. Translators: a "Bridge Port" is a network
 #. * device that is part of a bridge.
 #.
-#: ../src/connection-editor/page-bridge-port.c:115
+#: ../src/connection-editor/page-bridge-port.c:108
 msgid "Bridge Port"
 msgstr "橋接連接埠"
 
-#: ../src/connection-editor/page-bridge-port.c:117
+#: ../src/connection-editor/page-bridge-port.c:110
 msgid "Could not load bridge port user interface."
 msgstr "無法載入橋接連接埠使用者介面。"
 
-#: ../src/connection-editor/page-dcb.c:606
+#: ../src/connection-editor/page-dcb.c:603
 msgid "DCB"
 msgstr "DCB"
 
-#: ../src/connection-editor/page-dcb.c:608
+#: ../src/connection-editor/page-dcb.c:605
 msgid "Could not load DCB user interface."
 msgstr "無法載入 DCB 使用者介面。"
 
-#: ../src/connection-editor/page-dsl.c:139
+#: ../src/connection-editor/page-dsl.c:129
 msgid "Could not load DSL user interface."
 msgstr "無法載入 DSL 使用者介面。"
 
-#: ../src/connection-editor/page-dsl.c:231
+#: ../src/connection-editor/page-dsl.c:214
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 連線 %d"
 
-#: ../src/connection-editor/page-ethernet.c:81
-#: ../src/connection-editor/page-infiniband.c:65
-#: ../src/connection-editor/page-wifi.c:95
-#: ../src/connection-editor/page-wimax.c:61
+#: ../src/connection-editor/page-ethernet.c:74
+#, fuzzy
 msgid ""
-"This option locks this connection to the network device specified by its "
-"permanent MAC address entered here.  Example: 00:11:22:33:44:55"
+"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 位址所指定的網路裝置。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-ethernet.c:244
+#: ../src/connection-editor/page-ethernet.c:328
 msgid "Could not load ethernet user interface."
 msgstr "無法載入有線網路使用者介面。"
 
-#: ../src/connection-editor/page-ethernet.c:387
+#: ../src/connection-editor/page-ethernet.c:457
+#, fuzzy
+msgid "Ethernet device"
+msgstr "有線網路"
+
+#: ../src/connection-editor/page-ethernet.c:461
+#: ../src/connection-editor/page-vlan.c:741
+#: ../src/connection-editor/page-wifi.c:581
+#, fuzzy
+msgid "cloned MAC"
+msgstr "複製的 MAC 位址(_L)："
+
+#: ../src/connection-editor/page-ethernet.c:465
+msgid "Wake-on-LAN password"
+msgstr ""
+
+#: ../src/connection-editor/page-ethernet.c:500
 #, 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/libnm-gtk/nm-mobile-providers.c:808
+#: ../src/connection-editor/page-general.c:51
+#: ../src/libnma/nma-mobile-providers.c:806
+#: ../src/libnm-gtk/nm-mobile-providers.c:806
 msgid "Default"
 msgstr "預設"
 
-#: ../src/connection-editor/page-general.c:56
+#: ../src/connection-editor/page-general.c:52
 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 "
@@ -2524,233 +2503,276 @@ msgstr ""
 "定義連線信任等級的地帶。預設值不是正常的地帶，選擇它會直接使用防火牆中預設的"
 "地帶設定。只有在 firewalld 啟用時有用。"
 
-#: ../src/connection-editor/page-general.c:57
+#: ../src/connection-editor/page-general.c:53
 msgid "FirewallD is not running."
 msgstr "FirewallD 沒有執行。"
 
-#: ../src/connection-editor/page-general.c:330
+#: ../src/connection-editor/page-general.c:350
 msgid "Could not load General user interface."
 msgstr "無法載入一般使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:162
+#: ../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 ""
+
+#: ../src/connection-editor/page-infiniband.c:153
 msgid "Could not load InfiniBand user interface."
 msgstr "無法載入 InfiniBand 使用者介面。"
 
-#: ../src/connection-editor/page-infiniband.c:254
+#: ../src/connection-editor/page-infiniband.c:216
+msgid "infiniband device"
+msgstr ""
+
+#: ../src/connection-editor/page-infiniband.c:251
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 連線 %d"
 
-#: ../src/connection-editor/page-ip4.c:133
-#: ../src/connection-editor/page-ip6.c:140
+#: ../src/connection-editor/page-ip4.c:125
+#: ../src/connection-editor/page-ip6.c:129
 msgid "Automatic (VPN)"
 msgstr "自動 (VPN)"
 
-#: ../src/connection-editor/page-ip4.c:134
-#: ../src/connection-editor/page-ip6.c:141
+#: ../src/connection-editor/page-ip4.c:126
+#: ../src/connection-editor/page-ip6.c:130
 msgid "Automatic (VPN) addresses only"
 msgstr "只用自動 (VPN) 位址"
 
-#: ../src/connection-editor/page-ip4.c:137
-#: ../src/connection-editor/page-ip6.c:144
-msgid "Automatic (PPP)"
-msgstr "自動 (PPP)"
-
-#: ../src/connection-editor/page-ip4.c:138
-#: ../src/connection-editor/page-ip6.c:145
-msgid "Automatic (PPP) addresses only"
-msgstr "只用自動 (PPP) 位址"
+#: ../src/connection-editor/page-ip4.c:130
+#: ../src/connection-editor/page-ip6.c:136
+msgid "Automatic, addresses only"
+msgstr "自動，僅限位址"
 
-#: ../src/connection-editor/page-ip4.c:140
-#: ../src/connection-editor/page-ip6.c:147
+#: ../src/connection-editor/page-ip4.c:132
+#: ../src/connection-editor/page-ip6.c:132
 msgid "Automatic (PPPoE)"
 msgstr "自動 (PPPoE)"
 
-#: ../src/connection-editor/page-ip4.c:141
-#: ../src/connection-editor/page-ip6.c:148
+#: ../src/connection-editor/page-ip4.c:133
+#: ../src/connection-editor/page-ip6.c:133
 msgid "Automatic (PPPoE) addresses only"
 msgstr "只用自動 (PPPoE) 位址"
 
-#: ../src/connection-editor/page-ip4.c:143
+#: ../src/connection-editor/page-ip4.c:135
 msgid "Automatic (DHCP)"
 msgstr "自動 (DHCP)"
 
-#: ../src/connection-editor/page-ip4.c:144
+#: ../src/connection-editor/page-ip4.c:136
 msgid "Automatic (DHCP) addresses only"
 msgstr "只用自動 (DHCP) 位址"
 
-#: ../src/connection-editor/page-ip4.c:181
-#: ../src/connection-editor/page-ip6.c:212
+#: ../src/connection-editor/page-ip4.c:179
+#: ../src/connection-editor/page-ip6.c:197
 msgid "Link-Local Only"
 msgstr "只有本機連線"
 
 #: ../src/connection-editor/page-ip4.c:297
-#: ../src/connection-editor/page-ip6.c:310
+#: ../src/connection-editor/page-ip6.c:295
 msgid "Additional DNS ser_vers:"
 msgstr "額外的 _DNS 伺服器："
 
 #: ../src/connection-editor/page-ip4.c:306
-#: ../src/connection-editor/page-ip6.c:319
+#: ../src/connection-editor/page-ip6.c:304
 msgid "Additional s_earch domains:"
 msgstr "額外的搜尋網域(_E)："
 
-#: ../src/connection-editor/page-ip4.c:856
+#: ../src/connection-editor/page-ip4.c:965
 #, c-format
 msgid "Editing IPv4 routes for %s"
 msgstr "編輯 %s 的 IPv4 路由"
 
-#: ../src/connection-editor/page-ip4.c:1008
+#: ../src/connection-editor/page-ip4.c:1158
 msgid "IPv4 Settings"
 msgstr "IPv4 設定"
 
-#: ../src/connection-editor/page-ip4.c:1010
+#: ../src/connection-editor/page-ip4.c:1160
 msgid "Could not load IPv4 user interface."
 msgstr "無法載入 IPv4 使用者介面。"
 
-#: ../src/connection-editor/page-ip6.c:151
-msgid "Automatic, addresses only"
-msgstr "自動，僅限位址"
+#: ../src/connection-editor/page-ip4.c:1253
+#, c-format
+msgid "IPv4 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1261
+#, c-format
+msgid "IPv4 address netmask \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip4.c:1270
+#, c-format
+msgid "IPv4 gateway \"%s\" invalid"
+msgstr ""
 
-#: ../src/connection-editor/page-ip6.c:163
+#: ../src/connection-editor/page-ip4.c:1313
+#, c-format
+msgid "IPv4 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:148
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../src/connection-editor/page-ip6.c:187
+#: ../src/connection-editor/page-ip6.c:172
 msgid "Automatic, DHCP only"
 msgstr "自動，僅使用 DHCP"
 
-#: ../src/connection-editor/page-ip6.c:856
+#: ../src/connection-editor/page-ip6.c:964
 #, c-format
 msgid "Editing IPv6 routes for %s"
 msgstr "為 %s 編輯 IPv6 路由"
 
-#: ../src/connection-editor/page-ip6.c:1007
+#: ../src/connection-editor/page-ip6.c:1155
 msgid "IPv6 Settings"
 msgstr "IPv6 設定"
 
-#: ../src/connection-editor/page-ip6.c:1009
+#: ../src/connection-editor/page-ip6.c:1157
 msgid "Could not load IPv6 user interface."
 msgstr "無法載入 IPv6 使用者介面。"
 
-#: ../src/connection-editor/page-master.c:244
-#: ../src/connection-editor/page-master.c:255
+#: ../src/connection-editor/page-ip6.c:1248
+#, c-format
+msgid "IPv6 address \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1256
+#, c-format
+msgid "IPv6 prefix \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1265
+#, c-format
+msgid "IPv6 gateway \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-ip6.c:1307
+#, c-format
+msgid "IPv6 DNS server \"%s\" invalid"
+msgstr ""
+
+#: ../src/connection-editor/page-master.c:248
+#: ../src/connection-editor/page-master.c:259
 msgid "Duplicate slaves"
 msgstr "重製從屬"
 
-#: ../src/connection-editor/page-master.c:245
+#: ../src/connection-editor/page-master.c:249
 #, c-format
 msgid "Slaves '%s' and '%s' both apply to device '%s'"
 msgstr "從屬「%s」與「%s」都套用到裝置「%s」"
 
-#: ../src/connection-editor/page-master.c:256
+#: ../src/connection-editor/page-master.c:260
 #, 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:373
+#: ../src/connection-editor/page-master.c:385
 #, c-format
 msgid "%s slave %d"
 msgstr "%s slave %d"
 
-#: ../src/connection-editor/page-mobile.c:353
+#: ../src/connection-editor/page-mobile.c:310
 msgid "Could not load mobile broadband user interface."
 msgstr "無法載入行動寬頻使用者介面。"
 
-#: ../src/connection-editor/page-mobile.c:370
+#: ../src/connection-editor/page-mobile.c:327
 msgid "Unsupported mobile broadband connection type."
 msgstr "不支援的行動寬頻連線類型。"
 
 #. Fall back to just asking for GSM vs. CDMA
-#: ../src/connection-editor/page-mobile.c:620
+#: ../src/connection-editor/page-mobile.c:529
 msgid "Select Mobile Broadband Provider Type"
 msgstr "選擇行動寬頻供應商類型"
 
-#: ../src/connection-editor/page-mobile.c:647
+#: ../src/connection-editor/page-mobile.c:556
 msgid ""
 "Select the technology your mobile broadband provider uses.  If you are "
 "unsure, ask your provider."
 msgstr "請選擇您的無線寬頻供應商所使用的技術。如果您不確定，請洽詢供應商。"
 
-#: ../src/connection-editor/page-mobile.c:652
+#: ../src/connection-editor/page-mobile.c:561
 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)"
 msgstr "我的供應商使用 _GSM 為主的技術（例如 GPRS、EDGE、UMTS、HSDPA）"
 
-#: ../src/connection-editor/page-mobile.c:659
+#: ../src/connection-editor/page-mobile.c:568
 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)"
 msgstr "我的供應商使用 C_DMA 為主的技術（例如 1xRTT、EVDO）"
 
-#: ../src/connection-editor/page-mobile.c:669 ../src/mb-menu-item.c:54
-#: ../src/mobile-helpers.c:270
+#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50
+#: ../src/mobile-helpers.c:283
 msgid "CDMA"
 msgstr "CDMA"
 
-#: ../src/connection-editor/page-mobile.c:672 ../src/mb-menu-item.c:58
-#: ../src/mobile-helpers.c:268
+#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54
+#: ../src/mobile-helpers.c:281
 msgid "GSM"
 msgstr "GSM"
 
-#: ../src/connection-editor/page-ppp.c:137
+#: ../src/connection-editor/page-ppp.c:129
 msgid "EAP"
 msgstr "EAP"
 
-#: ../src/connection-editor/page-ppp.c:138
-#: ../src/wireless-security/eap-method-ttls.c:255
+#: ../src/connection-editor/page-ppp.c:130
+#: ../src/wireless-security/eap-method-ttls.c:258
 msgid "PAP"
 msgstr "PAP"
 
-#: ../src/connection-editor/page-ppp.c:139
-#: ../src/wireless-security/eap-method-ttls.c:300
+#: ../src/connection-editor/page-ppp.c:131
+#: ../src/wireless-security/eap-method-ttls.c:303
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../src/connection-editor/page-ppp.c:140
-#: ../src/wireless-security/eap-method-fast.c:281
-#: ../src/wireless-security/eap-method-peap.c:269
-#: ../src/wireless-security/eap-method-ttls.c:285
+#: ../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
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
-#: ../src/connection-editor/page-ppp.c:141
-#: ../src/wireless-security/eap-method-ttls.c:270
+#: ../src/connection-editor/page-ppp.c:133
+#: ../src/wireless-security/eap-method-ttls.c:273
 msgid "MSCHAP"
 msgstr "MSCHAP"
 
 #. Translators: "none" refers to authentication methods
-#: ../src/connection-editor/page-ppp.c:144
+#: ../src/connection-editor/page-ppp.c:136
 msgid "none"
 msgstr "沒有"
 
-#: ../src/connection-editor/page-ppp.c:204
+#: ../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:287
+#: ../src/connection-editor/page-ppp.c:279
 msgid "PPP Settings"
 msgstr "PPP 設定值"
 
-#: ../src/connection-editor/page-ppp.c:289
+#: ../src/connection-editor/page-ppp.c:281
 msgid "Could not load PPP user interface."
 msgstr "無法載入 PPP 使用者介面。"
 
-#: ../src/connection-editor/page-team.c:92
-#: ../src/connection-editor/page-team-port.c:77
-#: ../src/connection-editor/vpn-helpers.c:239
+#: ../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 "選擇要匯入的檔案"
 
-#: ../src/connection-editor/page-team.c:112
-#: ../src/connection-editor/page-team-port.c:97
+#: ../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"
 msgstr "錯誤：檔案不含有效的 JSON 組態"
 
-#: ../src/connection-editor/page-team.c:247
+#: ../src/connection-editor/page-team.c:270
 msgid "Could not load team user interface."
 msgstr "無法載入團隊使用者介面。"
 
-#: ../src/connection-editor/page-team.c:342
+#: ../src/connection-editor/page-team.c:377
 #, c-format
 msgid "Team connection %d"
 msgstr "團隊連線 %d"
@@ -2758,47 +2780,56 @@ msgstr "團隊連線 %d"
 #. Translators: a "Team Port" is a network
 #. * device that is part of a team.
 #.
-#: ../src/connection-editor/page-team-port.c:157
+#: ../src/connection-editor/page-team-port.c:151
 msgid "Team Port"
 msgstr "團隊連接埠"
 
-#: ../src/connection-editor/page-team-port.c:159
+#: ../src/connection-editor/page-team-port.c:153
 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:323
+#: ../src/connection-editor/page-vlan.c:414
 #, c-format
 msgid "%s (via \"%s\")"
 msgstr "%s (經由「%s」)"
 
-#: ../src/connection-editor/page-vlan.c:489
+#: ../src/connection-editor/page-vlan.c:426
+#, fuzzy, c-format
+msgid "New connection..."
+msgstr "沒有網路連接"
+
+#: ../src/connection-editor/page-vlan.c:596
 msgid "Could not load vlan user interface."
 msgstr "無法載入 vlan 使用者介面。"
 
-#: ../src/connection-editor/page-vlan.c:685
+#: ../src/connection-editor/page-vlan.c:734
+msgid "vlan parent"
+msgstr ""
+
+#: ../src/connection-editor/page-vlan.c:797
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 連線 %d"
 
-#: ../src/connection-editor/page-vpn.c:115
+#: ../src/connection-editor/page-vpn.c:103
 msgid "Could not load VPN user interface."
 msgstr "無法載入 VPN 使用者介面。"
 
-#: ../src/connection-editor/page-vpn.c:130
+#: ../src/connection-editor/page-vpn.c:118
 #, c-format
 msgid "Could not find VPN plugin service for '%s'."
 msgstr "找不到「%s」的 VPN 外掛程式服務。"
 
-#: ../src/connection-editor/page-vpn.c:224
-#: ../src/connection-editor/page-vpn.c:321
+#: ../src/connection-editor/page-vpn.c:205
+#: ../src/connection-editor/page-vpn.c:300
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 連線 %d"
 
-#: ../src/connection-editor/page-vpn.c:250
+#: ../src/connection-editor/page-vpn.c:229
 msgid ""
 "The VPN plugin failed to import the VPN connection correctly\n"
 "\n"
@@ -2808,11 +2839,11 @@ msgstr ""
 "\n"
 "錯誤：沒有 VPN 服務類型。"
 
-#: ../src/connection-editor/page-vpn.c:275
+#: ../src/connection-editor/page-vpn.c:254
 msgid "Choose a VPN Connection Type"
 msgstr "請選擇 VPN 的連線類型"
 
-#: ../src/connection-editor/page-vpn.c:276
+#: ../src/connection-editor/page-vpn.c:255
 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 "
@@ -2821,7 +2852,7 @@ msgstr ""
 "選擇您想要用在新連線中的 VPN 類型。如果您想要建立的 VPN 連線類型沒有出現在清"
 "單中，可能是沒有安裝正確的 VPN 外掛程式。"
 
-#: ../src/connection-editor/page-wifi.c:85
+#: ../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"
@@ -2829,71 +2860,91 @@ msgstr ""
 "此選項會將此連線鎖定至在此所輸入的 BSSID 所指定的 Wi-Fi 存取點（AP）。例如："
 "00:11:22:33:44:55"
 
-#: ../src/connection-editor/page-wifi.c:201
+#: ../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)\""
+msgstr ""
+"此選項會將此連線鎖定至在此所輸入的 MAC 位址所指定的網路裝置。例如："
+"00:11:22:33:44:55"
+
+#: ../src/connection-editor/page-wifi.c:197
 #, c-format
 msgid "%u (%u MHz)"
 msgstr "%u (%u MHz)"
 
-#: ../src/connection-editor/page-wifi.c:467
+#: ../src/connection-editor/page-wifi.c:450
 msgid "Could not load Wi-Fi user interface."
 msgstr "無法載入 Wi-Fi 使用者介面。"
 
-#: ../src/connection-editor/page-wifi.c:638
+#: ../src/connection-editor/page-wifi.c:571
+msgid "bssid"
+msgstr ""
+
+#: ../src/connection-editor/page-wifi.c:577
+#, fuzzy
+msgid "Wi-Fi device"
+msgstr "任何裝置"
+
+#: ../src/connection-editor/page-wifi.c:619
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 連線 %d"
 
-#: ../src/connection-editor/page-wifi-security.c:286
-#: ../src/libnm-gtk/nm-wifi-dialog.c:898
+#: ../src/connection-editor/page-wifi-security.c:309
+#: ../src/libnma/nma-wifi-dialog.c:906 ../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:296
-#: ../src/libnm-gtk/nm-wifi-dialog.c:907
+#: ../src/connection-editor/page-wifi-security.c:319
+#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931
 msgid "WEP 128-bit Passphrase"
 msgstr "WEP 128-位元 密語"
 
-#: ../src/connection-editor/page-wifi-security.c:322
-#: ../src/libnm-gtk/nm-wifi-dialog.c:937
+#: ../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)"
 msgstr "動態 WEP (802.1x)"
 
-#: ../src/connection-editor/page-wifi-security.c:336
-#: ../src/libnm-gtk/nm-wifi-dialog.c:951
+#: ../src/connection-editor/page-wifi-security.c:358
+#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975
 msgid "WPA & WPA2 Personal"
 msgstr "WPA & WPA2 個人版"
 
-#: ../src/connection-editor/page-wifi-security.c:350
-#: ../src/libnm-gtk/nm-wifi-dialog.c:965
+#: ../src/connection-editor/page-wifi-security.c:371
+#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989
 msgid "WPA & WPA2 Enterprise"
 msgstr "WPA & WPA2 企業版"
 
-#: ../src/connection-editor/page-wifi-security.c:391
+#: ../src/connection-editor/page-wifi-security.c:413
 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:402
+#: ../src/connection-editor/page-wifi-security.c:424
 msgid "Wi-Fi Security"
 msgstr "Wi-Fi 安全性"
 
-#: ../src/connection-editor/page-wifi-security.c:404
+#: ../src/connection-editor/page-wifi-security.c:426
 msgid "Could not load Wi-Fi security user interface."
 msgstr "無法載入 Wi-Fi 安全性使用者介面。"
 
-#: ../src/connection-editor/page-wimax.c:128
-msgid "Could not load WiMAX user interface."
-msgstr "無法載入 WiMAX 使用者介面。"
+#: ../src/connection-editor/page-wifi-security.c:506
+#, c-format
+msgid "missing SSID"
+msgstr ""
 
-#: ../src/connection-editor/page-wimax.c:224
+#: ../src/connection-editor/page-wifi-security.c:512
 #, c-format
-msgid "WiMAX connection %d"
-msgstr "WiMAX 連線 %d"
+msgid "Security not compatible with Ad-Hoc mode"
+msgstr ""
 
-#: ../src/connection-editor/vpn-helpers.c:212
+#: ../src/connection-editor/vpn-helpers.c:138
 msgid "Cannot import VPN connection"
 msgstr "無法匯入 VPN 網路連線"
 
-#: ../src/connection-editor/vpn-helpers.c:214
+#: ../src/connection-editor/vpn-helpers.c:140
 #, c-format
 msgid ""
 "The file '%s' could not be read or does not contain recognized VPN "
@@ -2905,25 +2956,30 @@ msgstr ""
 "\n"
 "錯誤：%s。"
 
-#: ../src/connection-editor/vpn-helpers.c:289
+#: ../src/connection-editor/vpn-helpers.c:141
+#, fuzzy
+msgid "unknown error"
+msgstr "不明的錯誤"
+
+#: ../src/connection-editor/vpn-helpers.c:215
 #, c-format
 msgid "A file named \"%s\" already exists."
 msgstr "名為「%s」的檔案已經存在。"
 
-#: ../src/connection-editor/vpn-helpers.c:291
+#: ../src/connection-editor/vpn-helpers.c:217
 msgid "_Replace"
 msgstr "取代(_R)"
 
-#: ../src/connection-editor/vpn-helpers.c:293
+#: ../src/connection-editor/vpn-helpers.c:219
 #, 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:329
+#: ../src/connection-editor/vpn-helpers.c:255
 msgid "Cannot export VPN connection"
 msgstr "不能匯出 VPN 連線"
 
-#: ../src/connection-editor/vpn-helpers.c:331
+#: ../src/connection-editor/vpn-helpers.c:257
 #, c-format
 msgid ""
 "The VPN connection '%s' could not be exported to %s.\n"
@@ -2934,105 +2990,21 @@ msgstr ""
 "\n"
 "錯誤：%s。"
 
-#: ../src/connection-editor/vpn-helpers.c:366
+#: ../src/connection-editor/vpn-helpers.c:292
 msgid "Export VPN connection..."
 msgstr "匯出 VPN 連線…"
 
-#: ../src/ethernet-dialog.c:92 ../src/ethernet-dialog.c:100
+#: ../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 "NetworkManager 面板程式無法找到一些需要的資源（找不到 .ui 檔）。"
 
-#: ../src/gnome-bluetooth/bt-widget.c:321
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (failed to connect to D-Bus: (%s) %s)."
-msgstr "無法進行藍牙的配置（無法連至 D-Bus：(%s) %s）。"
-
-#: ../src/gnome-bluetooth/bt-widget.c:330
-#, c-format
-msgid ""
-"Bluetooth configuration not possible (error finding NetworkManager: (%s) %s)."
-msgstr "無法進行藍牙的配置（找不到 NetworkManager：(%s) %s）。"
-
-#: ../src/gnome-bluetooth/bt-widget.c:441
-msgid "Use your mobile phone as a network device (PAN/NAP)"
-msgstr "使用手機作為網路裝置（PAN/NAP）"
-
-#: ../src/gnome-bluetooth/bt-widget.c:450
-msgid "Access the Internet using your mobile phone (DUN)"
-msgstr "使用手機存取網際網路（DUN）"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:324
-#, c-format
-msgid "Error: %s"
-msgstr "錯誤：%s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:431
-#, c-format
-msgid "Failed to create DUN connection: %s"
-msgstr "無法建立 DUN 連線：%s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:433
-#: ../src/gnome-bluetooth/nma-bt-device.c:957
-msgid "Your phone is now ready to use!"
-msgstr "您的電話現在已經可以使用！"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:456
-msgid "Mobile wizard was canceled"
-msgstr "行動精靈已經取消"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:465
-msgid "Unknown phone device type (not GSM or CDMA)"
-msgstr "不明的電話裝置類型（非 GSM 或 CDMA）"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:501
-msgid "unknown modem type."
-msgstr "不明的數據機類型。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:726
-#: ../src/gnome-bluetooth/nma-bt-device.c:732
-msgid "failed to connect to the phone."
-msgstr "無法連線至電話。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:745
-msgid "error getting bus connection"
-msgstr "取得匯流排連線時發生錯誤"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:799
-msgid "unexpectedly disconnected from the phone."
-msgstr "電話無預期離線。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:809
-msgid "timed out detecting phone details."
-msgstr "在時間內偵測不到電話的詳細資料。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:820
-msgid "Detecting phone configuration..."
-msgstr "偵測電話的配置…"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:918
-msgid ""
-"The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
-"Networking connection."
-msgstr "預設的藍牙配接卡必須在設定撥接網路連線前啟用。"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:955
-#, c-format
-msgid "Failed to create PAN connection: %s"
-msgstr "無法建立 PAN 連線：%s"
-
-#: ../src/gnome-bluetooth/nma-bt-device.c:976
-#, c-format
-msgid "%s Network"
-msgstr "%s 網路"
-
-#: ../src/gsm-unlock.ui.h:1
+#: ../src/gsm-unlock.ui.h:2
 msgid "_Unlock"
 msgstr "解鎖(_U)"
 
-#: ../src/gsm-unlock.ui.h:2
+#: ../src/gsm-unlock.ui.h:3
 msgid "Automatically unlock this device"
 msgstr "自動解鎖這個裝置"
 
@@ -3040,31 +3012,36 @@ msgstr "自動解鎖這個裝置"
 msgid "Connection Information"
 msgstr "連線資訊"
 
-#: ../src/info.ui.h:2
+#: ../src/info.ui.h:3
 msgid "Active Network Connections"
 msgstr "啟用網路連線"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:204
+#: ../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/libnm-gtk/nm-mobile-wizard.c:211
+#: ../src/libnma/nma-mobile-wizard.c:205
+#: ../src/libnm-gtk/nm-mobile-wizard.c:206
 msgid "Your Device:"
 msgstr "您的裝置："
 
 #. Provider
-#: ../src/libnm-gtk/nm-mobile-wizard.c:222
+#: ../src/libnma/nma-mobile-wizard.c:216
+#: ../src/libnm-gtk/nm-mobile-wizard.c:217
 msgid "Your Provider:"
 msgstr "您的供應商："
 
 #. Plan and APN
-#: ../src/libnm-gtk/nm-mobile-wizard.c:233
+#: ../src/libnma/nma-mobile-wizard.c:227
+#: ../src/libnm-gtk/nm-mobile-wizard.c:228
 msgid "Your Plan:"
 msgstr "您的方案："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:254
+#: ../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 "
@@ -3076,23 +3053,28 @@ msgstr ""
 "無法存取網路資源，請檢查設定。要修改行動寬頻連線的設定，請從「系統」 >> 「偏"
 "好設定」中，選擇「網路連線」。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:267
+#: ../src/libnma/nma-mobile-wizard.c:261
+#: ../src/libnm-gtk/nm-mobile-wizard.c:262
 msgid "Confirm Mobile Broadband Settings"
 msgstr "確認行動寬頻設定"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:331
+#: ../src/libnma/nma-mobile-wizard.c:325
+#: ../src/libnm-gtk/nm-mobile-wizard.c:326
 msgid "Unlisted"
 msgstr "未列出的"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:462
+#: ../src/libnma/nma-mobile-wizard.c:456
+#: ../src/libnm-gtk/nm-mobile-wizard.c:457
 msgid "_Select your plan:"
 msgstr "選擇您的方案(_S)："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:486
+#: ../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/libnm-gtk/nm-mobile-wizard.c:506
+#: ../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"
@@ -3103,218 +3085,277 @@ msgstr ""
 "\n"
 "如果您不確定所使用的方案，請洽詢供應商，以得知方案的 APN 為何。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:514
+#: ../src/libnma/nma-mobile-wizard.c:508
+#: ../src/libnm-gtk/nm-mobile-wizard.c:509
 msgid "Choose your Billing Plan"
 msgstr "選擇您的計費方案"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:563
+#: ../src/libnma/nma-mobile-wizard.c:557
+#: ../src/libnm-gtk/nm-mobile-wizard.c:558
 msgid "My plan is not listed..."
 msgstr "我的方案沒有列出…"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:716
+#: ../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/libnm-gtk/nm-mobile-wizard.c:729
+#: ../src/libnma/nma-mobile-wizard.c:723
+#: ../src/libnm-gtk/nm-mobile-wizard.c:724
 msgid "Provider"
 msgstr "供應商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:754
+#: ../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/libnm-gtk/nm-mobile-wizard.c:767
+#: ../src/libnma/nma-mobile-wizard.c:761
+#: ../src/libnm-gtk/nm-mobile-wizard.c:762
 msgid "Provider:"
 msgstr "供應商："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:784
+#: ../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/libnm-gtk/nm-mobile-wizard.c:786
+#: ../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/libnm-gtk/nm-mobile-wizard.c:797
+#: ../src/libnma/nma-mobile-wizard.c:791
+#: ../src/libnm-gtk/nm-mobile-wizard.c:792
 msgid "Choose your Provider"
 msgstr "選擇您的供應商"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1059
+#: ../src/libnma/nma-mobile-wizard.c:1053
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1054
 msgid "Country or Region List:"
 msgstr "國家或地區清單："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1072
+#: ../src/libnma/nma-mobile-wizard.c:1066
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1067
 msgid "Country or region"
 msgstr "國家或地區"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1082
+#: ../src/libnma/nma-mobile-wizard.c:1076
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1077
 msgid "My country is not listed"
 msgstr "我的國家並沒有列出來"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1132
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1189
+#: ../src/libnma/nma-mobile-wizard.c:1183
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1184
 msgid "Installed GSM device"
 msgstr "已安裝的 GSM 裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1192
+#: ../src/libnma/nma-mobile-wizard.c:1186
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1187
 msgid "Installed CDMA device"
 msgstr "已安裝的 CDMA 裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1360
+#: ../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 "這能幫助您輕易地設定行動寬頻連線，連至手機 (3G) 網路。"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1366
+#: ../src/libnma/nma-mobile-wizard.c:1360
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1361
 msgid "You will need the following information:"
 msgstr "您需要以下資訊："
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1377
+#: ../src/libnma/nma-mobile-wizard.c:1371
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1372
 msgid "Your broadband provider's name"
 msgstr "寬頻供應商的名稱"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1383
+#: ../src/libnma/nma-mobile-wizard.c:1377
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1378
 msgid "Your broadband billing plan name"
 msgstr "寬頻計費方案的名稱"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1389
+#: ../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/libnm-gtk/nm-mobile-wizard.c:1418
+#: ../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 "為這個行動寬頻裝置建立連線(_T)"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1433
+#: ../src/libnma/nma-mobile-wizard.c:1427
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1428
 msgid "Any device"
 msgstr "任何裝置"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1446
+#: ../src/libnma/nma-mobile-wizard.c:1440
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1441
 msgid "Set up a Mobile Broadband Connection"
 msgstr "設定行動寬頻連線"
 
-#: ../src/libnm-gtk/nm-mobile-wizard.c:1619
+#: ../src/libnma/nma-mobile-wizard.c:1613
+#: ../src/libnm-gtk/nm-mobile-wizard.c:1614
 msgid "New Mobile Broadband Connection"
 msgstr "新的行動寬頻連線"
 
-#: ../src/libnm-gtk/nm-ui-utils.c:304 ../src/libnm-gtk/nm-ui-utils.c:373
-msgid "Wired"
-msgstr "有線"
+#: ../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/libnm-gtk/nm-ui-utils.c:327
-msgid "Bluetooth"
-msgstr "藍牙"
+#: ../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/libnm-gtk/nm-ui-utils.c:329
-msgid "OLPC Mesh"
-msgstr "OLPC Mesh"
+#: ../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/libnm-gtk/nm-ui-utils.c:345
-msgid "ADSL"
-msgstr "ADSL"
+#: ../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/libnm-gtk/nm-ui-utils.c:408
-msgid "PCI"
-msgstr "PCI"
+#: ../src/libnma/nma-vpn-password-dialog.c:99
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:99
+msgid "_Secondary Password:"
+msgstr "第二密碼(_S)："
 
-#: ../src/libnm-gtk/nm-ui-utils.c:410
-msgid "USB"
-msgstr "USB"
+#: ../src/libnma/nma-vpn-password-dialog.c:102
+#: ../src/libnm-gtk/nm-vpn-password-dialog.c:102
+#, fuzzy
+msgid "_Ternary Password:"
+msgstr "第二密碼(_S)："
 
-#. Translators: the first %s is a bus name (eg, "USB") or
-#. * product name, the second is a device type (eg,
-#. * "Ethernet"). You can change this to something like
-#. * "%2$s (%1$s)" if there's no grammatical way to combine
-#. * the strings otherwise.
-#.
-#: ../src/libnm-gtk/nm-ui-utils.c:486 ../src/libnm-gtk/nm-ui-utils.c:506
-#, c-format
-msgctxt "long device name"
-msgid "%s %s"
-msgstr "%s %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-wifi-dialog.c:132 ../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/libnm-gtk/nm-wifi-dialog.c:441
+#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465
 msgid "New..."
 msgstr "新增…"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:881
+#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905
 msgctxt "Wifi/wired security"
 msgid "None"
 msgstr "沒有"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1051
+#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075
 msgid "C_reate"
 msgstr "建立(_R)"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1135
+#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161
 #, c-format
 msgid ""
 "Passwords or encryption keys are required to access the Wi-Fi network '%s'."
 msgstr "需要密碼或是加密金鑰來存取 Wi-Fi 網路「%s」。"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1137
+#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163
 msgid "Wi-Fi Network Authentication Required"
 msgstr "Wi-Fi 網路連線需要驗證"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1139
+#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165
 msgid "Authentication required by Wi-Fi network"
 msgstr "Wi-Fi 網路連線需要驗證"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1144
+#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170
 msgid "Create New Wi-Fi Network"
 msgstr "建立新的 Wi-Fi 網路"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1146
+#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172
 msgid "New Wi-Fi network"
 msgstr "新的 Wi-Fi 網路"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1147
+#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173
 msgid "Enter a name for the Wi-Fi network you wish to create."
 msgstr "輸入您要建立的 Wi-Fi 網路的名稱。"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1149
+#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175
 msgid "Connect to Hidden Wi-Fi Network"
 msgstr "連接到隱藏的 Wi-Fi 網路"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1151
+#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177
 msgid "Hidden Wi-Fi network"
 msgstr "隱藏的 Wi-Fi 網路"
 
-#: ../src/libnm-gtk/nm-wifi-dialog.c:1152
+#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178
 msgid ""
 "Enter the name and security details of the hidden Wi-Fi network you wish to "
 "connect to."
 msgstr "輸入您要連接的隱藏 Wi-Fi 網路的名稱與安全性詳細資料。"
 
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:97
-msgid "_Secondary Password:"
-msgstr "第二密碼(_S)："
-
-#: ../src/libnm-gtk/nm-vpn-password-dialog.c:236
-msgid "Sh_ow passwords"
-msgstr "顯示密碼(_O)"
-
-#: ../src/libnm-gtk/wifi.ui.h:2
+#: ../src/libnma/wifi.ui.h:2 ../src/libnm-gtk/wifi.ui.h:2
 msgid "Wi-Fi _security:"
 msgstr "Wi-Fi 安全性(_S)："
 
-#: ../src/libnm-gtk/wifi.ui.h:4
+#: ../src/libnma/wifi.ui.h:4 ../src/libnm-gtk/wifi.ui.h:4
 msgid "C_onnection:"
 msgstr "連線(_N)："
 
-#: ../src/libnm-gtk/wifi.ui.h:5
+#: ../src/libnma/wifi.ui.h:5 ../src/libnm-gtk/wifi.ui.h:5
 msgid "Wi-Fi _adapter:"
 msgstr "Wi-Fi 介面卡(_A)："
 
-#: ../src/main.c:73
+#: ../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
+msgid "OLPC Mesh"
+msgstr "OLPC Mesh"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:341
+msgid "ADSL"
+msgstr "ADSL"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:404
+msgid "PCI"
+msgstr "PCI"
+
+#: ../src/libnm-gtk/nm-ui-utils.c:406
+msgid "USB"
+msgstr "USB"
+
+#. Translators: the first %s is a bus name (eg, "USB") or
+#. * product name, the second is a device type (eg,
+#. * "Ethernet"). You can change this to something like
+#. * "%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
+#, c-format
+msgctxt "long device name"
+msgid "%s %s"
+msgstr "%s %s"
+
+#: ../src/main.c:42
 msgid "Usage:"
 msgstr "用法："
 
-#: ../src/main.c:75
+#: ../src/main.c:44
 msgid ""
 "This program is a component of NetworkManager (https://wiki.gnome.org/"
 "Projects/NetworkManager/)."
@@ -3322,144 +3363,157 @@ msgstr ""
 "本程式是 NetworkManager（https://wiki.gnome.org/Projects/NetworkManager/）的"
 "元件"
 
-#: ../src/main.c:76
+#: ../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:56
+#: ../src/mb-menu-item.c:52
 msgid "EVDO"
 msgstr "EVDO"
 
-#: ../src/mb-menu-item.c:60
+#: ../src/mb-menu-item.c:56
 msgid "GPRS"
 msgstr "GPRS"
 
-#: ../src/mb-menu-item.c:62
+#: ../src/mb-menu-item.c:58
 msgid "EDGE"
 msgstr "EDGE"
 
-#: ../src/mb-menu-item.c:64
+#: ../src/mb-menu-item.c:60
 msgid "UMTS"
 msgstr "UMTS"
 
-#: ../src/mb-menu-item.c:66
+#: ../src/mb-menu-item.c:62
 msgid "HSDPA"
 msgstr "HSDPA"
 
-#: ../src/mb-menu-item.c:68
+#: ../src/mb-menu-item.c:64
 msgid "HSUPA"
 msgstr "HSUPA"
 
-#: ../src/mb-menu-item.c:70
+#: ../src/mb-menu-item.c:66
 msgid "HSPA"
 msgstr "HSPA"
 
-#: ../src/mb-menu-item.c:72
+#: ../src/mb-menu-item.c:68
 msgid "HSPA+"
 msgstr "HSPA+"
 
-#: ../src/mb-menu-item.c:76
+#: ../src/mb-menu-item.c:70
 msgid "LTE"
 msgstr "LTE"
 
-#: ../src/mb-menu-item.c:112
+#: ../src/mb-menu-item.c:117
 msgid "not enabled"
 msgstr "未啟用"
 
-#: ../src/mb-menu-item.c:118
+#: ../src/mb-menu-item.c:123
 msgid "not registered"
 msgstr "未註冊"
 
-#: ../src/mb-menu-item.c:136
+#: ../src/mb-menu-item.c:141
 #, c-format
 msgid "Home network (%s)"
 msgstr "家用網路（%s）"
 
-#: ../src/mb-menu-item.c:138
+#: ../src/mb-menu-item.c:143
 #, c-format
 msgid "Home network"
 msgstr "家用網路"
 
-#: ../src/mb-menu-item.c:146
+#: ../src/mb-menu-item.c:151
 msgid "searching"
 msgstr "搜尋中"
 
-#: ../src/mb-menu-item.c:149
+#: ../src/mb-menu-item.c:154
 msgid "registration denied"
 msgstr "註冊被拒"
 
-#: ../src/mb-menu-item.c:154 ../src/mb-menu-item.c:160
+#: ../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:156 ../src/mb-menu-item.c:162
+#: ../src/mb-menu-item.c:161 ../src/mb-menu-item.c:167
 #, c-format
 msgid "%s (roaming)"
 msgstr "%s（漫遊）"
 
-#: ../src/mb-menu-item.c:165
+#: ../src/mb-menu-item.c:170
 #, c-format
 msgid "Roaming network (%s)"
 msgstr "漫遊網路（%s）"
 
-#: ../src/mb-menu-item.c:167
+#: ../src/mb-menu-item.c:172
 #, c-format
 msgid "Roaming network"
 msgstr "漫遊網路"
 
-#: ../src/mobile-helpers.c:318
+#: ../src/mobile-helpers.c:331
 #, c-format
 msgid "PIN code for SIM card '%s' on '%s'"
 msgstr "SIM 卡「%s」在「%s」的 PIN 碼"
 
-#: ../src/mobile-helpers.c:451
+#: ../src/mobile-helpers.c:464
 msgid "PIN code required"
 msgstr "需要 PIN 碼"
 
-#: ../src/mobile-helpers.c:459
+#: ../src/mobile-helpers.c:472
 msgid "PIN code is needed for the mobile broadband device"
 msgstr "這個行動寬頻裝置需要 PIN 碼"
 
+#: ../src/mobile-helpers.c:619
+#, c-format
+msgid "Mobile broadband connection '%s' active: (%d%%%s%s)"
+msgstr "行動寬頻連線「%s」在使用中：(%d%%%s%s)"
+
+#: ../src/mobile-helpers.c:622
+msgid "roaming"
+msgstr "漫遊"
+
 #. The %s is a mobile provider name, eg "T-Mobile"
-#: ../src/utils/utils.c:174
+#: ../src/utils/utils.c:179
 #, c-format
 msgid "%s connection"
 msgstr "%s 連線"
 
-#: ../src/utils/utils.c:379
-msgid "Store the password only for this _user"
-msgstr "只儲存這個使用者的密碼(_U)"
+#: ../src/wireless-security/eap-method.c:56
+msgid "undefined error in 802.1x security (wpa-eap)"
+msgstr ""
 
-#: ../src/utils/utils.c:381
-msgid "Store the password for _all users"
-msgstr "儲存所有使用者的密碼(_A)"
+#: ../src/wireless-security/eap-method.c:255
+msgid "unspecified error validating eap-method file"
+msgstr ""
 
-#: ../src/wireless-security/eap-method.c:440
+#: ../src/wireless-security/eap-method.c:452
 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:443
+#: ../src/wireless-security/eap-method.c:455
 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)"
 msgstr "DER 或 PEM 憑證 (*.der, *.pem, *.crt, *.cer)"
 
-#: ../src/wireless-security/eap-method-fast.c:266
-#: ../src/wireless-security/eap-method-peap.c:299
-#: ../src/wireless-security/eap-method-ttls.c:330
+#: ../src/wireless-security/eap-method-fast.c:70
+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
 msgid "GTC"
 msgstr "GTC"
 
-#: ../src/wireless-security/eap-method-fast.c:404
+#: ../src/wireless-security/eap-method-fast.c:403
 msgid "Choose a PAC file..."
 msgstr "選擇一個 PAC 檔案…"
 
-#: ../src/wireless-security/eap-method-fast.c:411
+#: ../src/wireless-security/eap-method-fast.c:410
 msgid "PAC files (*.pac)"
 msgstr "PAC 檔案 (*.pac)"
 
-#: ../src/wireless-security/eap-method-fast.c:415
+#: ../src/wireless-security/eap-method-fast.c:414
 msgid "All files"
 msgstr "所有檔案"
 
@@ -3495,15 +3549,32 @@ msgstr "內部驗證(_I)："
 msgid "Allow automatic PAC pro_visioning"
 msgstr "允許自動供應 PAC (_V)"
 
-#: ../src/wireless-security/eap-method-peap.c:284
-#: ../src/wireless-security/eap-method-ttls.c:315
-#: ../src/wireless-security/wireless-security.c:418
+#: ../src/wireless-security/eap-method-leap.c:63
+msgid "missing EAP-LEAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-leap.c:69
+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
 msgid "MD5"
 msgstr "MD5"
 
-#: ../src/wireless-security/eap-method-peap.c:378
-#: ../src/wireless-security/eap-method-tls.c:461
-#: ../src/wireless-security/eap-method-ttls.c:409
+#: ../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 "選擇憑證授權單位 (CA) 憑證…"
 
@@ -3531,15 +3602,46 @@ msgstr "不需要 CA 憑證(_R)"
 msgid "PEAP _version:"
 msgstr "PEAP 版本(_V)："
 
-#: ../src/wireless-security/eap-method-simple.ui.h:3
-msgid "As_k for this password every time"
-msgstr "每次都詢問密碼(_K)"
+#: ../src/wireless-security/eap-method-simple.c:72
+msgid "missing EAP username"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-simple.c:82
+msgid "missing EAP password"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:66
+msgid "missing EAP-TLS identity"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:71
+#, fuzzy, c-format
+msgid "invalid EAP-TLS CA certificate: %s"
+msgstr "C_A 憑證："
 
-#: ../src/wireless-security/eap-method-tls.c:276
+#: ../src/wireless-security/eap-method-tls.c:76
+msgid "invalid EAP-TLS CA certificate: no certificate specified"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:84
+msgid "invalid EAP-TLS password: missing"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:94
+#, c-format
+msgid "invalid EAP-TLS private-key: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:101
+#, c-format
+msgid "invalid EAP-TLS user-certificate: %s"
+msgstr ""
+
+#: ../src/wireless-security/eap-method-tls.c:296
 msgid "Unencrypted private keys are insecure"
 msgstr "未加密的私密金鑰是不安全的"
 
-#: ../src/wireless-security/eap-method-tls.c:279
+#: ../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 "
@@ -3552,11 +3654,11 @@ msgstr ""
 "\n"
 "（您可以使用 openssl 來加密您的私密金鑰）"
 
-#: ../src/wireless-security/eap-method-tls.c:455
+#: ../src/wireless-security/eap-method-tls.c:475
 msgid "Choose your personal certificate..."
 msgstr "選擇您的個人憑證…"
 
-#: ../src/wireless-security/eap-method-tls.c:467
+#: ../src/wireless-security/eap-method-tls.c:487
 msgid "Choose your private key..."
 msgstr "選擇您的私密金鑰…"
 
@@ -3576,23 +3678,36 @@ msgstr "私密金鑰(_K)："
 msgid "_Private key password:"
 msgstr "私密金鑰密碼(_P)："
 
-#: ../src/wireless-security/wireless-security.c:430
+#: ../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/wireless-security.c:72
+msgid "Unknown error validating 802.1x security"
+msgstr ""
+
+#: ../src/wireless-security/wireless-security.c:436
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/wireless-security/wireless-security.c:454
+#: ../src/wireless-security/wireless-security.c:460
 msgid "PWD"
 msgstr "PWD"
 
-#: ../src/wireless-security/wireless-security.c:465
+#: ../src/wireless-security/wireless-security.c:471
 msgid "FAST"
 msgstr "快"
 
-#: ../src/wireless-security/wireless-security.c:476
+#: ../src/wireless-security/wireless-security.c:482
 msgid "Tunneled TLS"
 msgstr "穿隧式 TLS"
 
-#: ../src/wireless-security/wireless-security.c:487
+#: ../src/wireless-security/wireless-security.c:493
 msgid "Protected EAP (PEAP)"
 msgstr "保護式 EAP (PEAP)"
 
@@ -3602,6 +3717,44 @@ msgstr "保護式 EAP (PEAP)"
 msgid "Au_thentication:"
 msgstr "驗證(_E)："
 
+#: ../src/wireless-security/ws-leap.c:61
+msgid "missing leap-username"
+msgstr ""
+
+#: ../src/wireless-security/ws-leap.c:69
+msgid "missing leap-password"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:105
+msgid "missing wep-key"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:113
+#, 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
+#, 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
+#, 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
+msgid "invalid wep-key: passphrase must be non-empty"
+msgstr ""
+
+#: ../src/wireless-security/ws-wep-key.c:133
+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 (預設值)"
@@ -3626,6 +3779,287 @@ msgstr "顯示金鑰(_W)"
 msgid "WEP inde_x:"
 msgstr "WEP 索引(_X)："
 
+#: ../src/wireless-security/ws-wpa-psk.c:69
+#, 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
+msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex"
+msgstr ""
+
+#: ../src/wireless-security/ws-wpa-psk.ui.h:2
+msgid "_Type:"
+msgstr "類型(_T)："
+
+#~ msgid "Enable WiMA_X Mobile Broadband"
+#~ msgstr "啟用 WiMA_X 行動寬頻"
+
+#~ msgid "_Help"
+#~ msgstr "求助(_H)"
+
+#~ msgid "You are now connected to the bonded network."
+#~ msgstr "您現在已連線至繫結的網路。"
+
+#~ msgid "Preparing bond connection '%s'..."
+#~ msgstr "正在準備繫結的連線「%s」…"
+
+#~ msgid "Configuring bond connection '%s'..."
+#~ msgstr "正在設定繫結的連線「%s」…"
+
+#~ msgid "User authentication required for bond connection '%s'..."
+#~ msgstr "繫結的連線「%s」需要使用者驗證…"
+
+#~ msgid "Requesting address for '%s'..."
+#~ msgstr "正在要求「%s」的網路位址…"
+
+#~ msgid "Bond connection '%s' active"
+#~ msgstr "繫結的連線「%s」在使用中"
+
+#~ msgid "You are now connected to the bridged network."
+#~ msgstr "您現在已連線至橋接的網路。"
+
+#~ msgid "Preparing bridge connection '%s'..."
+#~ msgstr "正在準備橋接的網路連線「%s」…"
+
+#~ msgid "Configuring bridge connection '%s'..."
+#~ msgstr "正在設定橋接的網路連線「%s」…"
+
+#~ msgid "User authentication required for bridge connection '%s'..."
+#~ msgstr "橋接的連線「%s」需要使用者驗證…"
+
+#~ msgid "Bridge connection '%s' active"
+#~ msgstr "橋接的連線「%s」在使用中"
+
+#~ msgid "New Mobile Broadband (CDMA) connection..."
+#~ msgstr "新的行動寬頻 (CDMA) 連線…"
+
+#~ msgid "You are now connected to the CDMA network."
+#~ msgstr "您現在已連線至 CDMA 網路。"
+
+#~ msgid "CDMA network."
+#~ msgstr "CDMA 網路。"
+
+#~ msgid "New Mobile Broadband (GSM) connection..."
+#~ msgstr "新的行動寬頻 (GSM) 連線…"
+
+#~ msgid "You are now connected to the GSM network."
+#~ msgstr "您現在已連線至 GSM 網路。"
+
+#~ msgid "GSM network."
+#~ msgstr "GSM 網路。"
+
+#~ msgid "Auto InfiniBand"
+#~ msgstr "自動 InfiniBand"
+
+#~ msgid "InfiniBand Networks (%s)"
+#~ msgstr "InfiniBand 網路 (%s)"
+
+#~ msgid "InfiniBand Network (%s)"
+#~ msgstr "InfiniBand 網路 (%s)"
+
+#~ msgid "InfiniBand Networks"
+#~ msgstr "InfiniBand 網路"
+
+#~ msgid "InfiniBand Network"
+#~ msgstr "InfiniBand 網路"
+
+#~ msgid "You are now connected to the InfiniBand network."
+#~ msgstr "您現在已連線至 InfiniBand 網路。"
+
+#~ msgid "Preparing InfiniBand connection '%s'..."
+#~ msgstr "正在準備 InfiniBand 連線「%s」…"
+
+#~ msgid "Configuring InfiniBand connection '%s'..."
+#~ msgstr "正在設定 InfiniBand 連線「%s」…"
+
+#~ msgid "User authentication required for InfiniBand connection '%s'..."
+#~ msgstr "InfiniBand 連線「%s」需要使用者驗證…"
+
+#~ msgid "InfiniBand connection '%s' active"
+#~ msgstr "InfiniBand 連線「%s」在使用中"
+
+#~ msgid "You are now connected to the teamed network."
+#~ msgstr "您現在已連線至團隊網路。"
+
+#~ msgid "Preparing team connection '%s'..."
+#~ msgstr "正在準備團隊的網路連線「%s」…"
+
+#~ msgid "Configuring team connection '%s'..."
+#~ msgstr "正在設定團隊的網路連線「%s」…"
+
+#~ msgid "User authentication required for team connection '%s'..."
+#~ msgstr "團隊連線「%s」需要使用者驗證…"
+
+#~ msgid "Team connection '%s' active"
+#~ msgstr "團隊連線「%s」在使用中"
+
+#~ msgid "You are now connected to the VLAN."
+#~ msgstr "您現在已連線至 VLAN 網路。"
+
+#~ msgid "Preparing VLAN connection '%s'..."
+#~ msgstr "正在啟動 VLAN 連線「%s」…"
+
+#~ msgid "Configuring VLAN connection '%s'..."
+#~ msgstr "正在啟動 VLAN 連線「%s」…"
+
+#~ msgid "User authentication required for VLAN connection '%s'..."
+#~ msgstr "VLAN 連線「%s」需要使用者驗證…"
+
+#~ msgid "VLAN connection '%s' active"
+#~ msgstr "VLAN 連線「%s」在使用中"
+
+#~ msgid "WiMAX Mobile Broadband (%s)"
+#~ msgstr "WiMAX 行動寬頻 (%s)"
+
+#~ msgid "WiMAX Mobile Broadband"
+#~ msgstr "WiMAX 行動寬頻"
+
+#~ msgid "WiMAX is disabled"
+#~ msgstr "WiMAX 已停用"
+
+#~ msgid "WiMAX is disabled by hardware switch"
+#~ msgstr "WiMAX 已被硬體開關停用"
+
+#~ msgid "You are now connected to the WiMAX network."
+#~ msgstr "您現在已連線至 WiMAX 網路。"
+
+#~ msgid "%d dB"
+#~ msgstr "%d dB"
+
+#~ msgctxt "WiMAX CINR"
+#~ msgid "unknown"
+#~ msgstr "不明"
+
+#~ msgctxt "WiMAX Base Station ID"
+#~ msgid "unknown"
+#~ msgstr "不明"
+
+#~ msgid "WiMAX (%s)"
+#~ msgstr "WiMAX (%s)"
+
+#~ msgid "CINR:"
+#~ msgstr "CINR："
+
+#~ msgid "BSID:"
+#~ msgstr "BSID："
+
+#~ msgid "_Mode:"
+#~ msgstr "模式(_M)："
+
+#~ msgid "_Device MAC address:"
+#~ msgstr "裝置的 MAC 位址(_D)："
+
+#~ msgid "Any"
+#~ msgstr "任何"
+
+#~ msgid "3G (UMTS/HSPA)"
+#~ msgstr "3G (UMTS/HSPA)"
+
+#~ msgid "2G (GPRS/EDGE)"
+#~ msgstr "2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 3G (UMTS/HSPA)"
+#~ msgstr "偏好 3G (UMTS/HSPA)"
+
+#~ msgid "Prefer 2G (GPRS/EDGE)"
+#~ msgstr "偏好 2G (GPRS/EDGE)"
+
+#~ msgid "Prefer 4G (LTE)"
+#~ msgstr "偏好 4G (LTE)"
+
+#~ msgid "Use only 4G (LTE)"
+#~ msgstr "只使用 4G (LTE)"
+
+#~ msgid "I_mport team configuration from a file..."
+#~ msgstr "從檔案匯入團隊組態(_M)…"
+
+#~ msgid "Infrastructure"
+#~ msgstr "基礎架構"
+
+#~ msgid "WiMAX"
+#~ msgstr "WiMAX"
+
+#~ msgid "Error saving connection"
+#~ msgstr "儲存連線時錯誤"
+
+#~ msgid "The property '%s' / '%s' is invalid: %d"
+#~ msgstr "屬性「%s」/「%s」是無效的：%d"
+
+#~ msgid "Automatic (PPP)"
+#~ msgstr "自動 (PPP)"
+
+#~ 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)."
+#~ msgstr "無法進行藍牙的配置（無法連至 D-Bus：(%s) %s）。"
+
+#~ msgid ""
+#~ "Bluetooth configuration not possible (error finding NetworkManager: (%s) "
+#~ "%s)."
+#~ msgstr "無法進行藍牙的配置（找不到 NetworkManager：(%s) %s）。"
+
+#~ msgid "Use your mobile phone as a network device (PAN/NAP)"
+#~ msgstr "使用手機作為網路裝置（PAN/NAP）"
+
+#~ msgid "Access the Internet using your mobile phone (DUN)"
+#~ msgstr "使用手機存取網際網路（DUN）"
+
+#~ msgid "Error: %s"
+#~ msgstr "錯誤：%s"
+
+#~ msgid "Failed to create DUN connection: %s"
+#~ msgstr "無法建立 DUN 連線：%s"
+
+#~ msgid "Your phone is now ready to use!"
+#~ msgstr "您的電話現在已經可以使用！"
+
+#~ msgid "Mobile wizard was canceled"
+#~ msgstr "行動精靈已經取消"
+
+#~ msgid "Unknown phone device type (not GSM or CDMA)"
+#~ msgstr "不明的電話裝置類型（非 GSM 或 CDMA）"
+
+#~ msgid "unknown modem type."
+#~ msgstr "不明的數據機類型。"
+
+#~ msgid "failed to connect to the phone."
+#~ msgstr "無法連線至電話。"
+
+#~ msgid "error getting bus connection"
+#~ msgstr "取得匯流排連線時發生錯誤"
+
+#~ msgid "unexpectedly disconnected from the phone."
+#~ msgstr "電話無預期離線。"
+
+#~ msgid "timed out detecting phone details."
+#~ msgstr "在時間內偵測不到電話的詳細資料。"
+
+#~ msgid "Detecting phone configuration..."
+#~ msgstr "偵測電話的配置…"
+
+#~ msgid ""
+#~ "The default Bluetooth adapter must be enabled before setting up a Dial-Up-"
+#~ "Networking connection."
+#~ msgstr "預設的藍牙配接卡必須在設定撥接網路連線前啟用。"
+
+#~ msgid "Failed to create PAN connection: %s"
+#~ msgstr "無法建立 PAN 連線：%s"
+
+#~ msgid "%s Network"
+#~ msgstr "%s 網路"
+
 #~ msgid "Primary DNS:"
 #~ msgstr "主要 DNS："
 
@@ -3731,9 +4165,6 @@ msgstr "WEP 索引(_X)："
 #~ msgid "Don't know how to edit '%s' connections"
 #~ msgstr "不知道如何編輯「%s」連線"
 
-#~ msgid "could not find the Bluetooth device."
-#~ msgstr "找不到藍牙裝置。"
-
 #~ msgid "Bluetooth configuration not possible (failed to create D-Bus proxy)."
 #~ msgstr "無法進行藍牙的配置（無法建立 D-Bus proxy）。"
 
@@ -3761,12 +4192,6 @@ msgstr "WEP 索引(_X)："
 #~ msgid "Wired network"
 #~ msgstr "有線網路"
 
-#~ msgid "ad-hoc"
-#~ msgstr "ad-hoc"
-
-#~ msgid "secure."
-#~ msgstr "安全。"
-
 #~ msgid "WiMAX network"
 #~ msgstr "WiMAX 網路"